summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross@linux.intel.com>2011-10-26 16:42:35 +0100
committerRoss Burton <ross@linux.intel.com>2011-10-26 16:42:49 +0100
commitd7917514549f48297bc0032a7e2b54bfb17f7495 (patch)
treecdfa3959cc694ef0f32943e6292efe9ae1a4f221
parentad3bc4f4fc78749e0d4bf2bfc2cd8045e2570f3f (diff)
downloadgconf-d7917514549f48297bc0032a7e2b54bfb17f7495.tar.gz
gconf-dbus: Clean up ORBit vs DBus logic (thanks, Jasper St. Pierre)
-rw-r--r--gconf/gconf-database.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gconf/gconf-database.c b/gconf/gconf-database.c
index 63dfc085..91fc6120 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;