diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2005-04-12 20:24:28 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-04-12 20:24:28 +0000 |
| commit | 724ab21b715a13827d62e8b20b12d9b1aa705f6a (patch) | |
| tree | b9f13b365f01019610e6a8dc6b2ca776c15cb2f9 | |
| parent | 3dd63f1ed089ddda69fcf6ea20e3410004951c2a (diff) | |
| download | gtk+-724ab21b715a13827d62e8b20b12d9b1aa705f6a.tar.gz | |
Sigh, revert another change
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | gtk/gtkactiongroup.c | 2 |
4 files changed, 16 insertions, 4 deletions
@@ -1,5 +1,9 @@ 2005-04-12 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): + Revert the fix for #170727, since it causes problems + with user-specified accelerators. + * gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): Revert the changes to display broken images, since there are applications which rely on the old behaviour. @@ -114,7 +118,7 @@ * gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Ignore regions which fall completely outside the line. (#165862, Felipe Heidrich) - + 2005-04-06 Matthias Clasen <mclasen@redhat.com> * gtk/*.c, gdk/gdkdisplaymanager.c: s/G-OBJECT/G_OBJECT/g, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e9762e5617..afb8c3a97e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2005-04-12 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): + Revert the fix for #170727, since it causes problems + with user-specified accelerators. + * gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): Revert the changes to display broken images, since there are applications which rely on the old behaviour. @@ -114,7 +118,7 @@ * gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Ignore regions which fall completely outside the line. (#165862, Felipe Heidrich) - + 2005-04-06 Matthias Clasen <mclasen@redhat.com> * gtk/*.c, gdk/gdkdisplaymanager.c: s/G-OBJECT/G_OBJECT/g, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e9762e5617..afb8c3a97e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 2005-04-12 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): + Revert the fix for #170727, since it causes problems + with user-specified accelerators. + * gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): Revert the changes to display broken images, since there are applications which rely on the old behaviour. @@ -114,7 +118,7 @@ * gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Ignore regions which fall completely outside the line. (#165862, Felipe Heidrich) - + 2005-04-06 Matthias Clasen <mclasen@redhat.com> * gtk/*.c, gdk/gdkdisplaymanager.c: s/G-OBJECT/G_OBJECT/g, diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c index e5458fc54c..de821a9373 100644 --- a/gtk/gtkactiongroup.c +++ b/gtk/gtkactiongroup.c @@ -603,7 +603,7 @@ gtk_action_group_add_action_with_accel (GtkActionGroup *action_group, } if (accel_key) - gtk_accel_map_change_entry (accel_path, accel_key, accel_mods, TRUE); + gtk_accel_map_add_entry (accel_path, accel_key, accel_mods); gtk_action_set_accel_path (action, accel_path); gtk_action_group_add_action (action_group, action); |