r1619 - trunk/src/target/OM-2007/applications/openmoko-messages/src

[alex_tang at sita.openmoko.org]

Author: alex_tang
Date: 2007-04-02 13:02:02 +0200 (Mon, 02 Apr 2007)
New Revision: 1619

Modified:
   trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.c
   trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.h
Log:
Change contact-window parent from MokoWindow to GtkWindow
For reason that MokoWindow will automatically add window to MokoApplication, so there would be a warning 'window added twice'.


Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.c	2007-04-02 09:08:14 UTC (rev 1618)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.c	2007-04-02 11:02:02 UTC (rev 1619)
@@ -19,7 +19,7 @@
 
 #include "sms-contact-window.h"
 
-G_DEFINE_TYPE (SmsContactWindow, sms_contact_window, MOKO_TYPE_WINDOW)
+G_DEFINE_TYPE (SmsContactWindow, sms_contact_window, GTK_TYPE_WINDOW)
 
 #define SMS_CONTACT_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SMS_TYPE_CONTACT_WINDOW, SmsContactWindowPrivate))
 
@@ -134,14 +134,8 @@
 static void
 sms_contact_window_init (SmsContactWindow* self)
 {
-  MokoWindow* parent = (MokoWindow*)moko_application_get_main_window( moko_application_get_instance() );
-  if ( parent )
-    {
-      gtk_window_set_transient_for( GTK_WINDOW(self), GTK_WINDOW(parent) );
-      gtk_window_set_modal( GTK_WINDOW(self), TRUE );
-      gtk_window_set_destroy_with_parent( GTK_WINDOW(self), TRUE );
-    }
-
+  gtk_widget_set_size_request( GTK_WIDGET(self), 480, 640 ); 
+  gtk_window_set_modal( GTK_WINDOW(self), TRUE );
   /* initialzation */
   SmsContactWindowPrivate* priv = SMS_CONTACT_WINDOW_GET_PRIVATE(self);
   priv->vbox = gtk_vbox_new(FALSE,0);

Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.h	2007-04-02 09:08:14 UTC (rev 1618)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.h	2007-04-02 11:02:02 UTC (rev 1619)
@@ -51,13 +51,13 @@
 
 typedef struct
 {
-  MokoWindow parent;
+  GtkWindow parent;
   /* instance members */
 }SmsContactWindow;
 
 typedef struct
 {
-  MokoWindowClass parent_class;
+  GtkWindowClass parent_class;
   /* class members */
   void (*contact_select_done) (SmsContactWindow* self);
 }SmsContactWindowClass;