[maemo-commits] [maemo-commits] r18586 - in projects/haf/branches/gtk+/upgrade-gtk-2-14: . gtk

[From: subversion at stage.maemo.org]

Author: kris
Date: 2009-06-03 15:53:12 +0300 (Wed, 03 Jun 2009)
New Revision: 18586

Modified:
   projects/haf/branches/gtk+/upgrade-gtk-2-14/ChangeLog
   projects/haf/branches/gtk+/upgrade-gtk-2-14/gtk/updateiconcache.c
Log:
2009-06-03  Kristian Rietveld  <kris at lanedo.com>

	Fixes: NB#120404 - LOcation widget in home view doesnt respond on
	clicking

	* gtk/updateiconcache.c: import missing Maemo patches.



Modified: projects/haf/branches/gtk+/upgrade-gtk-2-14/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/upgrade-gtk-2-14/ChangeLog	2009-06-03 12:18:15 UTC (rev 18585)
+++ projects/haf/branches/gtk+/upgrade-gtk-2-14/ChangeLog	2009-06-03 12:53:12 UTC (rev 18586)
@@ -1,3 +1,10 @@
+2009-06-03  Kristian Rietveld  <kris at lanedo.com>
+
+	Fixes: NB#120404 - LOcation widget in home view doesnt respond on
+	clicking
+
+	* gtk/updateiconcache.c: import missing Maemo patches.
+
 2009-06-02  Claudio Saavedra  <csaavedra at igalia.com>
 
 	Releasing 2:2.14.3-1maemo2

Modified: projects/haf/branches/gtk+/upgrade-gtk-2-14/gtk/updateiconcache.c
===================================================================
--- projects/haf/branches/gtk+/upgrade-gtk-2-14/gtk/updateiconcache.c	2009-06-03 12:18:15 UTC (rev 18585)
+++ projects/haf/branches/gtk+/upgrade-gtk-2-14/gtk/updateiconcache.c	2009-06-03 12:53:12 UTC (rev 18586)
@@ -61,6 +61,9 @@
 #define HAS_SUFFIX_SVG (1 << 1)
 #define HAS_SUFFIX_PNG (1 << 2)
 #define HAS_ICON_FILE  (1 << 3)
+#ifdef MAEMO_CHANGES
+#define HAS_SUFFIX_ANI (1 << 4)
+#endif /* MAEMO_CHANGES */
 
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
@@ -640,6 +643,10 @@
 	    flags |= HAS_SUFFIX_XPM;
 	  else if (g_str_has_suffix (name, ".icon"))
 	    flags |= HAS_ICON_FILE;
+#ifdef MAEMO_CHANGES
+	  else if (g_str_has_suffix (name, ".ani"))
+	    flags |= HAS_SUFFIX_ANI;
+#endif /* MAEMO_CHANGES */
 	  
 	  if (flags == 0)
 	    continue;