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

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-06-12 21:08:59 +0300 (Tue, 12 Jun 2007)
New Revision: 12259

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkiconcachevalidator.c
Log:
Take MAEMO_CHANGES into account when validating image flags

2007-06-12  Tommi Komulainen  <tommi.komulainen at nokia.com>

	* gtk/gtkiconcachevalidator.c (check_image): Take MAEMO_CHANGES into
	account when validating image flags since we've extended them.


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-06-12 17:59:51 UTC (rev 12258)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-06-12 18:08:59 UTC (rev 12259)
@@ -1,3 +1,8 @@
+2007-06-12  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
+	* gtk/gtkiconcachevalidator.c (check_image): Take MAEMO_CHANGES into
+	account when validating image flags since we've extended them.
+
 2007-06-12  Xan Lopez  <xan.lopez at nokia.com>
 
 	* gtk/gtkiconview.c: backport patch from upstream bug #410815,

Modified: projects/haf/trunk/gtk+/gtk/gtkiconcachevalidator.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkiconcachevalidator.c	2007-06-12 17:59:51 UTC (rev 12258)
+++ projects/haf/trunk/gtk+/gtk/gtkiconcachevalidator.c	2007-06-12 18:08:59 UTC (rev 12259)
@@ -262,7 +262,11 @@
          get_uint32 (info, offset + 4, &image_data_offset));
 
   check ("image index", index < info->n_directories);
+#ifndef MAEMO_CHANGES
   check ("image flags", flags < 16);
+#else  /* !MAEMO_CHANGES */
+  check ("image flags", flags < 32);
+#endif /* !MAEMO_CHANGES */
 
   if (image_data_offset != 0) 
     {