[maemo-commits] [maemo-commits] r17261 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2009-01-22 17:18:25 +0200 (Thu, 22 Jan 2009)
New Revision: 17261

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkicontheme.c
Log:
2009-01-22  Michael Natterer  <mitch at imendio.com>

	Addresses: NB#95897 - Contacts application crashes on trying to
	access new icon after doing gtk-update-icon-cache

	Merged from upstream trunk:

	* gtk/gtkicontheme.c (gtk_icon_theme_has_icon): g_return_if_fail()
	on icon_name != NULL so we get a warning instead of a crash here.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-01-22 13:43:06 UTC (rev 17260)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-01-22 15:18:25 UTC (rev 17261)
@@ -1,3 +1,13 @@
+2009-01-22  Michael Natterer  <mitch at imendio.com>
+
+	Addresses: NB#95897 - Contacts application crashes on trying to
+	access new icon after doing gtk-update-icon-cache
+
+	Merged from upstream trunk:
+
+	* gtk/gtkicontheme.c (gtk_icon_theme_has_icon): g_return_if_fail()
+	on icon_name != NULL so we get a warning instead of a crash here.
+
 2009-01-19  Kristian Rietveld  <kris at imendio.com>
 
 	Fixes: NB#93161 - GTKTextView scrolls to cursor on size change

Modified: projects/haf/trunk/gtk+/gtk/gtkicontheme.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkicontheme.c	2009-01-22 13:43:06 UTC (rev 17260)
+++ projects/haf/trunk/gtk+/gtk/gtkicontheme.c	2009-01-22 15:18:25 UTC (rev 17261)
@@ -1532,7 +1532,8 @@
   GList *l;
 
   g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), FALSE);
-  
+  g_return_val_if_fail (icon_name != NULL, FALSE);
+
   priv = icon_theme->priv;
   
   ensure_valid_themes (icon_theme);