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

[alphaone at sita.openmoko.org]

Author: alphaone
Date: 2007-07-06 19:19:55 +0200 (Fri, 06 Jul 2007)
New Revision: 2367

Modified:
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c
Log:
*    openmoko-libs/libmokoui/moko-tree-view.c:
     (moko_tree_view_size_request): Make function static
*    openmoko-libs/libmokoui/moko-message-dialog.c:
     Prevent a segfault in moko_message_dialog_realize_cb


Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c	2007-07-06 17:10:09 UTC (rev 2366)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c	2007-07-06 17:19:55 UTC (rev 2367)
@@ -205,6 +205,8 @@
   {
     rc_style = widget->style->rc_style;
 
+    g_return_if_fail(rc_style != NULL);
+
     priv->background_pixbuf = gdk_pixbuf_new_from_file (rc_style->bg_pixmap_name[GTK_STATE_NORMAL], &error);
 
     if (priv->background_pixbuf == NULL)

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c	2007-07-06 17:10:09 UTC (rev 2366)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c	2007-07-06 17:19:55 UTC (rev 2367)
@@ -31,7 +31,7 @@
 #define TREE_VIEW_PRIVATE(o)     (G_TYPE_INSTANCE_GET_PRIVATE ((o), MOKO_TYPE_TREE_VIEW, MokoTreeViewPrivate))
 
 /* forward declarations */
-void moko_tree_view_size_request(GtkWidget* widget, GtkRequisition* requisition);
+static void moko_tree_view_size_request(GtkWidget* widget, GtkRequisition* requisition);
 
 static void
 moko_tree_view_dispose (GObject *object)
@@ -83,7 +83,8 @@
 }
 
 /* reimplemented to enforce entry-height granularity */
-void moko_tree_view_size_request(GtkWidget* widget, GtkRequisition* requisition)
+static void
+moko_tree_view_size_request(GtkWidget* widget, GtkRequisition* requisition)
 {
     moko_debug( "moko_tree_view_size_request" );
     GTK_WIDGET_CLASS(moko_tree_view_parent_class)->size_request( widget, requisition );