[maemo-commits] [maemo-commits] r12149 - in projects/haf/trunk/hildon-1: . src

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-06-07 11:02:00 +0300 (Thu, 07 Jun 2007)
New Revision: 12149

Modified:
   projects/haf/trunk/hildon-1/ChangeLog
   projects/haf/trunk/hildon-1/src/hildon-window.c
Log:
2007-06-07  Xan Lopez  <xan.lopez at nokia.com>

	* src/hildon-window: actually, you need to use the macro always, there's
	no private pointer in the class structure. We should have cleaned this up
	when we had the chance...


Modified: projects/haf/trunk/hildon-1/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-1/ChangeLog	2007-06-07 08:01:16 UTC (rev 12148)
+++ projects/haf/trunk/hildon-1/ChangeLog	2007-06-07 08:02:00 UTC (rev 12149)
@@ -1,5 +1,11 @@
 2007-06-07  Xan Lopez  <xan.lopez at nokia.com>
 
+	* src/hildon-window: actually, you need to use the macro always, there's
+	no private pointer in the class structure. We should have cleaned this up
+	when we had the chance...
+	
+2007-06-07  Xan Lopez  <xan.lopez at nokia.com>
+
 	* src/hildon-window.c: do not get the private date from HildonWindow before
 	it passes the g_return_if_fail check. Once it's passed the test, there's no
 	need to g_assert that it exists. Do not create a HildonWindowPrivate variable

Modified: projects/haf/trunk/hildon-1/src/hildon-window.c
===================================================================
--- projects/haf/trunk/hildon-1/src/hildon-window.c	2007-06-07 08:01:16 UTC (rev 12148)
+++ projects/haf/trunk/hildon-1/src/hildon-window.c	2007-06-07 08:02:00 UTC (rev 12149)
@@ -1720,9 +1720,13 @@
 hildon_window_remove_toolbar                    (HildonWindow *self, 
                                                  GtkToolbar *toolbar)
 {
+    HildonWindowPrivate *priv;
+
     g_return_if_fail (HILDON_IS_WINDOW (self));
     
-    gtk_container_remove (GTK_CONTAINER (self->priv->vbox), GTK_WIDGET (toolbar));
+    priv = HILDON_WINDOW_GET_PRIVATE (self);
+
+    gtk_container_remove (GTK_CONTAINER (priv->vbox), GTK_WIDGET (toolbar));
 }
 
 /**
@@ -1737,9 +1741,13 @@
 GtkMenu*
 hildon_window_get_menu                          (HildonWindow * self)
 {
+    HildonWindowPrivate *priv;
+
     g_return_val_if_fail (HILDON_IS_WINDOW (self), NULL);
 
-    return GTK_MENU (self->priv->menu);
+    priv = HILDON_WINDOW_GET_PRIVATE (priv);
+
+    return GTK_MENU (priv->menu);
 }
 
 /**
@@ -1789,8 +1797,11 @@
 gboolean
 hildon_window_get_is_topmost                    (HildonWindow *self)
 {
+    HildonWindowPrivate *priv;
+
     g_return_val_if_fail (HILDON_IS_WINDOW (self), FALSE);
 
-    return self->priv->is_topmost;
+    priv = HILDON_WINDOW_GET_PRIVATE (self);
+    return priv->is_topmost;
 }