r20480 - in /desktop/unstable/gnome-terminal/debian: changelog patches/02_let_gconf_autostart.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Jun 27 13:02:03 2009
New Revision: 20480

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20480
Log:
02_let_gconf_autostart.patch: Don’t exit if there is no GConf daemon 
running. Instead, let dbus-daemon and gconfd be autostarted as they 
should be if this is needed. Thanks to Sean Finney for the 
suggestion. Closes: #531734 and some duplicates.

Added:
    desktop/unstable/gnome-terminal/debian/patches/02_let_gconf_autostart.patch
Modified:
    desktop/unstable/gnome-terminal/debian/changelog

Modified: desktop/unstable/gnome-terminal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/changelog?rev=20480&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/changelog (original)
+++ desktop/unstable/gnome-terminal/debian/changelog Sat Jun 27 13:02:03 2009
@@ -1,3 +1,12 @@
+gnome-terminal (2.26.2-2) unstable; urgency=low
+
+  * 02_let_gconf_autostart.patch: Don’t exit if there is no GConf daemon 
+    running. Instead, let dbus-daemon and gconfd be autostarted as they 
+    should be if this is needed. Thanks to Sean Finney for the 
+    suggestion. Closes: #531734 and some duplicates.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 27 Jun 2009 14:53:33 +0200
+
 gnome-terminal (2.26.2-1) unstable; urgency=low
 
   [ Josselin Mouette ]

Added: desktop/unstable/gnome-terminal/debian/patches/02_let_gconf_autostart.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/02_let_gconf_autostart.patch?rev=20480&op=file
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/02_let_gconf_autostart.patch (added)
+++ desktop/unstable/gnome-terminal/debian/patches/02_let_gconf_autostart.patch Sat Jun 27 13:02:03 2009
@@ -1,0 +1,29 @@
+--- src/terminal.c.orig	2009-06-27 14:48:41.740115657 +0200
++++ src/terminal.c	2009-06-27 14:49:37.573407952 +0200
+@@ -234,9 +234,6 @@
+   return g_string_free (name, FALSE);
+ }
+ 
+-/* Evil hack alert: this is exported from libgconf-2 but not in a public header */
+-extern gboolean gconf_ping_daemon (void);
+-         
+ int
+ main (int argc, char **argv)
+ {
+@@ -444,16 +441,6 @@
+   g_free (argv_copy);
+   g_free (factory_name);
+ 
+-  /* If the gconf daemon isn't available (e.g. because there's no dbus
+-   * session bus running), we'd crash later on. Tell the user about it
+-   * now, and exit. See bug #561663.
+-   */
+-  if (!gconf_ping_daemon ())
+-    {
+-      g_printerr ("Failed to contact the GConf daemon; exiting.\n");
+-      exit (1);
+-    }
+-
+   gtk_window_set_default_icon_name (GNOME_TERMINAL_ICON_NAME);
+ 
+   gtk_about_dialog_set_url_hook (about_url_hook, NULL, NULL);