Don't forget to null the mnemonic_menu when unsetting a mnemonic, reported

2004-12-22  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtklabel.c (gtk_label_setup_mnemonic): Don't forget to
	null the mnemonic_menu when unsetting a mnemonic, reported
	by Owen Taylor.

diff --git a/ChangeLog b/ChangeLog
index 76c160e79fb5f3b0ca8a52f6806e2ab994f821fc..fb25b987faa9863118aa93bc74417d4a40f6209f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-12-22  Matthias Clasen  <mclasen@redhat.com>
+
+       * 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  <mclasen@redhat.com>
+
+       * 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  <mclasen@redhat.com>
 
        Fix sorting of list stores.  (#161886, Marcin Krzyzanowski)
@@ -14,6 +26,7 @@ Wed Dec 22 01:24:01 2004  Jonathan Blandford  <jrb@redhat.com>
        * 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  <mclasen@redhat.com>
 
        * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Pass a

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 76c160e79fb5f3b0ca8a52f6806e2ab994f821fc..fb25b987faa9863118aa93bc74417d4a40f6209f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+2004-12-22  Matthias Clasen  <mclasen@redhat.com>
+
+       * 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  <mclasen@redhat.com>
+
+       * 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  <mclasen@redhat.com>
 
        Fix sorting of list stores.  (#161886, Marcin Krzyzanowski)
@@ -14,6 +26,7 @@ Wed Dec 22 01:24:01 2004  Jonathan Blandford  <jrb@redhat.com>
        * 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  <mclasen@redhat.com>
 
        * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Pass a

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 76c160e79fb5f3b0ca8a52f6806e2ab994f821fc..fb25b987faa9863118aa93bc74417d4a40f6209f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+2004-12-22  Matthias Clasen  <mclasen@redhat.com>
+
+       * 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  <mclasen@redhat.com>
+
+       * 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  <mclasen@redhat.com>
 
        Fix sorting of list stores.  (#161886, Marcin Krzyzanowski)
@@ -14,6 +26,7 @@ Wed Dec 22 01:24:01 2004  Jonathan Blandford  <jrb@redhat.com>
        * 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  <mclasen@redhat.com>
 
        * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Pass a

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 76c160e79fb5f3b0ca8a52f6806e2ab994f821fc..fb25b987faa9863118aa93bc74417d4a40f6209f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+2004-12-22  Matthias Clasen  <mclasen@redhat.com>
+
+       * 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  <mclasen@redhat.com>
+
+       * 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  <mclasen@redhat.com>
 
        Fix sorting of list stores.  (#161886, Marcin Krzyzanowski)
@@ -14,6 +26,7 @@ Wed Dec 22 01:24:01 2004  Jonathan Blandford  <jrb@redhat.com>
        * 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  <mclasen@redhat.com>
 
        * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Pass a

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index b9048fd7a8160757d9ae1e57c49f3556f75b97f4..7bd5329e74be491a48ff047bb66f27a64a9a2f68 100644 (file)
--- 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);
 }