diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-09-18 23:17:31 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-09-18 23:17:31 -0400 |
| commit | 1243b4861c6b959b1ca4ebb724e3d82f61d78a78 (patch) | |
| tree | 21fc431612bce5032e4ff4b078f2f1c213e516c5 /gtk/gtksocket.c | |
| parent | e32ab82069cb99b8a7e649b9d6e09dd2c66904ec (diff) | |
| download | gtk+-1243b4861c6b959b1ca4ebb724e3d82f61d78a78.tar.gz | |
Use gdk_error_trap_pop_ignore() where appropriate
Diffstat (limited to 'gtk/gtksocket.c')
| -rw-r--r-- | gtk/gtksocket.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index 36d3119d8f..3d4d99bd7f 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -543,7 +543,7 @@ gtk_socket_size_allocate (GtkWidget *widget, } gdk_display_sync (gtk_widget_get_display (widget)); - gdk_error_trap_pop (); + gdk_error_trap_pop_ignored (); } } } @@ -863,7 +863,7 @@ _gtk_socket_add_window (GtkSocket *socket, { g_warning (G_STRLOC ": Can't add non-GtkPlug to GtkSocket"); socket->plug_window = NULL; - gdk_error_trap_pop (); + gdk_error_trap_pop_ignored (); return; } @@ -882,7 +882,7 @@ _gtk_socket_add_window (GtkSocket *socket, socket->plug_window = gdk_window_foreign_new_for_display (display, xid); if (!socket->plug_window) /* was deleted before we could get it */ { - gdk_error_trap_pop (); + gdk_error_trap_pop_ignored (); return; } } @@ -919,7 +919,7 @@ _gtk_socket_add_window (GtkSocket *socket, protocol, TRUE); gdk_display_sync (display); - gdk_error_trap_pop (); + gdk_error_trap_pop_ignored (); gdk_window_add_filter (socket->plug_window, _gtk_socket_windowing_filter_func, |