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 | 4 |
8 files changed, 45 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Mon Nov 30 12:17:10 1998 Jeff Garzik <jgarzik@pobox.com> + + * gtk/gtknotebook.c (gtk_notebook_reorder_child): + Added initializer to quiet gcc warning. + Added assertion to check for null pointer deref. + Mon Nov 30 10:11:29 1998 Tim Janik <timj@gtk.org> * gtk/testgtkrc: merged testgtkrc with the pre-themes one, removed diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 4f80a6e4bc..f1e5b7bb5f 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Mon Nov 30 12:17:10 1998 Jeff Garzik <jgarzik@pobox.com> + + * gtk/gtknotebook.c (gtk_notebook_reorder_child): + Added initializer to quiet gcc warning. + Added assertion to check for null pointer deref. + Mon Nov 30 10:11:29 1998 Tim Janik <timj@gtk.org> * gtk/testgtkrc: merged testgtkrc with the pre-themes one, removed diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4f80a6e4bc..f1e5b7bb5f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Nov 30 12:17:10 1998 Jeff Garzik <jgarzik@pobox.com> + + * gtk/gtknotebook.c (gtk_notebook_reorder_child): + Added initializer to quiet gcc warning. + Added assertion to check for null pointer deref. + Mon Nov 30 10:11:29 1998 Tim Janik <timj@gtk.org> * gtk/testgtkrc: merged testgtkrc with the pre-themes one, removed diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 4f80a6e4bc..f1e5b7bb5f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Mon Nov 30 12:17:10 1998 Jeff Garzik <jgarzik@pobox.com> + + * gtk/gtknotebook.c (gtk_notebook_reorder_child): + Added initializer to quiet gcc warning. + Added assertion to check for null pointer deref. + Mon Nov 30 10:11:29 1998 Tim Janik <timj@gtk.org> * gtk/testgtkrc: merged testgtkrc with the pre-themes one, removed diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4f80a6e4bc..f1e5b7bb5f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Nov 30 12:17:10 1998 Jeff Garzik <jgarzik@pobox.com> + + * gtk/gtknotebook.c (gtk_notebook_reorder_child): + Added initializer to quiet gcc warning. + Added assertion to check for null pointer deref. + Mon Nov 30 10:11:29 1998 Tim Janik <timj@gtk.org> * gtk/testgtkrc: merged testgtkrc with the pre-themes one, removed diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4f80a6e4bc..f1e5b7bb5f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Nov 30 12:17:10 1998 Jeff Garzik <jgarzik@pobox.com> + + * gtk/gtknotebook.c (gtk_notebook_reorder_child): + Added initializer to quiet gcc warning. + Added assertion to check for null pointer deref. + Mon Nov 30 10:11:29 1998 Tim Janik <timj@gtk.org> * gtk/testgtkrc: merged testgtkrc with the pre-themes one, removed diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4f80a6e4bc..f1e5b7bb5f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Nov 30 12:17:10 1998 Jeff Garzik <jgarzik@pobox.com> + + * gtk/gtknotebook.c (gtk_notebook_reorder_child): + Added initializer to quiet gcc warning. + Added assertion to check for null pointer deref. + Mon Nov 30 10:11:29 1998 Tim Janik <timj@gtk.org> * gtk/testgtkrc: merged testgtkrc with the pre-themes one, removed diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index c7b8284c18..505ab83706 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -4122,7 +4122,7 @@ gtk_notebook_reorder_child (GtkNotebook *notebook, { GList *list; GList *work; - GtkNotebookPage *page; + GtkNotebookPage *page = NULL; gint old_pos; g_return_if_fail (notebook != NULL); @@ -4169,6 +4169,8 @@ gtk_notebook_reorder_child (GtkNotebook *notebook, { GtkWidget *menu_item; + g_assert(page != NULL); + menu_item = page->menu_label->parent; gtk_container_remove (GTK_CONTAINER (menu_item), page->menu_label); gtk_container_remove (GTK_CONTAINER (notebook->menu), menu_item); |