--- pidgin-2.7.0/pidgin/pidginstock.c.orig2 2010-05-13 15:50:55.216839611 +0800

+++ pidgin-2.7.0/pidgin/pidginstock.c 2010-05-13 16:01:04.013877323 +0800

@@ -334,7 +334,8 @@

static void

add_sized_icon(GtkIconSet *iconset, GtkIconSize sizeid, PidginIconTheme *theme,

- const char *size, SizedStockIcon sized_icon, gboolean translucent)

+ const char *size, SizedStockIcon sized_icon, gboolean translucent,

+ gboolean size_wildcarded)

{

char *filename;

GtkIconSource *source;

@@ -355,7 +356,7 @@

gtk_icon_source_set_direction(source, GTK_TEXT_DIR_LTR);

gtk_icon_source_set_direction_wildcarded(source, !sized_icon.rtl);

gtk_icon_source_set_size(source, sizeid);

- gtk_icon_source_set_size_wildcarded(source, FALSE);

+ gtk_icon_source_set_size_wildcarded(source, size_wildcarded);

gtk_icon_source_set_state_wildcarded(source, TRUE);

gtk_icon_set_add_source(iconset, source);

gtk_icon_source_free(source);

@@ -365,7 +366,7 @@

gtk_icon_source_set_pixbuf(source, pixbuf);

gtk_icon_source_set_direction_wildcarded(source, TRUE);

gtk_icon_source_set_size(source, GTK_ICON_SIZE_MENU);

- gtk_icon_source_set_size_wildcarded(source, FALSE);

+ gtk_icon_source_set_size_wildcarded(source, size_wildcarded);

gtk_icon_source_set_state_wildcarded(source, TRUE);

gtk_icon_set_add_source(iconset, source);

gtk_icon_source_free(source);

@@ -389,7 +390,7 @@

gtk_icon_source_set_filename(source, filename);

gtk_icon_source_set_direction(source, GTK_TEXT_DIR_RTL);

gtk_icon_source_set_size(source, sizeid);

- gtk_icon_source_set_size_wildcarded(source, FALSE);

+ gtk_icon_source_set_size_wildcarded(source, size_wildcarded);

gtk_icon_source_set_state_wildcarded(source, TRUE);

gtk_icon_set_add_source(iconset, source);

g_free(filename);

@@ -445,9 +446,9 @@

#define ADD_SIZED_ICON(name, size) \

if (sized_status_icons[i].name) { \

- add_sized_icon(normal, name, PIDGIN_ICON_THEME(theme), size, sized_status_icons[i], FALSE); \

+ add_sized_icon(normal, name, PIDGIN_ICON_THEME(theme), size, sized_status_icons[i], FALSE,FALSE); \

if (sized_status_icons[i].translucent_name) \

- add_sized_icon(translucent, name, PIDGIN_ICON_THEME(theme), size, sized_status_icons[i], TRUE); \

+ add_sized_icon(translucent, name, PIDGIN_ICON_THEME(theme), size, sized_status_icons[i], TRUE,FALSE); \

}

ADD_SIZED_ICON(microscopic, "11");

ADD_SIZED_ICON(extra_small, "16");

@@ -474,9 +475,9 @@

#define ADD_SIZED_ICON(name, size) \

if (sized_tray_icons[i].name) { \

- add_sized_icon(normal, name, PIDGIN_ICON_THEME(theme), size, sized_tray_icons[i], FALSE); \

+ add_sized_icon(normal, name, PIDGIN_ICON_THEME(theme), size, sized_tray_icons[i], FALSE,TRUE); \

if (sized_tray_icons[i].translucent_name) \

- add_sized_icon(translucent, name, PIDGIN_ICON_THEME(theme), size, sized_tray_icons[i], TRUE); \

+ add_sized_icon(translucent, name, PIDGIN_ICON_THEME(theme), size, sized_tray_icons[i], TRUE,TRUE); \

}

ADD_SIZED_ICON(extra_small, "16x16");

ADD_SIZED_ICON(small, "22x22");

@@ -564,7 +565,7 @@

#define ADD_SIZED_ICON(name, size) \

if (sized_stock_icons[i].name) \

- add_sized_icon(iconset, name, PIDGIN_ICON_THEME(theme), size, sized_stock_icons[i], FALSE);

+ add_sized_icon(iconset, name, PIDGIN_ICON_THEME(theme), size, sized_stock_icons[i], FALSE,FALSE);

ADD_SIZED_ICON(microscopic, "11");

ADD_SIZED_ICON(extra_small, "16");

ADD_SIZED_ICON(small, "22");