From d7917514549f48297bc0032a7e2b54bfb17f7495 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@linux.intel.com>
Date: Wed, 26 Oct 2011 16:42:35 +0100
Subject: gconf-dbus: Clean up ORBit vs DBus logic (thanks, Jasper St. Pierre)

---
 gconf/gconf-database.c | 8 ++++----
 1 file 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;
-- 
cgit v1.2.1