summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2006-01-09 16:54:04 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-01-09 16:54:04 +0000
commiteb590e8487685f526dd764179635b02fbc1dc9ad (patch)
treec975b9a266c2d9092ff5baca67e7130869508441
parented565c27bae3afb9fa0361493573322b0414b0c1 (diff)
downloadgtk+-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--ChangeLog5
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--gtk/gtkaction.c2
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ce5115520b..73f0114644 100644
--- 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 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)