[Xfce4-commits] <midori:master> Add gcr version to about:version

[Christian Dywan]

Updating branch refs/heads/master
         to 4daaa98232f6ac2541a1de428b2eb385f379f937 (commit)
       from ae18206f7bb55d3ef316d21ca7c4e46ba0a41ab1 (commit)

commit 4daaa98232f6ac2541a1de428b2eb385f379f937
Author: Christian Dywan <christian at twotoasts.de>
Date:   Thu Jul 19 22:27:50 2012 +0200

    Add gcr version to about:version

 midori/midori-view.c |    9 +++++----
 wscript              |    6 ++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index f729702..f50dfbf 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -4397,6 +4397,7 @@ midori_view_set_uri (MidoriView*  view,
                 static char const * const version_format_strings[] = {
                     "   libsoup %s</td></tr>",
                     "<tr><td>cairo</td><td>%s ", "(%s)</td></tr>",
+                    "<tr><td>gcr</td><td>%s</td></tr>",
                     "<tr><td>granite</td><td>%s</td></tr>",
                     "<tr><td>libnotify</td><td>%s</td></tr>",
                     "<tr><td>single instance</td><td>%s</td></tr>",
@@ -4404,9 +4405,10 @@ midori_view_set_uri (MidoriView*  view,
                     "<tr><td>Identification</td><td>%s</td></tr>",
                     "<tr><td>Video Formats</td><td>%s</td></tr>",
                 };
-                char const *  version_strings[] = {
+                gchar const* version_strings[] = {
                     LIBSOUP_VERSION,
                     CAIRO_VERSION_STRING, cairo_version_string (),
+                    GCR_VERSION,
                     GRANITE_VERSION,
                     LIBNOTIFY_VERSION,
                     #ifdef HAVE_HILDON_2_2
@@ -4421,9 +4423,8 @@ midori_view_set_uri (MidoriView*  view,
                     platform, sys_name, architecture ? architecture : "", ident,
                     video_formats,
                 };
-                int i = 0;
-                GString * tmp = g_string_new("");;
-
+                gsize i = 0;
+                GString * tmp = g_string_new ("");
                 GString* more = g_string_new ("");
                 list_netscape_plugins (more, js_context);
                 list_about_uris (more);
diff --git a/wscript b/wscript
index 48dd569..45d46f2 100644
--- a/wscript
+++ b/wscript
@@ -182,9 +182,11 @@ def configure (conf):
         return conf.env['HAVE_' + var]
 
     if option_enabled ('gtk3'):
-        check_pkg ('gcr-3', '2.32', mandatory=False)
+        gcr_pkg = 'gcr-3'
     else:
-        check_pkg ('gcr-3-gtk2', '2.32', mandatory=False)
+        gcr_pkg = 'gcr-3-gtk2'
+    check_pkg (gcr_pkg, '2.32', mandatory=False)
+    conf.define ('GCR_VERSION', ['No',conf.check_cfg(modversion=gcr_pkg)][conf.env['HAVE_GCR'] == 1])
 
     if option_enabled ('unique'):
         if option_enabled('gtk3'): unique_pkg = 'unique-3.0'