Fix up gdk_window_set_has_native rename issues

Seems like i forgot a bunch of things.

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 194380469744374c27ebf50b7df3cec604bbe848..aa52a2676a87c470bd44b12724df7205e955584a 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -1410,7 +1410,7 @@ gdk_window_ensure_native (GdkWindow *window)
   GdkWindowObject *above;
   GList listhead;
 
-  g_return_if_fail (GDK_IS_WINDOW (window));
+  g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);
 
   if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_ROOT ||
       GDK_WINDOW_DESTROYED (window))
@@ -1474,6 +1474,8 @@ gdk_window_ensure_native (GdkWindow *window)
 
   if (gdk_window_is_viewable (window))
     GDK_WINDOW_IMPL_GET_IFACE (private->impl)->show (window);
+
+  return TRUE;
 }
 
 static void

diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index 6a9985a4fa4976b29cf8ea3aeed6c44d8e4630e3..bb2ef8c308cb3b6bf28eeb766a4852b41f0ff4b2 100644 (file)
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -387,8 +387,7 @@ void              gdk_window_move_region           (GdkWindow       *window,
                                                const GdkRegion *region,
                                                gint             dx,
                                                gint             dy);
-void          gdk_window_set_has_native        (GdkWindow       *window,
-                                               gboolean         has_native);
+gboolean      gdk_window_ensure_native        (GdkWindow       *window);
 
 /* 
  * This allows for making shaped (partially transparent) windows

diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 1e7d04b6f7de0b7043ce06108a7f778bf38301d8..471a8f2b3c6d2692e8f901861f3016c2e059cae6 100644 (file)
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -206,7 +206,7 @@ gdk_pointer_grab (GdkWindow *         window,
 
   /* We need a native window for confine to to work, ensure we have one */
   if (confine_to)
-    gdk_window_ensure_native (confine_to, TRUE);
+    gdk_window_ensure_native (confine_to);
   
   /* TODO: What do we do for offscreens and  their children? We need to proxy the grab somehow */
   if (!GDK_IS_WINDOW_IMPL_X11 (GDK_WINDOW_OBJECT (native)->impl))

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index afe65f3cf6c99b09914bc263a4563cd00d7b20ac..6bbc1b1099ed276b8cc112975d4ae7156b191f11 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -5366,7 +5366,7 @@ gdk_window_enable_synchronized_configure (GdkWindow *window)
     {
       /* This basically means you want to do fancy X specific stuff, so
         ensure we have a native window */
-      gdk_window_ensure_native (window, TRUE);
+      gdk_window_ensure_native (window);
 
       impl->use_synchronized_configure = TRUE;
       ensure_sync_counter (window);