diff --git a/ChangeLog b/ChangeLog index 76c160e79f..fb25b987fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2004-12-22 Matthias Clasen + + * gtk/gtklabel.c (gtk_label_setup_mnemonic): Don't forget to + null the mnemonic_menu when unsetting a mnemonic, reported + by Owen Taylor. + +2004-12-21 Matthias Clasen + + * gtk/gtkliststore.c (generate_order): Generate the order the + way it is supposed to be, order[new_pos] == old_pos. + (gtk_list_store_reorder): Invert the order before using it. + 2004-12-22 Matthias Clasen Fix sorting of list stores. (#161886, Marcin Krzyzanowski) @@ -14,6 +26,7 @@ Wed Dec 22 01:24:01 2004 Jonathan Blandford * gtk/queryimmodules.c (main): print out the version and binary name in the header comment. Problem reported by Seth Nickell. +>>>>>>> 1.6232 2004-12-20 Matthias Clasen * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Pass a diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 76c160e79f..fb25b987fa 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,15 @@ +2004-12-22 Matthias Clasen + + * gtk/gtklabel.c (gtk_label_setup_mnemonic): Don't forget to + null the mnemonic_menu when unsetting a mnemonic, reported + by Owen Taylor. + +2004-12-21 Matthias Clasen + + * gtk/gtkliststore.c (generate_order): Generate the order the + way it is supposed to be, order[new_pos] == old_pos. + (gtk_list_store_reorder): Invert the order before using it. + 2004-12-22 Matthias Clasen Fix sorting of list stores. (#161886, Marcin Krzyzanowski) @@ -14,6 +26,7 @@ Wed Dec 22 01:24:01 2004 Jonathan Blandford * gtk/queryimmodules.c (main): print out the version and binary name in the header comment. Problem reported by Seth Nickell. +>>>>>>> 1.6232 2004-12-20 Matthias Clasen * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Pass a diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 76c160e79f..fb25b987fa 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,15 @@ +2004-12-22 Matthias Clasen + + * gtk/gtklabel.c (gtk_label_setup_mnemonic): Don't forget to + null the mnemonic_menu when unsetting a mnemonic, reported + by Owen Taylor. + +2004-12-21 Matthias Clasen + + * gtk/gtkliststore.c (generate_order): Generate the order the + way it is supposed to be, order[new_pos] == old_pos. + (gtk_list_store_reorder): Invert the order before using it. + 2004-12-22 Matthias Clasen Fix sorting of list stores. (#161886, Marcin Krzyzanowski) @@ -14,6 +26,7 @@ Wed Dec 22 01:24:01 2004 Jonathan Blandford * gtk/queryimmodules.c (main): print out the version and binary name in the header comment. Problem reported by Seth Nickell. +>>>>>>> 1.6232 2004-12-20 Matthias Clasen * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Pass a diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 76c160e79f..fb25b987fa 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,15 @@ +2004-12-22 Matthias Clasen + + * gtk/gtklabel.c (gtk_label_setup_mnemonic): Don't forget to + null the mnemonic_menu when unsetting a mnemonic, reported + by Owen Taylor. + +2004-12-21 Matthias Clasen + + * gtk/gtkliststore.c (generate_order): Generate the order the + way it is supposed to be, order[new_pos] == old_pos. + (gtk_list_store_reorder): Invert the order before using it. + 2004-12-22 Matthias Clasen Fix sorting of list stores. (#161886, Marcin Krzyzanowski) @@ -14,6 +26,7 @@ Wed Dec 22 01:24:01 2004 Jonathan Blandford * gtk/queryimmodules.c (main): print out the version and binary name in the header comment. Problem reported by Seth Nickell. +>>>>>>> 1.6232 2004-12-20 Matthias Clasen * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Pass a diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index b9048fd7a8..7bd5329e74 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -889,7 +889,7 @@ gtk_label_setup_mnemonic (GtkLabel *label, } if (label->mnemonic_keyval == GDK_VoidSymbol) - return; + goto done; toplevel = gtk_widget_get_toplevel (widget); if (GTK_WIDGET_TOPLEVEL (toplevel)) @@ -916,6 +916,7 @@ gtk_label_setup_mnemonic (GtkLabel *label, } } + done: g_object_set_data (G_OBJECT (label), "gtk-mnemonic-menu", mnemonic_menu); }