summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2016-04-10 17:51:58 +0100
committerMatthias Clasen <mclasen@redhat.com>2016-04-19 10:30:59 -0400
commit1c449e8d4a49c35527515b5f608821227579a08e (patch)
tree1c1857c4148eba731e8f4063dcf0dd8368b5bf38
parent6144469d0210c84c211573706f29d84c4b16d5fd (diff)
downloadgtk+-1c449e8d4a49c35527515b5f608821227579a08e.tar.gz
Assign a recent manager if one is set
The GtkRecentAction implementation ignored a GtkRecentManager passed to its :manager property. https://bugzilla.gnome.org/show_bug.cgi?id=620065
-rw-r--r--gtk/deprecated/gtkrecentaction.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/deprecated/gtkrecentaction.c b/gtk/deprecated/gtkrecentaction.c
index 4b1b1b8049..3431e3743f 100644
--- a/gtk/deprecated/gtkrecentaction.c
+++ b/gtk/deprecated/gtkrecentaction.c
@@ -464,7 +464,7 @@ set_recent_manager (GtkRecentAction *action,
GtkRecentActionPrivate *priv = action->priv;
if (manager)
- priv->manager = NULL;
+ priv->manager = manager;
else
priv->manager = gtk_recent_manager_get_default ();
}
@@ -475,8 +475,6 @@ gtk_recent_action_finalize (GObject *gobject)
GtkRecentAction *action = GTK_RECENT_ACTION (gobject);
GtkRecentActionPrivate *priv = action->priv;
- priv->manager = NULL;
-
if (priv->data_destroy)
{
priv->data_destroy (priv->sort_data);
@@ -503,6 +501,8 @@ gtk_recent_action_dispose (GObject *gobject)
priv->current_filter = NULL;
}
+ priv->manager = NULL;
+
G_OBJECT_CLASS (gtk_recent_action_parent_class)->dispose (gobject);
}