diff --git a/midori/midori-view.c b/midori/midori-view.c
index f7297020..f50dfbff 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",
"
cairo | %s ", "(%s) |
",
+ "gcr | %s |
",
"granite | %s |
",
"libnotify | %s |
",
"single instance | %s |
",
@@ -4404,9 +4405,10 @@ midori_view_set_uri (MidoriView* view,
"Identification | %s |
",
"Video Formats | %s |
",
};
- 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 48dd5693..45d46f22 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'