[gconf] gconf-dbus: Clean up ORBit vs DBus logic (thanks, Jasper St. Pierre)
- From: Ross Burton <rburton src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gconf] gconf-dbus: Clean up ORBit vs DBus logic (thanks, Jasper St. Pierre)
- Date: Wed, 26 Oct 2011 15:43:26 +0000 (UTC)
commit d7917514549f48297bc0032a7e2b54bfb17f7495
Author: Ross Burton <ross linux intel com>
Date: Wed Oct 26 16:42:35 2011 +0100
gconf-dbus: Clean up ORBit vs DBus logic (thanks, Jasper St. Pierre)
gconf/gconf-database.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gconf/gconf-database.c b/gconf/gconf-database.c
index 63dfc08..91fc612 100644
--- a/gconf/gconf-database.c
+++ b/gconf/gconf-database.c
@@ -797,14 +797,14 @@ gconf_database_set_sources (GConfDatabase *db,
{
if (db->sources != NULL)
{
-#ifdef HAVE_CORBA
/* this function should only be used when creating the db with the corba
* backend */
- g_assert_not_reached ();
-#endif
-
+#ifdef HAVE_CORBA
gconf_sources_clear_cache(db->sources);
gconf_sources_free(db->sources);
+#else
+ g_assert_not_reached ();
+#endif
}
db->sources = sources;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]