Attachment 19544 Details for Bug 17970 – GConf patch for reference

[patch] GConf patch for reference

GConf-04-restart-dbus.diff (text/plain), 1.09 KB, created by Brian Cameron on 2008-10-09 17:45:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Cameron

Created: 2008-10-09 17:45:24 UTC

Size: 1.09 KB

patch

obsolete

>--- GConf-2.24.0/gconf/gconf.c-orig	2008-10-09 22:15:02.462081000 +0000
>+++ GConf-2.24.0/gconf/gconf.c	2008-10-09 23:29:29.216373000 +0000
>@@ -556,6 +556,7 @@ GConfEngine*
> gconf_engine_get_default (void)
> {
>   GConfEngine* conf = NULL;
>+  GError *err = NULL;
>   
>   if (default_engine)
>     conf = default_engine;
>@@ -572,7 +573,7 @@ gconf_engine_get_default (void)
>        * since we aren't starting if it isn't found, we'll probably
>        * get errors half the time anyway.
>        */
>-      gconf_engine_connect (conf, FALSE, NULL);
>+      gconf_engine_connect (conf, FALSE, &err);
>     }
>   else
>     conf->refcount += 1;
>@@ -2233,6 +2234,11 @@ try_to_contact_server (gboolean start_if
>   /* Try to launch server */      
>   server = gconf_activate_server (start_if_not_found,
>                                   err);
>+  if (server == CORBA_OBJECT_NIL) {
>+    unsetenv ("DBUS_SESSION_BUS_ADDRESS");
>+    server = gconf_activate_server (start_if_not_found,
>+                                    err);
>+  }
>     
>   /* Try to ping server, by adding ourselves as a client */
>   CORBA_exception_init (&ev);

Actions: View | Splinter Review

Attachments on bug 17970: 19484 | 19532 | 19543 | 19544

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.