Updating branch refs/heads/master to 307c79274d1b3fba1391cbb61578542818b3a29a (commit) from d3a60802ac0f663c7857d78e4136353ffb31c481 (commit)
commit 307c79274d1b3fba1391cbb61578542818b3a29a Author: Christian Dywan <christ...@twotoasts.de> Date: Sat Feb 25 23:57:26 2012 +0100 Replace libunique/ hildon line with single instance Only one can be used at any one time. midori/midori-view.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index ce6cfb5..3ac9001 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 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); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits