debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add gcr version to about:version

Browse source
This commit is contained in:
Christian Dywan 2012-07-19 22:27:50 +02:00
parent ae18206f7b
commit 4daaa98232
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
midori/midori-view.c
View file

@ -4397,6 +4397,7 @@ midori_view_set_uri (MidoriView* view,
static char const * const version_format_strings[] = { static char const * const version_format_strings[] = {
" &nbsp; libsoup %s</td></tr>", " &nbsp; libsoup %s</td></tr>",
"<tr><td>cairo</td><td>%s ", "(%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>granite</td><td>%s</td></tr>",
"<tr><td>libnotify</td><td>%s</td></tr>", "<tr><td>libnotify</td><td>%s</td></tr>",
"<tr><td>single instance</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>Identification</td><td>%s</td></tr>",
"<tr><td>Video&nbsp;Formats</td><td>%s</td></tr>", "<tr><td>Video&nbsp;Formats</td><td>%s</td></tr>",
}; };
char const * version_strings[] = { gchar const* version_strings[] = {
LIBSOUP_VERSION, LIBSOUP_VERSION,
CAIRO_VERSION_STRING, cairo_version_string (), CAIRO_VERSION_STRING, cairo_version_string (),
GCR_VERSION,
GRANITE_VERSION, GRANITE_VERSION,
LIBNOTIFY_VERSION, LIBNOTIFY_VERSION,
#ifdef HAVE_HILDON_2_2 #ifdef HAVE_HILDON_2_2
@ -4421,9 +4423,8 @@ midori_view_set_uri (MidoriView* view,
platform, sys_name, architecture ? architecture : "", ident, platform, sys_name, architecture ? architecture : "", ident,
video_formats, video_formats,
}; };
int i = 0; gsize i = 0;
GString * tmp = g_string_new("");; GString * tmp = g_string_new ("");
GString* more = g_string_new (""); GString* more = g_string_new ("");
list_netscape_plugins (more, js_context); list_netscape_plugins (more, js_context);
list_about_uris (more); list_about_uris (more);

6
wscript
View file

@ -182,9 +182,11 @@ def configure (conf):
return conf.env['HAVE_' + var] return conf.env['HAVE_' + var]
if option_enabled ('gtk3'): if option_enabled ('gtk3'):
check_pkg ('gcr-3', '2.32', mandatory=False) gcr_pkg = 'gcr-3'
else: 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 ('unique'):
if option_enabled('gtk3'): unique_pkg = 'unique-3.0' if option_enabled('gtk3'): unique_pkg = 'unique-3.0'