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

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-04-13 13:49:25 +0300 (Fri, 13 Apr 2007)
New Revision: 11020

Modified:
   projects/haf/trunk/hildon-1/ChangeLog
   projects/haf/trunk/hildon-1/src/hildon-bread-crumb-trail.c
Log:
	* src/hildon-bread-crumb-trail.c: don't use the priv data of bct
	until it's passed the type check.


Modified: projects/haf/trunk/hildon-1/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-1/ChangeLog	2007-04-13 10:44:36 UTC (rev 11019)
+++ projects/haf/trunk/hildon-1/ChangeLog	2007-04-13 10:49:25 UTC (rev 11020)
@@ -1,3 +1,8 @@
+2007-04-13  Xan Lopez  <xan.lopez at nokia.com>
+
+	* src/hildon-bread-crumb-trail.c: don't use the priv data of bct
+	until it's passed the type check.
+
 2007-04-12  Xan Lopez  <xan.lopez at nokia.com>
 
 	* examples/hildon-bread-crumb-trail-example.c

Modified: projects/haf/trunk/hildon-1/src/hildon-bread-crumb-trail.c
===================================================================
--- projects/haf/trunk/hildon-1/src/hildon-bread-crumb-trail.c	2007-04-13 10:44:36 UTC (rev 11019)
+++ projects/haf/trunk/hildon-1/src/hildon-bread-crumb-trail.c	2007-04-13 10:49:25 UTC (rev 11020)
@@ -588,11 +588,13 @@
 			       GDestroyNotify destroy)
 {
   GtkWidget *widget;
-  HildonBreadCrumbTrailPrivate *priv = bct->priv;
+  HildonBreadCrumbTrailPrivate *priv;;
 
   g_return_if_fail (HILDON_IS_BREAD_CRUMB_TRAIL (bct));
   g_return_if_fail (HILDON_IS_BREAD_CRUMB (item));
 
+  priv = bct->priv;
+
   widget = GTK_WIDGET (item);
 
   gtk_container_add (GTK_CONTAINER (bct), widget);
@@ -626,11 +628,13 @@
 				    GDestroyNotify destroy)
 {
   GtkWidget *widget;
-  HildonBreadCrumbTrailPrivate *priv = bct->priv;
+  HildonBreadCrumbTrailPrivate *priv;
 
   g_return_if_fail (HILDON_IS_BREAD_CRUMB_TRAIL (bct));
   g_return_if_fail (text != NULL);
 
+  priv = bct->priv;
+
   widget = create_crumb_button (bct, text, id, destroy);
   gtk_container_add (GTK_CONTAINER (bct), widget);
   gtk_widget_show (widget);
@@ -679,8 +683,12 @@
 void
 hildon_bread_crumb_trail_clear (HildonBreadCrumbTrail *bct)
 {
-  HildonBreadCrumbTrailPrivate *priv = bct->priv;
+  HildonBreadCrumbTrailPrivate *priv;
 
+  g_return_if_fail (HILDON_IS_BREAD_CRUMB_TRAIL (bct));
+
+  priv = bct->priv;
+
   while (priv->item_list)
     {
       hildon_bread_crumb_trail_pop (bct);