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

[alex_tang at sita.openmoko.org]

Author: alex_tang
Date: 2007-03-21 04:43:11 +0100 (Wed, 21 Mar 2007)
New Revision: 1451

Modified:
   trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.c
   trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.h
   trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c
Log:
Fix gtk critical in detail area.


Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.c	2007-03-21 01:00:18 UTC (rev 1450)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.c	2007-03-21 03:43:11 UTC (rev 1451)
@@ -76,7 +76,7 @@
 static void
 detail_area_init (DetailArea *self)
 {
-   	gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(self), GTK_POLICY_NEVER, GTK_POLICY_NEVER );
+    gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(self), GTK_POLICY_NEVER, GTK_POLICY_NEVER );
     
     self->readAttributes = g_malloc (sizeof(ReadAttributes));
     self->editAttributes = g_malloc (sizeof(EditAttributes));
@@ -88,8 +88,8 @@
     //gtk_notebook_append_page (self->notebook,detail_area_mode_membership(self),NULL);
     gtk_notebook_set_show_tabs (self->notebook,FALSE);
     gtk_notebook_set_show_border (self->notebook,FALSE);
-    gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(self), GTK_WIDGET(self->notebook) );
-    
+    //gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(self), GTK_WIDGET(self->notebook) );
+ 
 }
 
 GtkWidget* detail_area_new (void)
@@ -97,6 +97,10 @@
     return GTK_WIDGET(g_object_new(TYPE_DETAIL_AREA, NULL ));
 }
 
+GtkWidget* detail_area_get_notebook(DetailArea* self)
+{
+    return self->notebook;
+}
 GtkWidget* detail_area_mode_edit (DetailArea* self)
 {
     /* create detail box */

Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.h	2007-03-21 01:00:18 UTC (rev 1450)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.h	2007-03-21 03:43:11 UTC (rev 1451)
@@ -32,7 +32,7 @@
 
 #define TYPE_DETAIL_AREA detail_area_get_type()
 #define DETAIL_AREA(obj)     (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DETAIL_AREA, DetailArea))
-#define DETAIL_AREA_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), DETAIL_AREA, DetailAreaClass))
+#define DETAIL_AREA_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DETAIL_AREA, DetailAreaClass))
 #define IS_DETAIL_AREA(obj)     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DETAIL_AREA))
 #define IS_DETAIL_AREA_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DETAIL_AREA))
 #define DETAIL_AREA_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DETAIL_AREA, DetailAreaClass))
@@ -68,6 +68,7 @@
 
 GType detail_area_get_type();
 GtkWidget* detail_area_new(void);
+GtkWidget* detail_area_get_notebook(DetailArea* self);
 
 void detail_new_sms (DetailArea* self);
 void detail_read_message (DetailArea* self, message* msg);

Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c	2007-03-21 01:00:18 UTC (rev 1450)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c	2007-03-21 03:43:11 UTC (rev 1451)
@@ -368,6 +368,7 @@
 {
    d->details = detail_area_new();
    gtk_widget_show (d->details);
+   gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(d->details), detail_area_get_notebook(d->details));
    moko_paned_window_set_lower_pane( d->window, GTK_WIDGET(moko_details_window_put_in_box(d->details)));
 }