← Back to branch summary

~ubuntu-branches/debian/sid/gnome-terminal/sid

« back to all changes in this revision

Viewing changes to debian/patches/02_let_gconf_autostart.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2009-09-22 14:02:42 UTC
  • mfrom: (1.3.35 upstream) (7.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20090922140242-0jvnwru579qpxcft
Tags: 2.28.0-1
* New upstream stable release:
  + debian/control.in:
    - Update build dependencies.
  + debian/patches/02_let_gconf_autostart.patch,
    debian/patches/03_useless_plural_forms.patch:
    - Dropped, merged upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_let_gconf_autostart.patch
1
 
--- src/terminal.c.orig 2009-06-27 14:48:41.740115657 +0200
2
 
+++ src/terminal.c      2009-06-27 14:49:37.573407952 +0200
3
 
@@ -234,9 +234,6 @@
4
 
   return g_string_free (name, FALSE);
5
 
 }
6
 
 
7
 
-/* Evil hack alert: this is exported from libgconf-2 but not in a public header */
8
 
-extern gboolean gconf_ping_daemon (void);
9
 
-         
10
 
 int
11
 
 main (int argc, char **argv)
12
 
 {
13
 
@@ -444,16 +441,6 @@
14
 
   g_free (argv_copy);
15
 
   g_free (factory_name);
16
 
 
17
 
-  /* If the gconf daemon isn't available (e.g. because there's no dbus
18
 
-   * session bus running), we'd crash later on. Tell the user about it
19
 
-   * now, and exit. See bug #561663.
20
 
-   */
21
 
-  if (!gconf_ping_daemon ())
22
 
-    {
23
 
-      g_printerr ("Failed to contact the GConf daemon; exiting.\n");
24
 
-      exit (1);
25
 
-    }
26
 
-
27
 
   gtk_window_set_default_icon_name (GNOME_TERMINAL_ICON_NAME);
28
 
 
29
 
   gtk_about_dialog_set_url_hook (about_url_hook, NULL, NULL);