diff options
author | Matthias Clasen <mclasen@redhat.com> | 2006-01-09 16:54:04 +0000 |
---|---|---|
committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-01-09 16:54:04 +0000 |
commit | eb590e8487685f526dd764179635b02fbc1dc9ad (patch) | |
tree | c975b9a266c2d9092ff5baca67e7130869508441 | |
parent | ed565c27bae3afb9fa0361493573322b0414b0c1 (diff) | |
download | gtk+-eb590e8487685f526dd764179635b02fbc1dc9ad.tar.gz |
Go back to the old key for attaching the action to the proxy. (#326288,
2006-01-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaction.c: Go back to the old key for attaching the
action to the proxy. (#326288, Diego González)
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
-rw-r--r-- | gtk/gtkaction.c | 2 |
3 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2006-01-09 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkaction.c: Go back to the old key for attaching the + action to the proxy. (#326288, Diego González) + 2006-01-08 Matthias Clasen <mclasen@redhat.com> * gtk/gtkactiongroup.c (dgettext_swapped): Don't translate diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ce5115520b..73f0114644 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-01-09 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkaction.c: Go back to the old key for attaching the + action to the proxy. (#326288, Diego González) + 2006-01-08 Matthias Clasen <mclasen@redhat.com> * gtk/gtkactiongroup.c (dgettext_swapped): Don't translate diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c index a350b9eeb8..06b4f8054a 100644 --- a/gtk/gtkaction.c +++ b/gtk/gtkaction.c @@ -110,7 +110,7 @@ static void gtk_action_class_init (GtkActionClass *class); static GQuark accel_path_id = 0; static GQuark quark_gtk_action_proxy = 0; static const gchar accel_path_key[] = "GtkAction::accel_path"; -static const gchar gtk_action_proxy_key[] = "gtk-action-proxy"; +static const gchar gtk_action_proxy_key[] = "gtk-action"; GType gtk_action_get_type (void) |