gconf-editor r1439 - in trunk: . src

[cosimoc svn gnome org]

Author: cosimoc
Date: Fri Oct 31 14:20:48 2008
New Revision: 1439
URL: http://svn.gnome.org/viewvc/gconf-editor?rev=1439&view=rev

Log:
2008-10-31  Cosimo Cecchi  <cosimoc gnome org>

	* src/gconf-util.c: (can_edit_source):
	Use a GConfClient to decide whether we can edit a source instead
	of using the GConfEngine directly.


Modified:
   trunk/ChangeLog
   trunk/src/gconf-util.c

Modified: trunk/src/gconf-util.c
==============================================================================
--- trunk/src/gconf-util.c	(original)
+++ trunk/src/gconf-util.c	Fri Oct 31 14:20:48 2008
@@ -99,6 +99,7 @@
 can_edit_source (const char *source)
 {
 	GConfEngine *engine;
+	GConfClient *client;
 	GConfEntry  *entry;
 	GError      *error;
 	gboolean     retval;
@@ -107,7 +108,8 @@
 		return FALSE;
 
 	error = NULL;
-	entry = gconf_engine_get_entry (engine,
+	client = gconf_client_get_for_engine (engine);
+	entry = gconf_client_get_entry (client,
 					"/apps/gconf-editor/can_edit_source",
 					NULL,
 					FALSE,
@@ -115,6 +117,7 @@
 	if (error != NULL) {
 		g_assert (entry == NULL);
 		g_error_free (error);
+		g_object_unref (client);
 		gconf_engine_unref (engine);
 		return FALSE;
 	}
@@ -124,6 +127,7 @@
 	retval = gconf_entry_get_is_writable (entry);
 
 	gconf_entry_unref (entry);
+	g_object_unref (client);
 	gconf_engine_unref (engine);
 
 	return retval;