From: Christian Dywan <christian@twotoasts.de>
Date: Sat, 25 Feb 2012 22:57:26 +0000 (+0100)
Subject: Replace libunique/ hildon line with single instance
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=307c79274d1b3fba1391cbb61578542818b3a29a;p=midori

Replace libunique/ hildon line with single instance

Only one can be used at any one time.
---

diff --git a/midori/midori-view.c b/midori/midori-view.c
index ce6cfb5b..3ac90010 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -4023,8 +4023,7 @@ midori_view_set_uri (MidoriView*  view,
                     "<tr><td>libsoup</td><td>%s</td></tr>"
                     "<tr><td>cairo</td><td>%s (%s)</td></tr>"
                     "<tr><td>libnotify</td><td>%s</td></tr>"
-                    "<tr><td>libunique</td><td>%s</td></tr>"
-                    "<tr><td>libhildon</td><td>%s</td></tr>"
+                    "<tr><td>single instance</td><td>%s</td></tr>"
                     "<tr><td>Platform</td><td>%s %s %s</td></tr>"
                     "<tr><td>Identification</td><td>%s</td></tr>"
                     "<tr><td>Video&nbsp;Formats</td><td>%s</td></tr>"
@@ -4045,8 +4044,15 @@ midori_view_set_uri (MidoriView*  view,
                     LIBSOUP_VERSION,
                     CAIRO_VERSION_STRING, cairo_version_string (),
                     LIBNOTIFY_VERSION,
-                    UNIQUE_VERSION,
-                    HAVE_HILDON ? "Yes" : "No",
+                    #ifdef HAVE_HILDON_2_2
+                    "Hildon 2.2",
+                    #elif HAVE_HILDON
+                    "Hildon",
+                    #elif HAVE_UNIQUE
+                    "libunique " UNIQUE_VERSION,
+                    #else
+                    "Sockets",
+                    #endif
                     platform, sys_name, architecture ? architecture : "", ident,
                     video_formats, netscape_plugins);
                 g_free (command_line);