From 9eb2d7c261dbbfaa3f7248efb88970eb02aa210a Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 25 Aug 2003 21:34:49 +0000 Subject: [PATCH] Don't include page->menu_label - causes various problems, including Mon Aug 25 17:28:04 2003 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_forall): Don't include page->menu_label - causes various problems, including #12047. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtknotebook.c | 2 -- 6 files changed, 30 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4f110ccb58..91a9358f01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Aug 25 17:28:04 2003 Owen Taylor + + * gtk/gtknotebook.c (gtk_notebook_forall): Don't + include page->menu_label - causes various problems, + including #12047. + Mon Aug 25 23:21:43 2003 Kristian Rietveld Merge from stable. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4f110ccb58..91a9358f01 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Aug 25 17:28:04 2003 Owen Taylor + + * gtk/gtknotebook.c (gtk_notebook_forall): Don't + include page->menu_label - causes various problems, + including #12047. + Mon Aug 25 23:21:43 2003 Kristian Rietveld Merge from stable. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4f110ccb58..91a9358f01 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Aug 25 17:28:04 2003 Owen Taylor + + * gtk/gtknotebook.c (gtk_notebook_forall): Don't + include page->menu_label - causes various problems, + including #12047. + Mon Aug 25 23:21:43 2003 Kristian Rietveld Merge from stable. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4f110ccb58..91a9358f01 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Aug 25 17:28:04 2003 Owen Taylor + + * gtk/gtknotebook.c (gtk_notebook_forall): Don't + include page->menu_label - causes various problems, + including #12047. + Mon Aug 25 23:21:43 2003 Kristian Rietveld Merge from stable. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4f110ccb58..91a9358f01 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Aug 25 17:28:04 2003 Owen Taylor + + * gtk/gtknotebook.c (gtk_notebook_forall): Don't + include page->menu_label - causes various problems, + including #12047. + Mon Aug 25 23:21:43 2003 Kristian Rietveld Merge from stable. diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 9f6db3b7ce..6cf9800ef6 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -2400,8 +2400,6 @@ gtk_notebook_forall (GtkContainer *container, { if (page->tab_label) (* callback) (page->tab_label, callback_data); - if (page->menu_label) - (* callback) (page->menu_label, callback_data); } } }