r1325 - trunk/src/target/OM-2007/openmoko-libs/libmokoui

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-03-12 15:51:59 +0100 (Mon, 12 Mar 2007)
New Revision: 1325

Modified:
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c
Log:
* libmokoui/moko-window.c: Don't try to access windows that don't exist yet
* libmokoui/moko-finger-window.c: Create the window correctly


Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c	2007-03-12 14:25:29 UTC (rev 1324)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c	2007-03-12 14:51:59 UTC (rev 1325)
@@ -83,7 +83,10 @@
 
 GtkWidget* moko_finger_window_new() /* Construction */
 {
-    return GTK_WIDGET(g_object_new(moko_finger_window_get_type(), NULL));
+     GtkWidget *retval = g_object_new (MOKO_TYPE_FINGER_WINDOW, NULL);
+     GTK_WINDOW (retval)->type = GTK_WINDOW_TOPLEVEL;
+
+     return retval;
 }
 
 void moko_finger_window_set_application_menu(MokoFingerWindow* self, GtkMenu* menu)

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c	2007-03-12 14:25:29 UTC (rev 1324)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c	2007-03-12 14:51:59 UTC (rev 1325)
@@ -202,6 +202,10 @@
     MokoWindowPrivate* priv = MOKO_WINDOW_GET_PRIVATE(self);
     Window my_window;
 
+    /* don't test the window unless it is realised */
+    if (!GTK_WIDGET (self)->window)
+       return;
+
     my_window = GDK_WINDOW_XID (GTK_WIDGET (self)->window);
 
     if (window_id == my_window)