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)

diff --git a/ChangeLog b/ChangeLog
index ce5115520b8a9af4f67dfca00f13f34cf66cb2bf..73f011464415c8ca747631bcc54108624336a572 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 ce5115520b8a9af4f67dfca00f13f34cf66cb2bf..73f011464415c8ca747631bcc54108624336a572 100644 (file)
--- 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 a350b9eeb8f907d210839cf764f0743c4d72acca..06b4f8054a6de7f0c0af26eb008715056fa18acf 100644 (file)
--- 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)