aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2013-02-19 20:17:35 +0800
committerMilan Crha <mcrha@redhat.com>2013-02-19 20:17:35 +0800
commit685e763c6ac8923cbf8af5c5c84d441ee2df7db5 (patch)
treef973a9ebd613f34c482c01bd17dbe3e1e6833f2f /e-util
parent00ef9f2f479f47b770cd7cc20a5317254e09e0ed (diff)
downloadgsoc2013-evolution-685e763c6ac8923cbf8af5c5c84d441ee2df7db5.tar.gz
gsoc2013-evolution-685e763c6ac8923cbf8af5c5c84d441ee2df7db5.tar.zst
gsoc2013-evolution-685e763c6ac8923cbf8af5c5c84d441ee2df7db5.zip
Bug #674236 - Extra ref in e_action_combo_box_set_action()
Diffstat (limited to 'e-util')
-rw-r--r--e-util/e-action-combo-box.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/e-util/e-action-combo-box.c b/e-util/e-action-combo-box.c
index cb15d276d8..0b7a31c90a 100644
--- a/e-util/e-action-combo-box.c
+++ b/e-util/e-action-combo-box.c
@@ -490,10 +490,12 @@ e_action_combo_box_set_action (EActionComboBox *combo_box,
combo_box->priv->action_group = NULL;
}
- if (action != NULL)
+ if (action != NULL) {
+ /* This also adds a reference to the combo_box->priv->action_group */
g_object_get (
g_object_ref (action), "action-group",
&combo_box->priv->action_group, NULL);
+ }
combo_box->priv->action = action;
action_combo_box_update_model (combo_box);
@@ -505,7 +507,6 @@ e_action_combo_box_set_action (EActionComboBox *combo_box,
combo_box);
if (combo_box->priv->action_group != NULL) {
- g_object_ref (combo_box->priv->action_group);
combo_box->priv->group_sensitive_handler_id =
g_signal_connect (
combo_box->priv->action_group,