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
This commit is contained in:
Emmanuele Bassi 2016-04-10 17:51:58 +01:00
parent ee58a52a61
commit 90d28d6bbf

View File

@ -464,7 +464,7 @@ set_recent_manager (GtkRecentAction *action,
GtkRecentActionPrivate *priv = action->priv; GtkRecentActionPrivate *priv = action->priv;
if (manager) if (manager)
priv->manager = NULL; priv->manager = manager;
else else
priv->manager = gtk_recent_manager_get_default (); priv->manager = gtk_recent_manager_get_default ();
} }
@ -475,8 +475,6 @@ gtk_recent_action_finalize (GObject *gobject)
GtkRecentAction *action = GTK_RECENT_ACTION (gobject); GtkRecentAction *action = GTK_RECENT_ACTION (gobject);
GtkRecentActionPrivate *priv = action->priv; GtkRecentActionPrivate *priv = action->priv;
priv->manager = NULL;
if (priv->data_destroy) if (priv->data_destroy)
{ {
priv->data_destroy (priv->sort_data); priv->data_destroy (priv->sort_data);
@ -503,6 +501,8 @@ gtk_recent_action_dispose (GObject *gobject)
priv->current_filter = NULL; priv->current_filter = NULL;
} }
priv->manager = NULL;
G_OBJECT_CLASS (gtk_recent_action_parent_class)->dispose (gobject); G_OBJECT_CLASS (gtk_recent_action_parent_class)->dispose (gobject);
} }