Fix a copy-and-paste error, noticed by Robert Ögren.

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

	* gtk/gtklabel.c (gtk_label_setup_mnemonic): Fix a
	copy-and-paste error, noticed by Robert Ögren.

diff --git a/ChangeLog b/ChangeLog
index 651b0b6f3e400a23d0b085fbc10e56f5c6cda52a..f28efb01ccd37151e75456a478bafcc3b9d3ee3a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-12  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_setup_mnemonic): Fix a 
+       copy-and-paste error, noticed by Robert Ögren.
+
 2004-12-11  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_menu_fill_level) 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 651b0b6f3e400a23d0b085fbc10e56f5c6cda52a..f28efb01ccd37151e75456a478bafcc3b9d3ee3a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-12-12  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_setup_mnemonic): Fix a 
+       copy-and-paste error, noticed by Robert Ögren.
+
 2004-12-11  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_menu_fill_level) 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 651b0b6f3e400a23d0b085fbc10e56f5c6cda52a..f28efb01ccd37151e75456a478bafcc3b9d3ee3a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-12-12  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_setup_mnemonic): Fix a 
+       copy-and-paste error, noticed by Robert Ögren.
+
 2004-12-11  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_menu_fill_level) 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 651b0b6f3e400a23d0b085fbc10e56f5c6cda52a..f28efb01ccd37151e75456a478bafcc3b9d3ee3a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-12-12  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_setup_mnemonic): Fix a 
+       copy-and-paste error, noticed by Robert Ögren.
+
 2004-12-11  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_menu_fill_level) 

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 8a95d945122f699f72113744a4de014edf0e5ccb..bb6eb5f8da54134c14c766a42c338d2f3b180ab3 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -853,7 +853,7 @@ gtk_label_setup_mnemonic (GtkLabel *label,
          _gtk_menu_shell_remove_mnemonic (GTK_MENU_SHELL (mnemonic_menu),
                                           last_key,
                                           widget);
-         label->mnemonic_window = NULL;
+         mnemonic_menu = NULL;
        }
     }