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/gtksocket.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/gtksocket.c')
| -rw-r--r-- | gtk/gtksocket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index ce0c0a6fad..1c99a988e4 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -360,7 +360,7 @@ _gtk_socket_end_embedding (GtkSocket *socket) GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket)); gint i; - if (toplevel && GTK_IS_WINDOW (toplevel)) + if (GTK_IS_WINDOW (toplevel)) _gtk_socket_windowing_end_embedding_toplevel (socket); g_object_unref (socket->plug_window); @@ -890,7 +890,7 @@ _gtk_socket_add_window (GtkSocket *socket, /* Add a pointer to the socket on our toplevel window */ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket)); - if (toplevel && GTK_IS_WINDOW (toplevel)) + if (GTK_IS_WINDOW (toplevel)) gtk_window_add_embedded_xid (GTK_WINDOW (toplevel), xid); _gtk_socket_windowing_embed_notify (socket); |