r16565 - /desktop/unstable/evince/debian/patches/01_external_libgnome.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Jul 18 15:31:20 UTC 2008
Author: joss
Date: Fri Jul 18 15:31:19 2008
New Revision: 16565
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16565
Log:
Fix the patch behavior for the gtk build
Modified:
desktop/unstable/evince/debian/patches/01_external_libgnome.patch
Modified: desktop/unstable/evince/debian/patches/01_external_libgnome.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/patches/01_external_libgnome.patch?rev=16565&op=diff
==============================================================================
--- desktop/unstable/evince/debian/patches/01_external_libgnome.patch (original)
+++ desktop/unstable/evince/debian/patches/01_external_libgnome.patch Fri Jul 18 15:31:19 2008
@@ -1,19 +1,24 @@
---- shell/ev-window.c.orig 2008-06-16 16:28:11.266518161 +0200
-+++ shell/ev-window.c 2008-06-16 16:30:38.343557281 +0200
-@@ -78,6 +78,7 @@
+--- shell/ev-window.c.orig 2008-07-18 17:27:00.652384589 +0200
++++ shell/ev-window.c 2008-07-18 17:30:48.140885922 +0200
+@@ -78,6 +78,9 @@
#include <gtk/gtk.h>
#include <gio/gio.h>
#include <gconf/gconf-client.h>
++#ifdef WITH_GNOME
+#include <libgnome/gnome-url.h>
++#endif
#include <errno.h>
#include <stdlib.h>
-@@ -4635,7 +4636,7 @@
+@@ -4635,7 +4638,11 @@
GError *error = NULL;
gboolean ret;
-- ret = g_app_info_launch_default_for_uri (uri, NULL, &error);
++#ifdef WITH_GNOME
+ ret = gnome_url_show (uri, &error);
++#else
+ ret = g_app_info_launch_default_for_uri (uri, NULL, &error);
++#endif
if (ret == FALSE) {
GtkWidget *dialog;
More information about the pkg-gnome-commits
mailing list