components/desktop/pidgin/patches/pidgin-11-gtkstatusicon.patch

   1 --- pidgin-2.7.0/pidgin/pidginstock.c.orig2     2010-05-13 15:50:55.216839611 +0800
   2 +++ pidgin-2.7.0/pidgin/pidginstock.c   2010-05-13 16:01:04.013877323 +0800
   3 @@ -334,7 +334,8 @@
   4
   5  static void
   6  add_sized_icon(GtkIconSet *iconset, GtkIconSize sizeid, PidginIconTheme *theme,
   7 -               const char *size, SizedStockIcon sized_icon, gboolean translucent)
   8 +               const char *size, SizedStockIcon sized_icon, gboolean translucent,
   9 +                gboolean size_wildcarded)
  10  {
  11         char *filename;
  12         GtkIconSource *source;
  13 @@ -355,7 +356,7 @@
  14         gtk_icon_source_set_direction(source, GTK_TEXT_DIR_LTR);
  15         gtk_icon_source_set_direction_wildcarded(source, !sized_icon.rtl);
  16         gtk_icon_source_set_size(source, sizeid);
  17 -       gtk_icon_source_set_size_wildcarded(source, FALSE);
  18 +       gtk_icon_source_set_size_wildcarded(source, size_wildcarded);
  19         gtk_icon_source_set_state_wildcarded(source, TRUE);
  20         gtk_icon_set_add_source(iconset, source);
  21         gtk_icon_source_free(source);
  22 @@ -365,7 +366,7 @@
  23                 gtk_icon_source_set_pixbuf(source, pixbuf);
  24                 gtk_icon_source_set_direction_wildcarded(source, TRUE);
  25                 gtk_icon_source_set_size(source, GTK_ICON_SIZE_MENU);
  26 -               gtk_icon_source_set_size_wildcarded(source, FALSE);
  27 +               gtk_icon_source_set_size_wildcarded(source, size_wildcarded);
  28                 gtk_icon_source_set_state_wildcarded(source, TRUE);
  29                 gtk_icon_set_add_source(iconset, source);
  30                 gtk_icon_source_free(source);
  31 @@ -389,7 +390,7 @@
  32                 gtk_icon_source_set_filename(source, filename);
  33                 gtk_icon_source_set_direction(source, GTK_TEXT_DIR_RTL);
  34                 gtk_icon_source_set_size(source, sizeid);
  35 -               gtk_icon_source_set_size_wildcarded(source, FALSE);
  36 +               gtk_icon_source_set_size_wildcarded(source, size_wildcarded);
  37                 gtk_icon_source_set_state_wildcarded(source, TRUE);
  38                 gtk_icon_set_add_source(iconset, source);
  39                 g_free(filename);
  40 @@ -445,9 +446,9 @@
  41
  42  #define ADD_SIZED_ICON(name, size) \
  43                 if (sized_status_icons[i].name) { \
  44 -                       add_sized_icon(normal, name, PIDGIN_ICON_THEME(theme), size, sized_status_icons[i], FALSE); \
  45 +                       add_sized_icon(normal, name, PIDGIN_ICON_THEME(theme), size, sized_status_icons[i], FALSE,FALSE); \
  46                         if (sized_status_icons[i].translucent_name) \
  47 -                               add_sized_icon(translucent, name, PIDGIN_ICON_THEME(theme), size, sized_status_icons[i], TRUE); \
  48 +                               add_sized_icon(translucent, name, PIDGIN_ICON_THEME(theme), size, sized_status_icons[i], TRUE,FALSE); \
  49                 }
  50                 ADD_SIZED_ICON(microscopic, "11");
  51                 ADD_SIZED_ICON(extra_small, "16");
  52 @@ -474,9 +475,9 @@
  53
  54  #define ADD_SIZED_ICON(name, size) \
  55                 if (sized_tray_icons[i].name) { \
  56 -                       add_sized_icon(normal, name, PIDGIN_ICON_THEME(theme), size, sized_tray_icons[i], FALSE); \
  57 +                       add_sized_icon(normal, name, PIDGIN_ICON_THEME(theme), size, sized_tray_icons[i], FALSE,TRUE); \
  58                         if (sized_tray_icons[i].translucent_name) \
  59 -                               add_sized_icon(translucent, name, PIDGIN_ICON_THEME(theme), size, sized_tray_icons[i], TRUE); \
  60 +                               add_sized_icon(translucent, name, PIDGIN_ICON_THEME(theme), size, sized_tray_icons[i], TRUE,TRUE); \
  61                 }
  62                 ADD_SIZED_ICON(extra_small, "16x16");
  63                 ADD_SIZED_ICON(small, "22x22");
  64 @@ -564,7 +565,7 @@
  65
  66  #define ADD_SIZED_ICON(name, size) \
  67                 if (sized_stock_icons[i].name) \
  68 -                       add_sized_icon(iconset, name, PIDGIN_ICON_THEME(theme), size, sized_stock_icons[i], FALSE);
  69 +                       add_sized_icon(iconset, name, PIDGIN_ICON_THEME(theme), size, sized_stock_icons[i], FALSE,FALSE);
  70                 ADD_SIZED_ICON(microscopic, "11");
  71                 ADD_SIZED_ICON(extra_small, "16");
  72                 ADD_SIZED_ICON(small, "22");