diff options
Diffstat (limited to 'mail/subscribe-dialog.c')
| -rw-r--r-- | mail/subscribe-dialog.c | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c index 657661c01d..5608c44820 100644 --- a/mail/subscribe-dialog.c +++ b/mail/subscribe-dialog.c @@ -51,7 +51,8 @@ #include <gal/e-paned/e-hpaned.h> -#include <e-util/e-html-utils.h> +#include "e-util/e-html-utils.h" +#include "e-util/e-gui-utils.h" #include "mail.h" #include "mail-tools.h" #include "mail-mt.h" @@ -110,33 +111,12 @@ static GtkObjectClass *subscribe_dialog_parent_class; static void build_tree (SubscribeDialog *sc, CamelStore *store); -static void -set_pixmap (BonoboUIComponent *component, - const char *xml_path, - const char *icon) -{ - char *path; - GdkPixbuf *pixbuf; - - path = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution/buttons", icon); - - pixbuf = gdk_pixbuf_new_from_file (path); - g_return_if_fail (pixbuf != NULL); - - bonobo_ui_util_set_pixbuf (component, xml_path, pixbuf); - - gdk_pixbuf_unref (pixbuf); - - g_free (path); -} - -static void -update_pixmaps (BonoboUIComponent *component) -{ - set_pixmap (component, "/Toolbar/SubscribeFolder", "fetch-mail.png"); /* XXX */ - set_pixmap (component, "/Toolbar/UnsubscribeFolder", "compose-message.png"); /* XXX */ - set_pixmap (component, "/Toolbar/RefreshList", "forward.png"); /* XXX */ -} +static EPixmap pixmaps [] = { + E_PIXMAP ("/Toolbar/SubscribeFolder", "buttons/fetch-mail.png"), /* XXX */ + E_PIXMAP ("/Toolbar/UnsubscribeFolder", "buttons/compose-message.png"), /* XXX */ + E_PIXMAP ("/Toolbar/RefreshList", "buttons/forward.png"), /* XXX */ + E_PIXMAP_END +}; static GtkWidget* make_folder_search_widget (GtkSignalFunc start_search_func, @@ -910,7 +890,7 @@ subscribe_dialog_gui_init (SubscribeDialog *sc) "evolution-subscribe.xml", "evolution-subscribe"); - update_pixmaps (component); + e_pixmaps_update (component, pixmaps); bonobo_ui_component_thaw (component, NULL); |