pidgin.next.minor: 45039834: Change lookup of docklet icons to use an...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 450398346cff57a945f3c068f9548388b0c17687
Ancestor: 39e513da6ebd8833fa3b412febb3cb6e5c4b0dde
Author: qulogic at pidgin.im
Date: 2009-11-22T23:27:26
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/450398346cff57a945f3c068f9548388b0c17687

Modified files:
        pidgin/gtkdocklet-gtk.c

ChangeLog: 

Change lookup of docklet icons to use an 'icon name' instead of a stock
name. This chooses the correct size without weird scaling, but I don't
think it will work properly with icon themes, so I'll need to look into
that eventually.

-------------- next part --------------
============================================================
--- pidgin/gtkdocklet-gtk.c	5843dc5bfd697f89c17e22c8dfdd467d479c6526
+++ pidgin/gtkdocklet-gtk.c	f45da7d598aabdc51f0bd27ff8dea17b56322f66
@@ -79,7 +79,7 @@ docklet_gtk_status_update_icon(PurpleSta
 		icon_name = PIDGIN_STOCK_TRAY_CONNECT;
 
 	if (icon_name) {
-		gtk_status_icon_set_from_stock(docklet, icon_name);
+		gtk_status_icon_set_from_icon_name(docklet, icon_name);
 	}
 }
 
@@ -156,6 +156,8 @@ docklet_ui_init(void)
 docklet_ui_init(void)
 {
 	pidgin_docklet_set_ui_ops(&ui_ops);
+	gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
+		DATADIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S "pidgin" G_DIR_SEPARATOR_S "tray");
 }
 
 #endif  /* GTK_CHECK_VERSION(2,10,0) */