diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2006-05-10 15:58:48 +0000 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@src.gnome.org> | 2006-05-10 15:58:48 +0000 |
| commit | f4cc71445a36134d7a60889cb068a40357904445 (patch) | |
| tree | 7a27aedb94f50502f41a7a0903b0a83c5e8c7022 | |
| parent | 4e8e3add5b7defdaa5d628f85079d9b64754d9c4 (diff) | |
| download | gtk+-f4cc71445a36134d7a60889cb068a40357904445.tar.gz | |
check that tab_label is not NULL before checking that it's notebook's
2006-05-10 Carlos Garnacho <carlosg@gnome.org>
* gtk/gtknotebook.c: check that tab_label is not NULL before checking
that it's notebook's child. Closes #341247.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | gtk/gtknotebook.c | 2 |
3 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2006-05-10 Carlos Garnacho <carlosg@gnome.org> + + * gtk/gtknotebook.c: check that tab_label is not NULL before checking + that it's notebook's child. Closes #341247. + Wed May 10 15:57:53 2006 Tim Janik <timj@imendio.com> * applied unified patch for configurable scroll arrow sizes from diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index cf5a7aa6e0..91bfdb55c1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-05-10 Carlos Garnacho <carlosg@gnome.org> + + * gtk/gtknotebook.c: check that tab_label is not NULL before checking + that it's notebook's child. Closes #341247. + Wed May 10 15:57:53 2006 Tim Janik <timj@imendio.com> * applied unified patch for configurable scroll arrow sizes from diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 3c8c7d2830..7b336494e6 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -124,7 +124,7 @@ enum { #define PAGE_TOP_Y(_page_) (((GtkNotebookPage *) (_page_))->allocation.y) #define PAGE_BOTTOM_Y(_page_) (((GtkNotebookPage *) (_page_))->allocation.y + ((GtkNotebookPage *) (_page_))->allocation.height) #define PAGE_MIDDLE_Y(_page_) (((GtkNotebookPage *) (_page_))->allocation.y + ((GtkNotebookPage *) (_page_))->allocation.height / 2) -#define NOTEBOOK_IS_TAB_LABEL_PARENT(_notebook_,_page_) (((GtkNotebookPage *) (_page_))->tab_label->parent == ((GtkWidget *) (_notebook_))) +#define NOTEBOOK_IS_TAB_LABEL_PARENT(_notebook_,_page_) ((_page_)->tab_label != NULL && ((GtkNotebookPage *) (_page_))->tab_label->parent == ((GtkWidget *) (_notebook_))) struct _GtkNotebookPage { |