Merge from trunk: Update menu accelerators, when adding/removing

Merge from trunk:
	* gtk/gtkwindow.c: Update menu accelerators, when adding/removing
	AccelGroups dynamically. (#469374)


svn path=/branches/gtk-2-10/; revision=18692
This commit is contained in:
Stefan Kost
2007-08-27 17:47:41 +00:00
parent 2410a9bf3a
commit 334e6c9cf6
2 changed files with 9 additions and 0 deletions

View File

@@ -1,3 +1,10 @@
2007-08-27 Stefan Kost <ensonic@users.sf.net>
Merge from trunk:
* gtk/gtkwindow.c: Update menu accelerators, when adding/removing
AccelGroups dynamically. (#469374)
2007-08-27 Cody Russell <bratsche@gnome.org>
Merge from trunk:

View File

@@ -1402,6 +1402,7 @@ gtk_window_add_accel_group (GtkWindow *window,
g_signal_connect_object (accel_group, "accel_changed",
G_CALLBACK (gtk_window_notify_keys_changed),
window, G_CONNECT_SWAPPED);
gtk_window_notify_keys_changed (window);
}
/**
@@ -1422,6 +1423,7 @@ gtk_window_remove_accel_group (GtkWindow *window,
gtk_window_notify_keys_changed,
window);
_gtk_accel_group_detach (accel_group, G_OBJECT (window));
gtk_window_notify_keys_changed (window);
}
static GtkMnemonicHash *