keep in sync with insert_page_menu. Code duplication is bad.

Wed Dec 12 15:01:33 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtknotebook.c (gtk_notebook_set_tab_label): keep in sync
	with insert_page_menu.  Code duplication is bad.

	* gtk/gtklabel.c (gtk_label_mnemonic_activate): Whoops -- got the
	wrong fix yesterday.

9 files changed, 65 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 047ae2930..0bffb6ba4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Dec 12 15:01:33 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_set_tab_label): keep in sync
+	with insert_page_menu.  Code duplication is bad.
+
+	* gtk/gtklabel.c (gtk_label_mnemonic_activate): Whoops -- got the
+	wrong fix yesterday.
+
 Wed Dec 12 14:27:30 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkmenubar.c (window_key_press_handler): Fix check for
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 047ae2930..0bffb6ba4 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Wed Dec 12 15:01:33 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_set_tab_label): keep in sync
+	with insert_page_menu.  Code duplication is bad.
+
+	* gtk/gtklabel.c (gtk_label_mnemonic_activate): Whoops -- got the
+	wrong fix yesterday.
+
 Wed Dec 12 14:27:30 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkmenubar.c (window_key_press_handler): Fix check for
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 047ae2930..0bffb6ba4 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Wed Dec 12 15:01:33 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_set_tab_label): keep in sync
+	with insert_page_menu.  Code duplication is bad.
+
+	* gtk/gtklabel.c (gtk_label_mnemonic_activate): Whoops -- got the
+	wrong fix yesterday.
+
 Wed Dec 12 14:27:30 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkmenubar.c (window_key_press_handler): Fix check for
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 047ae2930..0bffb6ba4 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Wed Dec 12 15:01:33 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_set_tab_label): keep in sync
+	with insert_page_menu.  Code duplication is bad.
+
+	* gtk/gtklabel.c (gtk_label_mnemonic_activate): Whoops -- got the
+	wrong fix yesterday.
+
 Wed Dec 12 14:27:30 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkmenubar.c (window_key_press_handler): Fix check for
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 047ae2930..0bffb6ba4 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Wed Dec 12 15:01:33 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_set_tab_label): keep in sync
+	with insert_page_menu.  Code duplication is bad.
+
+	* gtk/gtklabel.c (gtk_label_mnemonic_activate): Whoops -- got the
+	wrong fix yesterday.
+
 Wed Dec 12 14:27:30 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkmenubar.c (window_key_press_handler): Fix check for
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 047ae2930..0bffb6ba4 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Wed Dec 12 15:01:33 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_set_tab_label): keep in sync
+	with insert_page_menu.  Code duplication is bad.
+
+	* gtk/gtklabel.c (gtk_label_mnemonic_activate): Whoops -- got the
+	wrong fix yesterday.
+
 Wed Dec 12 14:27:30 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkmenubar.c (window_key_press_handler): Fix check for
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 047ae2930..0bffb6ba4 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Wed Dec 12 15:01:33 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_set_tab_label): keep in sync
+	with insert_page_menu.  Code duplication is bad.
+
+	* gtk/gtklabel.c (gtk_label_mnemonic_activate): Whoops -- got the
+	wrong fix yesterday.
+
 Wed Dec 12 14:27:30 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkmenubar.c (window_key_press_handler): Fix check for
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 450f114ac..df8dd74cd 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -668,7 +668,7 @@ gtk_label_mnemonic_activate (GtkWidget *widget,
   parent = widget->parent;
 
   if (parent && GTK_IS_NOTEBOOK (parent))
-    return gtk_widget_mnemonic_activate (parent, group_cycling);
+    return FALSE;
   
   while (parent)
     {
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 962dc26bf..6c3466c2f 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -4494,6 +4494,7 @@ gtk_notebook_set_tab_label (GtkNotebook *notebook,
   if (page->tab_label == tab_label)
     return;
   
+
   gtk_notebook_remove_tab_label (notebook, page);
   
   if (tab_label)
@@ -4518,6 +4519,13 @@ gtk_notebook_set_tab_label (GtkNotebook *notebook,
 	}
     }
 
+  if (page->tab_label)
+    page->mnemonic_activate_signal =
+      gtk_signal_connect (GTK_OBJECT (page->tab_label),
+			  "mnemonic_activate",
+			  (GtkSignalFunc) gtk_notebook_mnemonic_activate_switch_page,
+			  notebook);
+
   if (notebook->show_tabs && GTK_WIDGET_VISIBLE (child))
     {
       gtk_widget_show (page->tab_label);