[maemo-commits] [maemo-commits] r9341 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Thu Jan 25 13:40:59 EET 2007
- Previous message: [maemo-commits] r9340 - in projects/haf/branches/hildon-libs/hildon-1: . src
- Next message: [maemo-commits] r9342 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: timj Date: 2007-01-25 13:40:56 +0200 (Thu, 25 Jan 2007) New Revision: 9341 Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilesystem.c projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilesystem.h projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkiconfactory.c projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkicontheme.c Log: Thu Jan 25 12:40:07 2007 Tim Janik <timj at imendio.com> * gtk/gtkiconfactory.c: * gtk/gtkfilesystem.c: * gtk/gtkfilesystem.h: * gtk/gtkicontheme.c: conditionalize with MAEMO_CHANGES. * gtk/gtkicontheme.c: restored occasionally removed original code portions. Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog 2007-01-25 11:08:02 UTC (rev 9340) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog 2007-01-25 11:40:56 UTC (rev 9341) @@ -1,3 +1,13 @@ +Thu Jan 25 12:40:07 2007 Tim Janik <timj at imendio.com> + + * gtk/gtkiconfactory.c: + * gtk/gtkfilesystem.c: + * gtk/gtkfilesystem.h: + * gtk/gtkicontheme.c: conditionalize with MAEMO_CHANGES. + + * gtk/gtkicontheme.c: restored occasionally removed + original code portions. + Thu Jan 25 11:46:15 2007 Tim Janik <timj at imendio.com> * gtk/gtkimmulticontext.h: Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilesystem.c =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilesystem.c 2007-01-25 11:08:02 UTC (rev 9340) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilesystem.c 2007-01-25 11:40:56 UTC (rev 9341) @@ -1403,7 +1403,7 @@ return fs; } -/* MAEMO START */ +#ifdef MAEMO_CHANGES GtkFileSystem * hildon_gtk_file_system_create(const char *file_system_name) @@ -1423,7 +1423,7 @@ return NULL; } -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ #define __GTK_FILE_SYSTEM_C__ #include "gtkaliasdef.c" Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilesystem.h =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilesystem.h 2007-01-25 11:08:02 UTC (rev 9340) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkfilesystem.h 2007-01-25 11:40:56 UTC (rev 9341) @@ -443,14 +443,14 @@ GtkFileSystem *gtk_file_system_create (const char *file_system_name); -/* MAEMO START */ +#ifdef MAEMO_CHANGES GtkFileSystem *hildon_gtk_file_system_create(const char *file_system_name); GdkPixbuf *gtk_file_system_render_icon (GtkFileSystem *file_system, const GtkFilePath *path, GtkWidget *widget, gint pixel_size, GError **error); -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ G_END_DECLS Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkiconfactory.c =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkiconfactory.c 2007-01-25 11:08:02 UTC (rev 9340) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkiconfactory.c 2007-01-25 11:40:56 UTC (rev 9341) @@ -555,9 +555,11 @@ { if (icon_sizes == NULL) { -/* MAEMO START */ +#ifdef MAEMO_CHANGES #define NUM_BUILTIN_SIZES 11 -/* MAEMO END */ +#else /* !MAEMO_CHANGES */ +#define NUM_BUILTIN_SIZES 7 +#endif /* !MAEMO_CHANGES */ gint i; icon_aliases = g_hash_table_new (g_str_hash, g_str_equal); @@ -607,7 +609,7 @@ icon_sizes[GTK_ICON_SIZE_DIALOG].width = 48; icon_sizes[GTK_ICON_SIZE_DIALOG].height = 48; - /* MAEMO START */ +#ifdef MAEMO_CHANGES icon_sizes[HILDON_ICON_SIZE_26].size = HILDON_ICON_SIZE_26; icon_sizes[HILDON_ICON_SIZE_26].name = "hildon-26"; icon_sizes[HILDON_ICON_SIZE_26].width = 26; @@ -629,7 +631,9 @@ icon_sizes[HILDON_ICON_SIZE_64].height = 64; g_assert ((HILDON_ICON_SIZE_64 + 1) == NUM_BUILTIN_SIZES); - /* MAEMO END */ +#else /* !MAEMO_CHANGES */ + g_assert ((GTK_ICON_SIZE_DIALOG + 1) == NUM_BUILTIN_SIZES); +#endif /* !MAEMO_CHANGES */ /* Alias everything to itself. */ i = 1; /* skip invalid size */ @@ -1501,10 +1505,12 @@ tmp_source.source.pixbuf = tmp_pixbuf; pixbuf = gtk_style_render_icon (style, &tmp_source, +#ifdef MAEMO_CHANGES direction, state, - /* MAEMO START */ (size < HILDON_ICON_SIZE_26) ? -1 : size, - /* MAEMO END */ +#else /* !MAEMO_CHANGES */ + direction, state, -1, +#endif /* !MAEMO_CHANGES */ widget, detail); if (!pixbuf) Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkicontheme.c =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkicontheme.c 2007-01-25 11:08:02 UTC (rev 9340) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkicontheme.c 2007-01-25 11:40:56 UTC (rev 9341) @@ -63,9 +63,9 @@ ICON_SUFFIX_SVG = 1 << 1, ICON_SUFFIX_PNG = 1 << 2, HAS_ICON_FILE = 1 << 3, - /* MAEMO START */ +#ifdef MAEMO_CHANGES ICON_SUFFIX_ANI = 1 << 4 - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ } IconSuffix; @@ -1798,10 +1798,10 @@ return ".svg"; case ICON_SUFFIX_PNG: return ".png"; - /* MAEMO START */ +#ifdef MAEMO_CHANGES case ICON_SUFFIX_ANI: return ".ani"; - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ default: g_assert_not_reached(); } @@ -1819,10 +1819,10 @@ retval = ICON_SUFFIX_SVG; else if (g_str_has_suffix (name, ".xpm")) retval = ICON_SUFFIX_XPM; - /* MAEMO START */ +#ifdef MAEMO_CHANGES else if (g_str_has_prefix (name, ".ani")) retval = ICON_SUFFIX_ANI; - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ else retval = ICON_SUFFIX_NONE; @@ -1839,10 +1839,10 @@ return ICON_SUFFIX_SVG; else if ((suffix & ICON_SUFFIX_XPM) != 0) return ICON_SUFFIX_XPM; - /* MAEMO START */ +#ifdef MAEMO_CHANGES else if ((suffix & ICON_SUFFIX_ANI) != 0) return ICON_SUFFIX_ANI; - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ else return ICON_SUFFIX_NONE; } @@ -1893,15 +1893,33 @@ min_difference = G_MAXINT; min_dir = NULL; has_larger = FALSE; - - /* MAEMO CHANGE: code to prefer built in icons removed */ + +#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. + */ + if (strcmp (theme->name, DEFAULT_THEME_NAME) == 0 && use_builtin) + { + closest_builtin = find_builtin_icon (icon_name, + size, + &min_difference, + &has_larger); + if (min_difference == 0) + return icon_info_new_builtin (closest_builtin); + + dirs = builtin_dirs; + } + else + dirs = theme->dirs; +#endif /* !MAEMO_CHANGES */ l = dirs; while (l != NULL) { dir = l->data; - + GTK_NOTE (ICONTHEME, g_print ("theme_lookup_icon dir %s\n", dir->dir)); suffix = theme_dir_get_icon_suffix (dir, icon_name, NULL); @@ -1946,7 +1964,10 @@ } } - /* MAEMO CHANGE: code to prefer built in icons removed */ +#ifndef MAEMO_CHANGES /* do not prefer builtin icons */ + if (closest_builtin) + return icon_info_new_builtin (closest_builtin); +#endif /* !MAEMO_CHANGES */ if (min_dir) { @@ -2014,7 +2035,7 @@ return icon_info; } - /* MAEMO START */ +#ifdef MAEMO_CHANGES /* When an icon isn't found even in the default theme, try builtin stock * icons as the last resort */ @@ -2027,7 +2048,7 @@ if (closest_builtin) return icon_info_new_builtin (closest_builtin); } - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ return NULL; }
- Previous message: [maemo-commits] r9340 - in projects/haf/branches/hildon-libs/hildon-1: . src
- Next message: [maemo-commits] r9342 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]