diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | gtk/gtknotebook.c | 7 |
8 files changed, 46 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Tue Aug 18 17:22:22 1998 Lars Hamann <lars@gtk.org> + + * gtk/gtknotebook.c (gtk_notebook_switch_focus_tab): + * gtk/gtknotebook.c (gtk_notebook_update_labels): fix for sigsegv + in case of show_tabs == NULL + Tue Aug 18 03:54:43 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_init): restricted the --g*fatal-* arguments diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 6df7e4d270..00ed1a0661 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Tue Aug 18 17:22:22 1998 Lars Hamann <lars@gtk.org> + + * gtk/gtknotebook.c (gtk_notebook_switch_focus_tab): + * gtk/gtknotebook.c (gtk_notebook_update_labels): fix for sigsegv + in case of show_tabs == NULL + Tue Aug 18 03:54:43 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_init): restricted the --g*fatal-* arguments diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6df7e4d270..00ed1a0661 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Tue Aug 18 17:22:22 1998 Lars Hamann <lars@gtk.org> + + * gtk/gtknotebook.c (gtk_notebook_switch_focus_tab): + * gtk/gtknotebook.c (gtk_notebook_update_labels): fix for sigsegv + in case of show_tabs == NULL + Tue Aug 18 03:54:43 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_init): restricted the --g*fatal-* arguments diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 6df7e4d270..00ed1a0661 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Tue Aug 18 17:22:22 1998 Lars Hamann <lars@gtk.org> + + * gtk/gtknotebook.c (gtk_notebook_switch_focus_tab): + * gtk/gtknotebook.c (gtk_notebook_update_labels): fix for sigsegv + in case of show_tabs == NULL + Tue Aug 18 03:54:43 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_init): restricted the --g*fatal-* arguments diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6df7e4d270..00ed1a0661 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Tue Aug 18 17:22:22 1998 Lars Hamann <lars@gtk.org> + + * gtk/gtknotebook.c (gtk_notebook_switch_focus_tab): + * gtk/gtknotebook.c (gtk_notebook_update_labels): fix for sigsegv + in case of show_tabs == NULL + Tue Aug 18 03:54:43 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_init): restricted the --g*fatal-* arguments diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6df7e4d270..00ed1a0661 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Tue Aug 18 17:22:22 1998 Lars Hamann <lars@gtk.org> + + * gtk/gtknotebook.c (gtk_notebook_switch_focus_tab): + * gtk/gtknotebook.c (gtk_notebook_update_labels): fix for sigsegv + in case of show_tabs == NULL + Tue Aug 18 03:54:43 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_init): restricted the --g*fatal-* arguments diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6df7e4d270..00ed1a0661 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Tue Aug 18 17:22:22 1998 Lars Hamann <lars@gtk.org> + + * gtk/gtknotebook.c (gtk_notebook_switch_focus_tab): + * gtk/gtknotebook.c (gtk_notebook_update_labels): fix for sigsegv + in case of show_tabs == NULL + Tue Aug 18 03:54:43 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_init): restricted the --g*fatal-* arguments diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index e63e4ed00c..7f8ea7ed45 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -3324,7 +3324,7 @@ gtk_notebook_switch_focus_tab (GtkNotebook *notebook, } } - if (!notebook->focus_tab) + if (!notebook->show_tabs || !notebook->focus_tab) return; if (old_tab) @@ -3432,8 +3432,9 @@ gtk_notebook_update_labels (GtkNotebook *notebook, gtk_label_set (GTK_LABEL (page->tab_label), string); if (notebook->menu && page->default_menu) { - if (GTK_IS_LABEL (page->tab_label)) - gtk_label_set (GTK_LABEL (page->menu_label), GTK_LABEL (page->tab_label)->label); + if (page->tab_label && GTK_IS_LABEL (page->tab_label)) + gtk_label_set (GTK_LABEL (page->menu_label), + GTK_LABEL (page->tab_label)->label); else gtk_label_set (GTK_LABEL (page->menu_label), string); } |