Remove the expander in Save mode, and the configuration key

[~andy/gtk] / gtk / gtkxembed.c

diff --git a/gtk/gtkxembed.c b/gtk/gtkxembed.c
index d5ab3bfff676c11ca099bcccb8d8626e97f467aa..5c900fc47967e6b8e77699fa9bfe8a05707b9d99 100644 (file)
--- a/gtk/gtkxembed.c
+++ b/gtk/gtkxembed.c
@@ -23,6 +23,7 @@
 #include "gtkmain.h"
 #include "gtkprivate.h"
 #include "gtkxembed.h"
+#include "gtkdebug.h"
 
 
 typedef struct _GtkXEmbedMessage GtkXEmbedMessage;
@@ -147,12 +148,12 @@ _gtk_xembed_send_message (GdkWindow        *recipient,
          
   g_return_if_fail (GDK_IS_WINDOW (recipient));
 
-  display = gdk_drawable_get_display (recipient);
+  display = gdk_window_get_display (recipient);
   GTK_NOTE (PLUGSOCKET,
            g_message ("Sending %s", _gtk_xembed_message_name (message)));
 
   memset (&xclient, 0, sizeof (xclient));
-  xclient.window = GDK_WINDOW_XWINDOW (recipient);
+  xclient.window = GDK_WINDOW_XID (recipient);
   xclient.type = ClientMessage;
   xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "_XEMBED");
   xclient.format = 32;
@@ -164,10 +165,9 @@ _gtk_xembed_send_message (GdkWindow        *recipient,
 
   gdk_error_trap_push ();
   XSendEvent (GDK_WINDOW_XDISPLAY(recipient),
-             GDK_WINDOW_XWINDOW (recipient),
+             GDK_WINDOW_XID (recipient),
              False, NoEventMask, (XEvent *)&xclient);
-  gdk_display_sync (display);
-  gdk_error_trap_pop ();
+  gdk_error_trap_pop_ignored ();
 }
 
 /**