[evolution/gnome-3-6] Bug #674236 - Extra ref in e_action_combo_box_set_action()
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/gnome-3-6] Bug #674236 - Extra ref in e_action_combo_box_set_action()
- Date: Tue, 19 Feb 2013 12:18:53 +0000 (UTC)
commit ccee9cb0946be9a16721de2be08bdb539aa43a8b
Author: Milan Crha <mcrha redhat com>
Date: Tue Feb 19 13:18:18 2013 +0100
Bug #674236 - Extra ref in e_action_combo_box_set_action()
widgets/misc/e-action-combo-box.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/widgets/misc/e-action-combo-box.c b/widgets/misc/e-action-combo-box.c
index 0747a6e..2ea6a93 100644
--- a/widgets/misc/e-action-combo-box.c
+++ b/widgets/misc/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,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]