5089N/A# date:2009-10-08 owner:migi type:bug bugster:6888304
5089N/A# Bug 15594310 SUNBT6888304 panel applets should use transparent background
5089N/A#
5089N/A# These changes should be submitted upstream.
5089N/A
5089N/A--- pidgin-2.7.0/pidgin/pidginstock.c.orig2 2010-05-13 15:50:55.216839611 +0800
5089N/A+++ pidgin-2.7.0/pidgin/pidginstock.c 2010-05-13 16:01:04.013877323 +0800
5089N/A@@ -334,7 +334,8 @@
5089N/A
5089N/A static void
5089N/A add_sized_icon(GtkIconSet *iconset, GtkIconSize sizeid, PidginIconTheme *theme,
5089N/A- const char *size, SizedStockIcon sized_icon, gboolean translucent)
5089N/A+ const char *size, SizedStockIcon sized_icon, gboolean translucent,
5089N/A+ gboolean size_wildcarded)
5089N/A {
5089N/A char *filename;
5089N/A GtkIconSource *source;
5089N/A@@ -355,7 +356,7 @@
5089N/A gtk_icon_source_set_direction(source, GTK_TEXT_DIR_LTR);
5089N/A gtk_icon_source_set_direction_wildcarded(source, !sized_icon.rtl);
5089N/A gtk_icon_source_set_size(source, sizeid);
5089N/A- gtk_icon_source_set_size_wildcarded(source, FALSE);
5089N/A+ gtk_icon_source_set_size_wildcarded(source, size_wildcarded);
5089N/A gtk_icon_source_set_state_wildcarded(source, TRUE);
5089N/A gtk_icon_set_add_source(iconset, source);
5089N/A gtk_icon_source_free(source);
5089N/A@@ -365,7 +366,7 @@
5089N/A gtk_icon_source_set_pixbuf(source, pixbuf);
5089N/A gtk_icon_source_set_direction_wildcarded(source, TRUE);
5089N/A gtk_icon_source_set_size(source, GTK_ICON_SIZE_MENU);
5089N/A- gtk_icon_source_set_size_wildcarded(source, FALSE);
5089N/A+ gtk_icon_source_set_size_wildcarded(source, size_wildcarded);
5089N/A gtk_icon_source_set_state_wildcarded(source, TRUE);
5089N/A gtk_icon_set_add_source(iconset, source);
5089N/A gtk_icon_source_free(source);
5089N/A@@ -389,7 +390,7 @@
5089N/A gtk_icon_source_set_filename(source, filename);
5089N/A gtk_icon_source_set_direction(source, GTK_TEXT_DIR_RTL);
5089N/A gtk_icon_source_set_size(source, sizeid);
5089N/A- gtk_icon_source_set_size_wildcarded(source, FALSE);
5089N/A+ gtk_icon_source_set_size_wildcarded(source, size_wildcarded);
5089N/A gtk_icon_source_set_state_wildcarded(source, TRUE);
5089N/A gtk_icon_set_add_source(iconset, source);
5089N/A g_free(filename);
5089N/A@@ -445,9 +446,9 @@
5089N/A
5089N/A #define ADD_SIZED_ICON(name, size) \
5089N/A if (sized_status_icons[i].name) { \
5089N/A- add_sized_icon(normal, name, PIDGIN_ICON_THEME(theme), size, sized_status_icons[i], FALSE); \
5089N/A+ add_sized_icon(normal, name, PIDGIN_ICON_THEME(theme), size, sized_status_icons[i], FALSE,FALSE); \
5089N/A if (sized_status_icons[i].translucent_name) \
5089N/A- add_sized_icon(translucent, name, PIDGIN_ICON_THEME(theme), size, sized_status_icons[i], TRUE); \
5089N/A+ add_sized_icon(translucent, name, PIDGIN_ICON_THEME(theme), size, sized_status_icons[i], TRUE,FALSE); \
5089N/A }
5089N/A ADD_SIZED_ICON(microscopic, "11");
5089N/A ADD_SIZED_ICON(extra_small, "16");
5089N/A@@ -474,9 +475,9 @@
5089N/A
5089N/A #define ADD_SIZED_ICON(name, size) \
5089N/A if (sized_tray_icons[i].name) { \
5089N/A- add_sized_icon(normal, name, PIDGIN_ICON_THEME(theme), size, sized_tray_icons[i], FALSE); \
5089N/A+ add_sized_icon(normal, name, PIDGIN_ICON_THEME(theme), size, sized_tray_icons[i], FALSE,TRUE); \
5089N/A if (sized_tray_icons[i].translucent_name) \
5089N/A- add_sized_icon(translucent, name, PIDGIN_ICON_THEME(theme), size, sized_tray_icons[i], TRUE); \
5089N/A+ add_sized_icon(translucent, name, PIDGIN_ICON_THEME(theme), size, sized_tray_icons[i], TRUE,TRUE); \
5089N/A }
5089N/A ADD_SIZED_ICON(extra_small, "16x16");
5089N/A ADD_SIZED_ICON(small, "22x22");
5089N/A@@ -564,7 +565,7 @@
5089N/A
5089N/A #define ADD_SIZED_ICON(name, size) \
5089N/A if (sized_stock_icons[i].name) \
5089N/A- add_sized_icon(iconset, name, PIDGIN_ICON_THEME(theme), size, sized_stock_icons[i], FALSE);
5089N/A+ add_sized_icon(iconset, name, PIDGIN_ICON_THEME(theme), size, sized_stock_icons[i], FALSE,FALSE);
5089N/A ADD_SIZED_ICON(microscopic, "11");
5089N/A ADD_SIZED_ICON(extra_small, "16");
5089N/A ADD_SIZED_ICON(small, "22");