r16536 - in /desktop/unstable/cheese/debian: changelog patches/02_libgnome_url.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Jul 15 12:47:21 2008
New Revision: 16536

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16536
Log:
02_libgnome_url.patch: use libgnome to open URLs rather than 
gappinfo. This patch should be removed once gvfs is part of the 
default installation, but is harmless as cheese already depends on 
libgnome. Closes: #489435.

Added:
    desktop/unstable/cheese/debian/patches/02_libgnome_url.patch
Modified:
    desktop/unstable/cheese/debian/changelog

Modified: desktop/unstable/cheese/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/changelog?rev=16536&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/changelog (original)
+++ desktop/unstable/cheese/debian/changelog Tue Jul 15 12:47:21 2008
@@ -1,3 +1,12 @@
+cheese (2.22.3-2) unstable; urgency=low
+
+  * 02_libgnome_url.patch: use libgnome to open URLs rather than 
+    gappinfo. This patch should be removed once gvfs is part of the 
+    default installation, but is harmless as cheese already depends on 
+    libgnome. Closes: #489435.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 15 Jul 2008 14:40:03 +0200
+
 cheese (2.22.3-1) unstable; urgency=low
 
   * New upstream bugfix release.

Added: desktop/unstable/cheese/debian/patches/02_libgnome_url.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/patches/02_libgnome_url.patch?rev=16536&op=file
==============================================================================
--- desktop/unstable/cheese/debian/patches/02_libgnome_url.patch (added)
+++ desktop/unstable/cheese/debian/patches/02_libgnome_url.patch Tue Jul 15 12:47:21 2008
@@ -1,0 +1,46 @@
+--- src/cheese-window.c.orig	2008-07-15 14:32:03.346673101 +0200
++++ src/cheese-window.c	2008-07-15 14:44:27.966701974 +0200
+@@ -34,6 +34,7 @@
+ #include <gst/interfaces/xoverlay.h>
+ #include <gtk/gtk.h>
+ #include <libebook/e-book.h>
++#include <libgnome/gnome-url.h>
+ 
+ #include "cheese-countdown.h"
+ #include "cheese-effect-chooser.h"
+@@ -124,7 +125,7 @@
+   GtkWidget *error_dialog;
+   gboolean ret;
+ 
+-  ret = g_app_info_launch_default_for_uri (url, NULL, &error);
++  ret = gnome_url_show (url, &error);
+   if (ret == FALSE)
+   {
+     error_dialog = gtk_message_dialog_new (GTK_WINDOW (dialog), 
+@@ -148,7 +149,7 @@
+ 
+   uri = g_strconcat ("mailto:", email, NULL);
+ 
+-  ret = g_app_info_launch_default_for_uri (uri, NULL, &error);
++  ret = gnome_url_show (uri, &error);
+   if (ret == FALSE)
+   {
+     error_dialog = gtk_message_dialog_new (GTK_WINDOW (dialog), 
+@@ -240,7 +241,7 @@
+   uri = g_filename_to_uri (filename, NULL, NULL);
+   g_free (filename);
+  
+-  ret = g_app_info_launch_default_for_uri (uri, NULL, &error);
++  ret = gnome_url_show (uri, &error);
+   if (ret == FALSE)
+   {
+     dialog = gtk_message_dialog_new (GTK_WINDOW (cheese_window->window), 
+@@ -532,7 +533,7 @@
+   GError *error = NULL;
+   gboolean ret;
+ 
+-  ret = g_app_info_launch_default_for_uri ("ghelp:cheese", NULL, &error);
++  ret = gnome_url_show ("ghelp:cheese", &error);
+ 
+   if (ret == FALSE) 
+   {