Remove GtkObject completely

[~andy/gtk] / gtk / gtksocket-x11.c

diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c
index 6d1e6260cb40060db21d98c97a5b872ea95eb6a9..a1a32e229a3aa519a64f1bebc8359abbf05de16b 100644 (file)
--- a/gtk/gtksocket-x11.c
+++ b/gtk/gtksocket-x11.c
@@ -37,6 +37,7 @@
 #include "gtksocket.h"
 #include "gtksocketprivate.h"
 #include "gtkdnd.h"
+#include "gtkdebug.h"
 
 #include "x11/gdkx.h"
 
@@ -120,7 +121,7 @@ _gtk_socket_windowing_size_request (GtkSocket *socket)
     }
   socket->have_size = TRUE;
   
-  gdk_error_trap_pop ();
+  gdk_error_trap_pop_ignored ();
 }
 
 void
@@ -129,7 +130,7 @@ _gtk_socket_windowing_send_key_event (GtkSocket *socket,
                                      gboolean   mask_key_presses)
 {
   XKeyEvent xkey;
-  GdkScreen *screen = gdk_drawable_get_screen (socket->plug_window);
+  GdkScreen *screen = gdk_window_get_screen (socket->plug_window);
 
   memset (&xkey, 0, sizeof (xkey));
   xkey.type = (gdk_event->type == GDK_KEY_PRESS) ? KeyPress : KeyRelease;
@@ -151,8 +152,7 @@ _gtk_socket_windowing_send_key_event (GtkSocket *socket,
              False,
              (mask_key_presses ? KeyPressMask : NoEventMask),
              (XEvent *)&xkey);
-  gdk_display_sync (gdk_screen_get_display (screen));
-  gdk_error_trap_pop ();
+  gdk_error_trap_pop_ignored ();
 }
 
 void
@@ -229,7 +229,7 @@ _gtk_socket_windowing_send_configure_event (GtkSocket *socket)
    */
   gdk_error_trap_push ();
   gdk_window_get_origin (socket->plug_window, &x, &y);
-  gdk_error_trap_pop ();
+  gdk_error_trap_pop_ignored ();
 
   gtk_widget_get_allocation (GTK_WIDGET(socket), &allocation);
   xconfigure.x = x;
@@ -245,8 +245,7 @@ _gtk_socket_windowing_send_configure_event (GtkSocket *socket)
   XSendEvent (GDK_WINDOW_XDISPLAY (socket->plug_window),
              GDK_WINDOW_XWINDOW (socket->plug_window),
              False, NoEventMask, (XEvent *)&xconfigure);
-  gdk_display_sync (gtk_widget_get_display (GTK_WIDGET (socket)));
-  gdk_error_trap_pop ();
+  gdk_error_trap_pop_ignored ();
 }
 
 void
@@ -297,7 +296,7 @@ xembed_get_info (GdkWindow     *window,
                 unsigned long *version,
                 unsigned long *flags)
 {
-  GdkDisplay *display = gdk_drawable_get_display (window);
+  GdkDisplay *display = gdk_window_get_display (window);
   Atom xembed_info_atom = gdk_x11_get_xatom_by_name_for_display (display, "_XEMBED_INFO");
   Atom type;
   int format;
@@ -306,14 +305,14 @@ xembed_get_info (GdkWindow     *window,
   unsigned long *data_long;
   int status;
   
-  gdk_error_trap_push();
+  gdk_error_trap_push ();
   status = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
                               GDK_WINDOW_XWINDOW (window),
                               xembed_info_atom,
                               0, 2, False,
                               xembed_info_atom, &type, &format,
                               &nitems, &bytes_after, &data);
-  gdk_error_trap_pop();
+  gdk_error_trap_pop_ignored ();
 
   if (status != Success)
     return FALSE;              /* Window vanished? */
@@ -575,8 +574,7 @@ _gtk_socket_windowing_filter_func (GdkXEvent *gdk_xevent,
                                         socket->plug_window,
                                         protocol, TRUE);
 
-             gdk_display_sync (display);
-             gdk_error_trap_pop ();
+             gdk_error_trap_pop_ignored ();
              return_val = GDK_FILTER_REMOVE;
            }
          else if (xevent->xproperty.atom == gdk_x11_get_xatom_by_name_for_display (display, "_XEMBED_INFO"))
@@ -596,8 +594,7 @@ _gtk_socket_windowing_filter_func (GdkXEvent *gdk_xevent,
                        {
                          gdk_error_trap_push ();
                          gdk_window_show (socket->plug_window);
-                         gdk_flush ();
-                         gdk_error_trap_pop ();
+                         gdk_error_trap_pop_ignored ();
                          
                          _gtk_socket_unmap_notify (socket);
                        }