summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2008-02-10 06:36:55 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2008-02-10 06:36:55 +0000
commit17af886caa5d38a12353df13dafeaba413023a01 (patch)
treec777ec732fbcc9690bda8b0a3946dc636248193a
parentde2bebed70ef851133603838a67196e55156ad12 (diff)
downloadgdk-pixbuf-17af886caa5d38a12353df13dafeaba413023a01.tar.gz
Propagate local-only. (#511987, Jonh Wendell)
2008-02-10 Matthias Clasen <mclasen@redhat.com> * gtk/gtkrecentaction.c: Propagate local-only. (#511987, Jonh Wendell) svn path=/branches/gtk-2-12/; revision=19506
-rw-r--r--ChangeLog7
-rw-r--r--gtk/gtkrecentaction.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index be01fbb87..35c347f28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-10 Matthias Clasen <mclasen@redhat.com>
+
+ Merge from trunk:
+
+ * gtk/gtkrecentaction.c: Propagate local-only. (#511987,
+ Jonh Wendell)
+
2008-02-08 Richard Hult <richard@imendio.com>
Merge from trunk:
diff --git a/gtk/gtkrecentaction.c b/gtk/gtkrecentaction.c
index 5beec74a4..21213635a 100644
--- a/gtk/gtkrecentaction.c
+++ b/gtk/gtkrecentaction.c
@@ -350,6 +350,7 @@ gtk_recent_action_connect_proxy (GtkAction *action,
"limit", priv->limit,
"sort-type", priv->sort_type,
"filter", priv->current_filter,
+ "local-only", priv->local_only,
NULL);
if (priv->sort_func)
@@ -404,6 +405,7 @@ gtk_recent_action_create_menu (GtkAction *action)
"sort-type", priv->sort_type,
"recent-manager", priv->manager,
"filter", priv->current_filter,
+ "local-only", priv->local_only,
NULL);
if (priv->sort_func)