diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-02-06 09:53:34 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-02-06 09:53:34 +0000 |
| commit | e7355f82c2409f545210a8738bab262548f75e69 (patch) | |
| tree | cf5729a1d44df53056bb9e67b355bd791994fb0f /gtk/gtknotebook.c | |
| parent | 0f1958e355b3c9948f0f1de4487c9a4ac57bda6f (diff) | |
| download | gtk+-e7355f82c2409f545210a8738bab262548f75e69.tar.gz | |
gtk/gtkcontainer.c gtk/gtkexpander.c gtk/gtkframe.c gtk/gtklabel.c
2008-02-06 Michael Natterer <mitch@imendio.com>
* gtk/gtkcontainer.c
* gtk/gtkexpander.c
* gtk/gtkframe.c
* gtk/gtklabel.c
* gtk/gtkmain.c
* gtk/gtkmenu.c
* gtk/gtkmenuitem.c
* gtk/gtkmenushell.c
* gtk/gtknotebook.c
* gtk/gtkseparatortoolitem.c
* gtk/gtksocket.c
* gtk/gtktextlayout.c
* gtk/gtktoggletoolbutton.c
* gtk/gtktoolbutton.c
* gtk/gtktoolitem.c
* gtk/gtktree.c
* gtk/gtktreeitem.c: replace "foo && GTK_IS_FOO (foo)" by simply
"GTK_IS_FOO (foo)".
svn path=/trunk/; revision=19481
Diffstat (limited to 'gtk/gtknotebook.c')
| -rw-r--r-- | gtk/gtknotebook.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index ab8b4f1a07..4fde43f85d 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -3655,7 +3655,7 @@ gtk_notebook_get_child_property (GtkContainer *container, case CHILD_PROP_TAB_LABEL: label = gtk_notebook_get_tab_label (notebook, child); - if (label && GTK_IS_LABEL (label)) + if (GTK_IS_LABEL (label)) g_value_set_string (value, GTK_LABEL (label)->label); else g_value_set_string (value, NULL); @@ -3663,7 +3663,7 @@ gtk_notebook_get_child_property (GtkContainer *container, case CHILD_PROP_MENU_LABEL: label = gtk_notebook_get_menu_label (notebook, child); - if (label && GTK_IS_LABEL (label)) + if (GTK_IS_LABEL (label)) g_value_set_string (value, GTK_LABEL (label)->label); else g_value_set_string (value, NULL); @@ -4427,9 +4427,9 @@ gtk_notebook_update_labels (GtkNotebook *notebook) } if (notebook->menu && page->default_menu) { - if (page->tab_label && GTK_IS_LABEL (page->tab_label)) + if (GTK_IS_LABEL (page->tab_label)) gtk_label_set_text (GTK_LABEL (page->menu_label), - GTK_LABEL (page->tab_label)->label); + GTK_LABEL (page->tab_label)->label); else gtk_label_set_text (GTK_LABEL (page->menu_label), string); } @@ -5929,7 +5929,7 @@ gtk_notebook_menu_item_create (GtkNotebook *notebook, page = list->data; if (page->default_menu) { - if (page->tab_label && GTK_IS_LABEL (page->tab_label)) + if (GTK_IS_LABEL (page->tab_label)) page->menu_label = gtk_label_new (GTK_LABEL (page->tab_label)->label); else page->menu_label = gtk_label_new (""); @@ -6981,7 +6981,7 @@ gtk_notebook_get_tab_label_text (GtkNotebook *notebook, tab_label = gtk_notebook_get_tab_label (notebook, child); - if (tab_label && GTK_IS_LABEL (tab_label)) + if (GTK_IS_LABEL (tab_label)) return gtk_label_get_text (GTK_LABEL (tab_label)); else return NULL; @@ -7116,7 +7116,7 @@ gtk_notebook_get_menu_label_text (GtkNotebook *notebook, menu_label = gtk_notebook_get_menu_label (notebook, child); - if (menu_label && GTK_IS_LABEL (menu_label)) + if (GTK_IS_LABEL (menu_label)) return gtk_label_get_text (GTK_LABEL (menu_label)); else return NULL; |