summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-65
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--gtk/gtklabel.c2
5 files changed, 21 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 651b0b6f3e..f28efb01cc 100644
--- 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 651b0b6f3e..f28efb01cc 100644
--- 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 651b0b6f3e..f28efb01cc 100644
--- 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 651b0b6f3e..f28efb01cc 100644
--- 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 8a95d94512..bb6eb5f8da 100644
--- 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;
}
}