aboutsummaryrefslogtreecommitdiffstats
path: root/e-util/gconf-bridge.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-05-29 04:17:30 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-05-29 04:17:30 +0800
commit2cb330eb0978689dd2535c70be08fc01c0e05379 (patch)
tree40a2b094519f771f0607964a0ce4ccc060b4c3c8 /e-util/gconf-bridge.c
parent732e7096a18a2e2bb9074bdf8026af037d9f8685 (diff)
downloadgsoc2013-evolution-2cb330eb0978689dd2535c70be08fc01c0e05379.tar
gsoc2013-evolution-2cb330eb0978689dd2535c70be08fc01c0e05379.tar.gz
gsoc2013-evolution-2cb330eb0978689dd2535c70be08fc01c0e05379.tar.bz2
gsoc2013-evolution-2cb330eb0978689dd2535c70be08fc01c0e05379.tar.lz
gsoc2013-evolution-2cb330eb0978689dd2535c70be08fc01c0e05379.tar.xz
gsoc2013-evolution-2cb330eb0978689dd2535c70be08fc01c0e05379.tar.zst
gsoc2013-evolution-2cb330eb0978689dd2535c70be08fc01c0e05379.zip
Revert "Bug #608203 - Left pane of mailer window is really narrow at startup"
This reverts commit 0cdd9484fec0b1fec0801df7d7e0b05c6544ba9b. Causes the Mail window to erroneously switch to Contacts when opening the Contacts window in express mode.
Diffstat (limited to 'e-util/gconf-bridge.c')
-rw-r--r--e-util/gconf-bridge.c33
1 files changed, 5 insertions, 28 deletions
diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c
index e5d5a1998e..d0f884d8fa 100644
--- a/e-util/gconf-bridge.c
+++ b/e-util/gconf-bridge.c
@@ -53,9 +53,6 @@ typedef struct {
that have not received change notification
yet. */
- GConfValue *use_first_value; /* Not NULL when the object is a
- Widget and wasn't realized. */
-
GObject *object;
GParamSpec *prop;
gulong prop_notify_id;
@@ -266,9 +263,6 @@ prop_binding_sync_prop_to_pref (PropBinding *binding)
binding->prop->name,
&value);
- if (binding->use_first_value) {
- gconf_value = binding->use_first_value;
- } else
switch (value.g_type) {
case G_TYPE_STRING:
gconf_value = gconf_value_new (GCONF_VALUE_STRING);
@@ -362,17 +356,10 @@ prop_binding_sync_prop_to_pref (PropBinding *binding)
/* Set to GConf */
gconf_client_set (bridge->client, binding->key, gconf_value, NULL);
- if (binding->use_first_value) {
- gconf_value_free (binding->use_first_value);
- binding->use_first_value = NULL;
-
- gconf_client_notify (bridge->client, binding->key);
- } else {
- /* Store until change notification comes in, so that we are able
- * to ignore it */
- binding->val_changes = g_slist_append (binding->val_changes,
- gconf_value);
- }
+ /* Store until change notification comes in, so that we are able
+ * to ignore it */
+ binding->val_changes = g_slist_append (binding->val_changes,
+ gconf_value);
done:
g_value_unset (&value);
@@ -526,7 +513,6 @@ gconf_bridge_bind_property_full (GConfBridge *bridge,
binding->id = new_id ();
binding->delayed_mode = delayed_sync;
binding->val_changes = NULL;
- binding->use_first_value = NULL;
binding->key = g_strdup (key);
binding->object = object;
binding->prop = pspec;
@@ -550,11 +536,7 @@ gconf_bridge_bind_property_full (GConfBridge *bridge,
val = gconf_client_get (bridge->client, key, NULL);
if (val) {
prop_binding_sync_pref_to_prop (binding, val);
- if (GTK_IS_WIDGET (object) && !gtk_widget_get_realized (GTK_WIDGET (object))) {
- binding->use_first_value = val;
- } else {
- gconf_value_free (val);
- }
+ gconf_value_free (val);
}
/* Handle case where watched object gets destroyed */
@@ -645,11 +627,6 @@ prop_binding_unbind (PropBinding *binding)
(binding->val_changes, binding->val_changes);
}
- if (binding->use_first_value) {
- gconf_value_free (binding->use_first_value);
- binding->use_first_value = NULL;
- }
-
/* The object might have been destroyed .. */
if (binding->object) {
g_signal_handler_disconnect (binding->object,