r3042 - in trunk/src/target/OM-2007.2/libraries/libmokoui2: . libmokoui

thomas at sita.openmoko.org thomas at sita.openmoko.org
Wed Sep 26 16:34:13 CEST 2007


Author: thomas
Date: 2007-09-26 16:34:12 +0200 (Wed, 26 Sep 2007)
New Revision: 3042

Modified:
   trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
   trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-stock.c
Log:
* libmokoui/moko-stock.c: (_moko_stock_add_icon): Don't create empty
GtkIconSources


Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog	2007-09-26 14:02:17 UTC (rev 3041)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog	2007-09-26 14:34:12 UTC (rev 3042)
@@ -1,5 +1,10 @@
 2007-09-26  Thomas Wood  <thomas at openedhand.com>
 
+	* libmokoui/moko-stock.c: (_moko_stock_add_icon): Don't create empty
+	GtkIconSources
+
+2007-09-26  Thomas Wood  <thomas at openedhand.com>
+
 	* libmokoui/moko-stock.c: (_moko_stock_add_icon): Attempt to fix a
 	segfault in moko_stock_register()
 

Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-stock.c
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-stock.c	2007-09-26 14:02:17 UTC (rev 3041)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-stock.c	2007-09-26 14:34:12 UTC (rev 3042)
@@ -93,6 +93,9 @@
     gtk_icon_size_lookup (i, &width, &height);
     pixbuf = gtk_icon_theme_load_icon (theme, item->stock_id, width, 0, NULL);
 
+    if (!pixbuf)
+      continue;
+
     source = gtk_icon_source_new ();
     gtk_icon_source_set_size (source, i);
     gtk_icon_source_set_size_wildcarded (source, FALSE);





More information about the commitlog mailing list