[maemo-commits] [maemo-commits] r10354 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . debian gtk

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-03-05 11:02:50 +0200 (Mon, 05 Mar 2007)
New Revision: 10354

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/debian/changelog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkicontheme.c
Log:

	* gtk/gtkicontheme.c: Back out our changes to the icon loading order.
	This should fix stock icons being broken and has no noticeable performance
	differences in out tests.


Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-03-05 08:54:04 UTC (rev 10353)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-03-05 09:02:50 UTC (rev 10354)
@@ -1,3 +1,9 @@
+2007-03-05  Xan Lopez  <xan.lopez at nokia.com>
+
+	* gtk/gtkicontheme.c: Back out our changes to the icon loading order.
+	This should fix stock icons being broken and has no noticeable performance
+	differences in out tests.
+
 2007-02-21  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* gtk/gtkiconview.c: surround all changes made on selection behavior

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/debian/changelog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/debian/changelog	2007-03-05 08:54:04 UTC (rev 10353)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/debian/changelog	2007-03-05 09:02:50 UTC (rev 10354)
@@ -39,7 +39,7 @@
   * autodimmed property for GtkComboBox
   * Fix scroll arrow backgrounds painting
 
- -- Xan Lopez <xan at xan-laptop>  Tue,  6 Feb 2007 12:11:16 +0200
+ -- Xan Lopez <xan.lopez at nokia.com>  Tue,  6 Feb 2007 12:11:16 +0200
 
 gtk+2.0 (2:2.10.6-0osso3) experimental; urgency=low
 

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkicontheme.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkicontheme.c	2007-03-05 08:54:04 UTC (rev 10353)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkicontheme.c	2007-03-05 09:02:50 UTC (rev 10354)
@@ -1894,9 +1894,6 @@
   min_dir = NULL;
   has_larger = FALSE;
   
-#ifdef MAEMO_CHANGES    /* do not prefer builtin icons */
-  dirs = theme->dirs;
-#else  /* !MAEMO_CHANGES */
   /* Builtin icons are logically part of the default theme and
    * are searched before other subdirectories of the default theme.
    */
@@ -1913,7 +1910,6 @@
     }
   else
     dirs = theme->dirs;
-#endif /* !MAEMO_CHANGES */
 
   l = dirs;
   while (l != NULL)
@@ -1964,10 +1960,8 @@
 	}
     }
 
-#ifndef MAEMO_CHANGES    /* do not prefer builtin icons */
   if (closest_builtin)
     return icon_info_new_builtin (closest_builtin);
-#endif /* !MAEMO_CHANGES */
   
   if (min_dir)
     {
@@ -2034,21 +2028,6 @@
       
       return icon_info;
     }
-
-#ifdef MAEMO_CHANGES
-  /* When an icon isn't found even in the default theme, try builtin stock
-   * icons as the last resort
-   */
-  if (strcmp (theme->name, DEFAULT_THEME_NAME) == 0 && use_builtin)
-    {
-      closest_builtin = find_builtin_icon (icon_name, size,
-					   &min_difference,
-					   &has_larger);
-
-      if (closest_builtin)
-	return icon_info_new_builtin (closest_builtin);
-    }
-#endif /* MAEMO_CHANGES */
  
   return NULL;
 }