2009-01-21 Alberto Garcia <agarcia@igalia.com>

* src/hildon-window.c (hildon_window_update_topmost): Fix warning
	that happens if the window hasn't been realized yet.

	Fixes: NB#95395 (prestarted applications show GLIB WARNING ** Gdk
	- gdkdrawable-x11.c:878 drawable is not a pixmap or window)

diff --git a/ChangeLog b/ChangeLog
index 5c0ba57..d8c64a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-21  Alberto Garcia  <agarcia@igalia.com>
+
+       * src/hildon-window.c (hildon_window_update_topmost): Fix warning
+       that happens if the window hasn't been realized yet.
+
+       Fixes: NB#95395 (prestarted applications show GLIB WARNING ** Gdk
+       - gdkdrawable-x11.c:878 drawable is not a pixmap or window)
+
 2009-01-20  Alberto Garcia  <agarcia@igalia.com>
 
        * src/hildon-app-menu.c (hildon_app_menu_class_init)

diff --git a/src/hildon-window.c b/src/hildon-window.c
index 81af472..46090e8 100644 (file)
--- a/src/hildon-window.c
+++ b/src/hildon-window.c
@@ -1326,14 +1326,14 @@ hildon_window_update_topmost                    (HildonWindow *self,
 {
     HildonWindowPrivate *priv = HILDON_WINDOW_GET_PRIVATE (self);
 
-    Window my_window;
+    GdkWindow *my_window;
 
     g_return_if_fail (HILDON_IS_WINDOW (self));
     g_assert (priv);
 
-    my_window = GDK_WINDOW_XID (GTK_WIDGET (self)->window);
+    my_window = GTK_WIDGET (self)->window;
 
-    if (window_id == my_window)
+    if (my_window && window_id == GDK_WINDOW_XID (my_window))
     {
         if (! priv->is_topmost)
         {