Ticket #15968: gtkdocklet-quartz.diff.patch

gtkdocklet-quartz.diff

@@ -303 +303 @@
   * docklet status and utility functions
   **************************************************************************/
  static gboolean
--docklet_blink_icon()
+-docklet_blink_icon(gpointer data)
 +docklet_blink_icon_cb()
  {
         static gboolean blinked = FALSE;
@@ -543 +543 @@
  
  
  }
-@@ -420,24 +420,24 @@
-                                        "11", sized_stock_icons[i].filename);
-                if (sized_stock_icons[i].extra_small)
-                        add_sized_icon(iconset, extra_small,
--                                      sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
--                                      "16", sized_stock_icons[i].filename);
--               if (sized_stock_icons[i].small)
--                        add_sized_icon(iconset, small,
--                                      sized_stock_icons[i].dir,  sized_stock_icons[i].rtl,
--                                       "22", sized_stock_icons[i].filename);
--               if (sized_stock_icons[i].medium)
--                        add_sized_icon(iconset, medium,
--                                      sized_stock_icons[i].dir,  sized_stock_icons[i].rtl,
--                                       "32", sized_stock_icons[i].filename);
--              if (sized_stock_icons[i].large)
--                      add_sized_icon(iconset, large,
--                                      sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
--                                      "48", sized_stock_icons[i].filename);
--               if (sized_stock_icons[i].huge)
--                        add_sized_icon(iconset, huge,
--                                      sized_stock_icons[i].dir,  sized_stock_icons[i].rtl,
--                                       "64", sized_stock_icons[i].filename);
-+                                       sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-+                                       "16", sized_stock_icons[i].filename);
-+               if (sized_stock_icons[i].small)
-+                       add_sized_icon(iconset, small,
-+                               sized_stock_icons[i].dir,  sized_stock_icons[i].rtl,
-+                                       "22", sized_stock_icons[i].filename);
-+               if (sized_stock_icons[i].medium)
-+                       add_sized_icon(iconset, medium,
-+                               sized_stock_icons[i].dir,  sized_stock_icons[i].rtl,
-+                                       "32", sized_stock_icons[i].filename);
-+               if (sized_stock_icons[i].large)
-+                       add_sized_icon(iconset, large,
-+                               sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-+                                       "48", sized_stock_icons[i].filename);
-+               if (sized_stock_icons[i].huge)
-+                       add_sized_icon(iconset, huge,
-+                               sized_stock_icons[i].dir,  sized_stock_icons[i].rtl,
-+                                       "64", sized_stock_icons[i].filename);
- 
-                gtk_icon_factory_add(icon_factory, sized_stock_icons[i].name, iconset);
-                gtk_icon_set_unref(iconset);
-@@ -452,23 +452,23 @@
-                                add_translucent_sized_icon(iconset, extra_small,
-                                               sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-                                               "16", sized_stock_icons[i].filename);
--                      if (sized_stock_icons[i].small)
--                               add_translucent_sized_icon(iconset, small,
--                                              sized_stock_icons[i].dir,  sized_stock_icons[i].rtl,
--                                              "22", sized_stock_icons[i].filename);
--                      if (sized_stock_icons[i].medium)
--                               add_translucent_sized_icon(iconset, medium,
--                                              sized_stock_icons[i].dir,  sized_stock_icons[i].rtl,
--                                              "32", sized_stock_icons[i].filename);
--                      if (sized_stock_icons[i].large)
--                              add_translucent_sized_icon(iconset, large,
--                                             sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
--                                             "48", sized_stock_icons[i].filename);
--                      if (sized_stock_icons[i].huge)
--                               add_translucent_sized_icon(iconset, huge,
--                                              sized_stock_icons[i].dir,  sized_stock_icons[i].rtl,
--                                              "64", sized_stock_icons[i].filename);
--       
-+                       if (sized_stock_icons[i].small)
-+                               add_translucent_sized_icon(iconset, small,
-+                                       sized_stock_icons[i].dir,  sized_stock_icons[i].rtl,
-+                                               "22", sized_stock_icons[i].filename);
-+                       if (sized_stock_icons[i].medium)
-+                               add_translucent_sized_icon(iconset, medium,
-+                                       sized_stock_icons[i].dir,  sized_stock_icons[i].rtl,
-+                                               "32", sized_stock_icons[i].filename);
-+                       if (sized_stock_icons[i].large)
-+                               add_translucent_sized_icon(iconset, large,
-+                                       sized_stock_icons[i].dir, sized_stock_icons[i].rtl,
-+                                               "48", sized_stock_icons[i].filename);
-+                       if (sized_stock_icons[i].huge)
-+                               add_translucent_sized_icon(iconset, huge,
-+                                       sized_stock_icons[i].dir,  sized_stock_icons[i].rtl,
-+                                               "64", sized_stock_icons[i].filename);
-+
-                        gtk_icon_factory_add(icon_factory, sized_stock_icons[i].translucent_name, iconset);
-                        gtk_icon_set_unref(iconset);
-                }
 diff -Naur pidgin/win32/gtkdocklet-win32.c pidgin/win32/gtkdocklet-win32.c
 --- pidgin/win32/gtkdocklet-win32.c     2008-02-09 21:18:32.000000000 +0100
 +++ pidgin/win32/gtkdocklet-win32.c     2008-02-09 21:51:11.000000000 +0100