diff options
author | Richard Purdie <richard@openedhand.com> | 2005-09-02 11:50:01 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2005-09-02 11:50:01 +0000 |
commit | 95efeafc86f47592b37c44f2f7314324cc04250d (patch) | |
tree | e60fe38e88d8e6cf42cf1311c5ada752b79a59c7 /openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gtkicontheme.c.diff | |
parent | 7755d9d194b42ea859096f805f2e22ae5b6e6281 (diff) | |
download | openembedded-core-95efeafc86f47592b37c44f2f7314324cc04250d.tar.gz openembedded-core-95efeafc86f47592b37c44f2f7314324cc04250d.tar.bz2 openembedded-core-95efeafc86f47592b37c44f2f7314324cc04250d.tar.xz openembedded-core-95efeafc86f47592b37c44f2f7314324cc04250d.zip |
Add gtk+, avahi, dbus-0.34 (.36 coming soon) and dependencies. Fix x11-common breakage.
git-svn-id: https://svn.o-hand.com/repos/poky@13 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gtkicontheme.c.diff')
-rw-r--r-- | openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gtkicontheme.c.diff | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gtkicontheme.c.diff b/openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gtkicontheme.c.diff new file mode 100644 index 000000000..ff9cf7109 --- /dev/null +++ b/openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gtkicontheme.c.diff @@ -0,0 +1,48 @@ +--- gtk+-2.6.4/gtk/gtkicontheme.c 2005-03-01 17:24:48.000000000 +0200 ++++ gtk+-2.6.4/gtk/gtkicontheme.c 2005-04-06 16:19:36.807942704 +0300 +@@ -64,7 +64,8 @@ + ICON_SUFFIX_XPM = 1 << 0, + ICON_SUFFIX_SVG = 1 << 1, + ICON_SUFFIX_PNG = 1 << 2, +- HAS_ICON_FILE = 1 << 3 ++ HAS_ICON_FILE = 1 << 3, ++ ICON_SUFFIX_ANI = 1 << 4 + } IconSuffix; + + +@@ -1743,6 +1744,8 @@ + return ".svg"; + case ICON_SUFFIX_PNG: + return ".png"; ++ case ICON_SUFFIX_ANI: ++ return ".ani"; + default: + g_assert_not_reached(); + } +@@ -1760,6 +1763,8 @@ + retval = ICON_SUFFIX_SVG; + else if (g_str_has_suffix (name, ".xpm")) + retval = ICON_SUFFIX_XPM; ++ else if (g_str_has_suffix (name, ".ani")) ++ retval = ICON_SUFFIX_ANI; + else + retval = ICON_SUFFIX_NONE; + +@@ -1776,6 +1781,8 @@ + return ICON_SUFFIX_SVG; + else if ((suffix & ICON_SUFFIX_XPM) != 0) + return ICON_SUFFIX_XPM; ++ else if ((suffix & ICON_SUFFIX_ANI) != 0) ++ return ICON_SUFFIX_ANI; + else + return ICON_SUFFIX_NONE; + } +@@ -2558,7 +2565,7 @@ + icon_info->pixbuf = gdk_pixbuf_scale_simple (source_pixbuf, + 0.5 + image_width * icon_info->scale, + 0.5 + image_height * icon_info->scale, +- GDK_INTERP_BILINEAR); ++ GDK_INTERP_NEAREST); + g_object_unref (source_pixbuf); + } + |