diff options
| author | Mikael Hallendal <hallski@src.gnome.org> | 2004-11-18 22:51:56 +0000 |
|---|---|---|
| committer | Mikael Hallendal <hallski@src.gnome.org> | 2004-11-18 22:51:56 +0000 |
| commit | a37be5a2cca9a8d517a975fbba17ac89fad9fed4 (patch) | |
| tree | a95b4f2074bdd7a611bd09fc8012bcd715caa451 | |
| parent | c14076a19ca7fae43bb12bca4195410a49c8db1f (diff) | |
| download | gconf-a37be5a2cca9a8d517a975fbba17ac89fad9fed4.tar.gz | |
temporary fix for bug #158649
| -rw-r--r-- | backends/xml-backend.c | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | gconf/gconf-database-dbus.c | 7 |
3 files changed, 7 insertions, 4 deletions
diff --git a/backends/xml-backend.c b/backends/xml-backend.c index 6d1bff1a..a1e52939 100644 --- a/backends/xml-backend.c +++ b/backends/xml-backend.c @@ -325,7 +325,7 @@ resolve_address (const gchar* address, GError** err) if (root_dir == NULL) return NULL; - if (mkdir(root_dir, dir_mode) < 0) + if (stat (root_dir, &statbuf) == 0) { /* Already exists, base our dir_mode on it */ dir_mode = _gconf_mode_t_to_mode (statbuf.st_mode); diff --git a/configure.in b/configure.in index d080e897..71301c67 100644 --- a/configure.in +++ b/configure.in @@ -187,7 +187,7 @@ fi AC_ARG_WITH(ipc, [ --with-ipc=[orbit/dbus/both] choose ipc mechanism to use in the daemon, [default=dbus]], with_ipc="$withval", with_ipc=dbus) if test x$with_ipc = xorbit -o x$with_ipc = xboth; then - PKG_CHECK_MODULES(GCONF_ORBIT, ORBit-2.0 >= 2.4.0 linc >= 0.5.0, have_orbit=yes, have_orbit=no) + PKG_CHECK_MODULES(GCONF_ORBIT, ORBit-2.0 >= 2.6.0, have_orbit=yes, have_orbit=no) if test x$have_orbit = xno ; then AC_MSG_WARN([ORBit development libraries not found]) have_orbit=no diff --git a/gconf/gconf-database-dbus.c b/gconf/gconf-database-dbus.c index 6a57ddf2..dc99f7e3 100644 --- a/gconf/gconf-database-dbus.c +++ b/gconf/gconf-database-dbus.c @@ -396,12 +396,15 @@ database_handle_unset (DBusConnection *conn, dbus_free (key); dbus_free (locale); + gconf_database_sync (db->db, NULL); + if (gconfd_dbus_set_exception (conn, message, &gerror)) return; reply = dbus_message_new_method_return (message); dbus_connection_send (conn, reply, NULL); dbus_message_unref (reply); + } static void @@ -432,6 +435,8 @@ database_handle_recursive_unset (DBusConnection *conn, dbus_free (key); dbus_free (locale); + gconf_database_sync (db->db, NULL); + if (gconfd_dbus_set_exception (conn, message, &gerror)) return; @@ -765,8 +770,6 @@ database_foreach_unregister (gpointer key, GConfDatabaseDBus *db, gpointer user_data) { - gchar **path; - dbus_connection_unregister_object_path (db->conn, db->object_path); return TRUE; |