summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2009-04-14 23:12:15 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2009-04-14 23:12:15 +0000
commit5a18e7925b73d0a5b7e84b42513e4e84bc2b14ff (patch)
tree3a5f7ec16e424b82bfaead89b0be693ac545fd9e
parent2efcc74dd14ded072a7e69a6750cb825e626bd25 (diff)
downloadgconf-5a18e7925b73d0a5b7e84b42513e4e84bc2b14ff.tar.gz
Also trace if key is in cache. Don't trace the writable result, that's not
2009-04-14 Behdad Esfahbod <behdad@gnome.org> * gconf/gconf-client.c (gconf_client_key_is_writable): Also trace if key is in cache. Don't trace the writable result, that's not interesting. * gconf/gconf-client.c (gconf_client_set_bool): Trace this function. Somehow it was missing the trace line that other set_* functions have. svn path=/trunk/; revision=2842
-rw-r--r--ChangeLog10
-rw-r--r--gconf/gconf-client.c11
2 files changed, 14 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f76ca1c..7b754b77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2009-04-14 Behdad Esfahbod <behdad@gnome.org>
+ * gconf/gconf-client.c (gconf_client_key_is_writable): Also trace
+ if key is in cache. Don't trace the writable result, that's not
+ interesting.
+
+ * gconf/gconf-client.c (gconf_client_set_bool): Trace this function.
+ Somehow it was missing the trace line that other set_* functions
+ have.
+
+2009-04-14 Behdad Esfahbod <behdad@gnome.org>
+
* gconf/gconf-client.c: Consistently surround string parameters in
single-quotes in trace output.
diff --git a/gconf/gconf-client.c b/gconf/gconf-client.c
index cbbc8283..ed1ddfd2 100644
--- a/gconf/gconf-client.c
+++ b/gconf/gconf-client.c
@@ -1153,12 +1153,11 @@ gconf_client_key_is_writable (GConfClient* client,
g_return_val_if_fail (key != NULL, FALSE);
g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
- trace ("Checking whether key '%s' is writable...", key);
-
if (gconf_client_lookup (client, key, &entry))
{
g_assert (entry != NULL);
+ trace ("Checking in cache whether key '%s' is writable", key);
return gconf_entry_get_is_writable (entry);
}
@@ -1169,6 +1168,8 @@ gconf_client_key_is_writable (GConfClient* client,
else
g_assert (error == NULL);
+ trace ("Checking whether key '%s' is writable...", key);
+
if (entry == NULL)
is_writable = FALSE;
else
@@ -1176,11 +1177,6 @@ gconf_client_key_is_writable (GConfClient* client,
if (entry)
gconf_entry_free (entry);
-
- if (is_writable)
- trace ("'%s' is writable", key);
- else
- trace ("'%s' is not writable", key);
return is_writable;
}
@@ -1755,6 +1751,7 @@ gconf_client_set_bool (GConfClient* client, const gchar* key,
g_return_val_if_fail(GCONF_IS_CLIENT(client), FALSE);
g_return_val_if_fail(key != NULL, FALSE);
+ trace ("Setting bool '%s'", key);
PUSH_USE_ENGINE (client);
result = gconf_engine_set_bool (client->engine, key, val, &error);
POP_USE_ENGINE (client);