Mercurial > pidgin.yaz
comparison pidgin/gtkdocklet-gtk.c @ 29717:87e124c52a47
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.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Sun, 22 Nov 2009 23:27:26 +0000 |
parents | 6652fdb8baf5 |
children | 5a6c66d4de94 |
comparison
equal
deleted
inserted
replaced
29716:3dcdc023ea37 | 29717:87e124c52a47 |
---|---|
77 icon_name = PIDGIN_STOCK_TRAY_PENDING; | 77 icon_name = PIDGIN_STOCK_TRAY_PENDING; |
78 if (connecting) | 78 if (connecting) |
79 icon_name = PIDGIN_STOCK_TRAY_CONNECT; | 79 icon_name = PIDGIN_STOCK_TRAY_CONNECT; |
80 | 80 |
81 if (icon_name) { | 81 if (icon_name) { |
82 gtk_status_icon_set_from_stock(docklet, icon_name); | 82 gtk_status_icon_set_from_icon_name(docklet, icon_name); |
83 } | 83 } |
84 } | 84 } |
85 | 85 |
86 static void | 86 static void |
87 docklet_gtk_status_set_tooltip(gchar *tooltip) | 87 docklet_gtk_status_set_tooltip(gchar *tooltip) |
154 | 154 |
155 void | 155 void |
156 docklet_ui_init(void) | 156 docklet_ui_init(void) |
157 { | 157 { |
158 pidgin_docklet_set_ui_ops(&ui_ops); | 158 pidgin_docklet_set_ui_ops(&ui_ops); |
159 gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), | |
160 DATADIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S "pidgin" G_DIR_SEPARATOR_S "tray"); | |
159 } | 161 } |
160 | 162 |
161 #endif /* GTK_CHECK_VERSION(2,10,0) */ | 163 #endif /* GTK_CHECK_VERSION(2,10,0) */ |
162 | 164 |