summaryrefslogtreecommitdiff
path: root/gtk/gtkaccelmap.c
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2012-01-20 13:56:02 -0500
committerRyan Lortie <desrt@desrt.ca>2012-01-23 11:17:07 -0500
commit880daf8bb2d13a8f5188766f5fcdb61ff5552b20 (patch)
tree780c38100faa6e3c9d852863122f8fac3d14a6d6 /gtk/gtkaccelmap.c
parente34589ddeab1419a9124062a93ff483c3843a218 (diff)
downloadgtk+-880daf8bb2d13a8f5188766f5fcdb61ff5552b20.tar.gz
GtkApplication: change the accel prefix we use
GtkApplication adds to the global accel map using the prefix <Actions> which is also used by GtkAction. This causes GtkApplicationWindow to try to parse GtkAction-added accels as if they were its own (which fails). Switch to a different namespace -- <GAction>/. https://bugzilla.gnome.org/show_bug.cgi?id=668367
Diffstat (limited to 'gtk/gtkaccelmap.c')
-rw-r--r--gtk/gtkaccelmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkaccelmap.c b/gtk/gtkaccelmap.c
index 2f33b92c66..2b92145156 100644
--- a/gtk/gtkaccelmap.c
+++ b/gtk/gtkaccelmap.c
@@ -1073,7 +1073,7 @@ _gtk_accel_path_for_action (const gchar *action_name,
{
GString *s;
- s = g_string_new ("<Actions>/");
+ s = g_string_new ("<GAction>/");
g_string_append (s, action_name);
if (parameter)
{