2006-04-28 Johan Bilien <johan.bilien@nokia.com>

* hildon-widgets/hildon-window.c:
	  - forgot to reinitialize convenience pointers to borders after they
	    are reinitialised
	  - replaced a g_return_if_fail with a g_return_val_if_fail now
	    that toggle_menu returns a g_boolean

diff --git a/ChangeLog b/ChangeLog
index 8573cea..89e990c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-04-28  Johan Bilien  <johan.bilien@nokia.com>
 
+       * hildon-widgets/hildon-window.c:
+         - forgot to reinitialize convenience pointers to borders after they
+           are reinitialised
+         - replaced a g_return_if_fail with a g_return_val_if_fail now
+           that toggle_menu returns a g_boolean
+
+2006-04-28  Johan Bilien  <johan.bilien@nokia.com>
+
        N#28176
        * hildon-widgets/hildon-window.c: Free the borders structure
          when the window is destroyed.

diff --git a/hildon-widgets/hildon-window.c b/hildon-widgets/hildon-window.c
index 6e86829..5d22eb3 100644 (file)
--- a/hildon-widgets/hildon-window.c
+++ b/hildon-widgets/hildon-window.c
@@ -506,6 +506,8 @@ hildon_window_expose (GtkWidget * widget, GdkEventExpose * event)
     if (!priv->borders)
     {
         hildon_window_get_borders (HILDON_WINDOW (widget));
+        b = HILDON_WINDOW(widget)->priv->borders;
+        tb = HILDON_WINDOW(widget)->priv->toolbar_borders;
     }
 
     tb_height = bx->allocation.height + tb->top + tb->bottom;
@@ -643,6 +645,8 @@ hildon_window_size_allocate (GtkWidget * widget, GtkAllocation * allocation)
     if (!priv->borders)
     {
         hildon_window_get_borders (HILDON_WINDOW (widget));
+        b = HILDON_WINDOW (widget)->priv->borders;
+        tb = HILDON_WINDOW (widget)->priv->toolbar_borders;
     }
     
     widget->allocation = *allocation;
@@ -1415,7 +1419,7 @@ hildon_window_toggle_menu (HildonWindow * self)
 {
     GtkMenu *menu_to_use = NULL;
     
-    g_return_if_fail (self && HILDON_IS_WINDOW (self));
+    g_return_val_if_fail (self && HILDON_IS_WINDOW (self), FALSE);
 
     /* Select which menu to use, Window specific has highest priority,
      * then program specific */