[maemo-commits] [maemo-commits] r12497 - in projects/haf/trunk/gconf2: . debian gconf

[From: subversion at stage.maemo.org]

Author: richard
Date: 2007-06-27 11:13:45 +0300 (Wed, 27 Jun 2007)
New Revision: 12497

Modified:
   projects/haf/trunk/gconf2/ChangeLog
   projects/haf/trunk/gconf2/debian/changelog
   projects/haf/trunk/gconf2/gconf/gconf-database-dbus.c
Log:
NB#59161.

Modified: projects/haf/trunk/gconf2/ChangeLog
===================================================================
--- projects/haf/trunk/gconf2/ChangeLog	2007-06-27 07:52:09 UTC (rev 12496)
+++ projects/haf/trunk/gconf2/ChangeLog	2007-06-27 08:13:45 UTC (rev 12497)
@@ -1,3 +1,8 @@
+2007-06-27  Richard Hult  <richard at imendio.com>
+
+	* gconf/gconf-database-dbus.c (database_handle_set_schema): Empty
+	schema name means unset.
+
 2007-05-24  Richard Hult  <richard at imendio.com>
 
 	* gconf/gconf-database-dbus.c: (database_handle_get_all_dirs):

Modified: projects/haf/trunk/gconf2/debian/changelog
===================================================================
--- projects/haf/trunk/gconf2/debian/changelog	2007-06-27 07:52:09 UTC (rev 12496)
+++ projects/haf/trunk/gconf2/debian/changelog	2007-06-27 08:13:45 UTC (rev 12497)
@@ -1,6 +1,7 @@
 gconf2 (2.16.0~unreleased) unstable; urgency=low
 
   * Partly fixes NB#56587, dh_gconf does not generate .postinst scripts
+  * Fixes: NB#59161, Cannot unapply schema from gconf
 
  -- Richard Hult <richard at imendio.com>  Tue, 26 Jun 2007 16:13:53 +0200
 

Modified: projects/haf/trunk/gconf2/gconf/gconf-database-dbus.c
===================================================================
--- projects/haf/trunk/gconf2/gconf/gconf-database-dbus.c	2007-06-27 07:52:09 UTC (rev 12496)
+++ projects/haf/trunk/gconf2/gconf/gconf-database-dbus.c	2007-06-27 08:13:45 UTC (rev 12497)
@@ -639,6 +639,10 @@
 				     DBUS_TYPE_INVALID)) 
     return;
 
+  /* Empty schema key name means unset. */ 
+  if (schema_key[0] == '\0')
+    schema_key = NULL;
+  
   gconf_database_set_schema (db, key, schema_key, &gerror);
 
   if (gconfd_dbus_set_exception (conn, message, &gerror))