aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2009-12-21 18:58:48 +0800
committerMilan Crha <mcrha@redhat.com>2009-12-21 18:58:48 +0800
commit35fec013258605bba2499514a4e5336a9649611f (patch)
tree1f57235371c7b3e13b59ea36a40cf021f08c31e2 /e-util
parent45f3e80635fcfb291f9cad780f5caeec88465636 (diff)
downloadgsoc2013-evolution-35fec013258605bba2499514a4e5336a9649611f.tar
gsoc2013-evolution-35fec013258605bba2499514a4e5336a9649611f.tar.gz
gsoc2013-evolution-35fec013258605bba2499514a4e5336a9649611f.tar.bz2
gsoc2013-evolution-35fec013258605bba2499514a4e5336a9649611f.tar.lz
gsoc2013-evolution-35fec013258605bba2499514a4e5336a9649611f.tar.xz
gsoc2013-evolution-35fec013258605bba2499514a4e5336a9649611f.tar.zst
gsoc2013-evolution-35fec013258605bba2499514a4e5336a9649611f.zip
Bug #596967 - Fix little constraint mistake from previous commit
Diffstat (limited to 'e-util')
-rw-r--r--e-util/gconf-bridge.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c
index 03f82f43ca..8405c682ff 100644
--- a/e-util/gconf-bridge.c
+++ b/e-util/gconf-bridge.c
@@ -555,9 +555,8 @@ prop_binding_block_cb (gpointer hkey, PropBinding *binding, const gchar *key)
{
g_return_if_fail (binding != NULL);
g_return_if_fail (key != NULL);
- g_return_if_fail (binding->key != NULL);
- if (binding->type == BINDING_PROP && g_ascii_strcasecmp (binding->key, key) == 0)
+ if (binding->type == BINDING_PROP && binding->key && g_ascii_strcasecmp (binding->key, key) == 0)
g_signal_handler_block (binding->object, binding->prop_notify_id);
}
@@ -566,9 +565,8 @@ prop_binding_unblock_cb (gpointer hkey, PropBinding *binding, const gchar *key)
{
g_return_if_fail (binding != NULL);
g_return_if_fail (key != NULL);
- g_return_if_fail (binding->key != NULL);
- if (binding->type == BINDING_PROP && g_ascii_strcasecmp (binding->key, key) == 0)
+ if (binding->type == BINDING_PROP && binding->key && g_ascii_strcasecmp (binding->key, key) == 0)
g_signal_handler_unblock (binding->object, binding->prop_notify_id);
}