[maemo-commits] [maemo-commits] r8273 - in projects/haf/branches/hildon-control-panel/refactoring: . src

[From: www-data at stage.maemo.org]

Author: lucasr
Date: 2006-11-23 11:59:03 +0200 (Thu, 23 Nov 2006)
New Revision: 8273

Modified:
   projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
   projects/haf/branches/hildon-control-panel/refactoring/src/hcp-grid.c
Log:
2006-11-23  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hcp-grid.c: fix warnings when icon default icon is used.


Modified: projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2006-11-22 18:38:35 UTC (rev 8272)
+++ projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2006-11-23 09:59:03 UTC (rev 8273)
@@ -1,3 +1,7 @@
+2006-11-23  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/hcp-grid.c: fix warnings when icon default icon is used.
+
 2006-11-14  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hcp-app.c, src/hcp-app-view.c: fix focus behavior when

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/hcp-grid.c
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/hcp-grid.c	2006-11-22 18:38:35 UTC (rev 8272)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/hcp-grid.c	2006-11-23 09:59:03 UTC (rev 8273)
@@ -86,18 +86,6 @@
                                           0, 
                                           &error);
 
-  if (grid->priv->row_height == -1) 
-  {
-    if (grid->priv->icon_size == HCP_ICON_SIZE_SMALL) 
-    {
-      grid->priv->row_height = gdk_pixbuf_get_height (icon_pixbuf) + 10;
-    }
-    else if (grid->priv->icon_size == HCP_ICON_SIZE_LARGE) 
-    {
-      grid->priv->row_height = gdk_pixbuf_get_height (icon_pixbuf) + 2;
-    }
-  }
-
   if (icon_pixbuf == NULL) 
   {
     ULOG_WARN("Couldn't load icon \"%s\": %s", icon, error->message);
@@ -118,6 +106,18 @@
     }
   }
 
+  if (grid->priv->row_height == -1) 
+  {
+    if (grid->priv->icon_size == HCP_ICON_SIZE_SMALL) 
+    {
+      grid->priv->row_height = gdk_pixbuf_get_height (icon_pixbuf) + 10;
+    }
+    else if (grid->priv->icon_size == HCP_ICON_SIZE_LARGE) 
+    {
+      grid->priv->row_height = gdk_pixbuf_get_height (icon_pixbuf) + 2;
+    }
+  }
+
   gtk_list_store_set (GTK_LIST_STORE (model), iter, 
                       HCP_STORE_ICON, icon_pixbuf, 
                       -1);