[Xfce4-commits] r23610 - in libexo/trunk: . exo

[Benedikt Meurer]

Author: benny
Date: 2006-11-03 15:21:22 +0000 (Fri, 03 Nov 2006)
New Revision: 23610

Modified:
   libexo/trunk/ChangeLog
   libexo/trunk/exo/exo-cell-renderer-icon.c
Log:
2006-11-03	Benedikt Meurer <benny at xfce.org>

	* exo/exo-cell-renderer-icon.c(exo_cell_renderer_icon_render): Handle
	  internal icons properly. Bug #2488.




Modified: libexo/trunk/ChangeLog
===================================================================
--- libexo/trunk/ChangeLog	2006-11-03 14:21:58 UTC (rev 23609)
+++ libexo/trunk/ChangeLog	2006-11-03 15:21:22 UTC (rev 23610)
@@ -1,15 +1,16 @@
+2006-11-03	Benedikt Meurer <benny at xfce.org>
+
+	* exo/exo-cell-renderer-icon.c(exo_cell_renderer_icon_render): Handle
+	  internal icons properly. Bug #2488.
+
 2006-10-30	Jean-François <pollux at xfce.org>
+
 	* configure.in.in, docs/manual/fr,
-	docs/manual/fr/exo-preferred-applications.xml.in,
-	docs/manual/fr/images,
-	docs/manual/fr/images/exo-preferred-applications-webbrowser-menu.png,
-	docs/manual/fr/images/exo-preferred-applications-internet.png,
-	docs/manual/fr/images/exo-preferred-applications-webbrowser-custom.png,
-	docs/manual/fr/images/exo-preferred-applications-utilities.png,
-	docs/manual/fr/images/Makefile.am, docs/manual/fr/Makefile.am,
-	docs/manual/Makefile.am, po-doc/LINGUAS, po-doc/fr.po,
-	po-doc/ChangeLog: Add French translations of the manual by Maximilian
-	Schleiss. Bug #2478.
+	  docs/manual/fr/exo-preferred-applications.xml.in,
+	  docs/manual/fr/images/, docs/manual/fr/Makefile.am,
+	  docs/manual/Makefile.am, po-doc/LINGUAS, po-doc/fr.po,
+	  po-doc/ChangeLog: Add French translations of the manual by Maximilian
+	  Schleiss. Bug #2478.
 
 2006-09-28	Benedikt Meurer <benny at xfce.org>
 

Modified: libexo/trunk/exo/exo-cell-renderer-icon.c
===================================================================
--- libexo/trunk/exo/exo-cell-renderer-icon.c	2006-11-03 14:21:58 UTC (rev 23609)
+++ libexo/trunk/exo/exo-cell-renderer-icon.c	2006-11-03 15:21:22 UTC (rev 23610)
@@ -381,7 +381,7 @@
 
       /* check if we have an SVG icon here */
       filename = gtk_icon_info_get_filename (icon_info);
-      if (g_str_has_suffix (filename, ".svg"))
+      if (filename != NULL && g_str_has_suffix (filename, ".svg"))
         {
           /* loading SVG icons is terribly slow, so we try to use thumbnail instead, and we use the
            * real available cell area directly here, because loading thumbnails involves scaling anyway