diff options
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/em-format-html-display.c | 6 | ||||
| -rw-r--r-- | mail/mail-send-recv.c | 9 |
3 files changed, 10 insertions, 12 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 805549ef2f..cb2378250f 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2004-11-26 JP Rosevear <jpr@novell.com> + + * em-format-html-display.c (efhd_xpkcs7mime_button): get image + widget directly from icon factory + + * mail-send-recv.c (build_dialog): ditto + 2004-10-12 Radek Doulik <rodo@ximian.com> * em-junk-filter.c: when starting new spamd, call it with diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index a621dd7254..5d58bf63b6 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -833,7 +833,6 @@ static gboolean efhd_xpkcs7mime_button(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pobject) { GtkWidget *icon, *button; - GdkPixbuf *pixbuf; struct _smime_pobject *po = (struct _smime_pobject *)pobject; const char *name; @@ -843,10 +842,7 @@ efhd_xpkcs7mime_button(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObje else name = smime_encrypt_table[po->valid->encrypt.status].icon; - pixbuf = e_icon_factory_get_icon (name, E_ICON_SIZE_LARGE_TOOLBAR); - - icon = gtk_image_new_from_pixbuf (pixbuf); - g_object_unref(pixbuf); + icon = e_icon_factory_get_image (name, E_ICON_SIZE_LARGE_TOOLBAR); gtk_widget_show(icon); button = gtk_button_new(); diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 4a3e182927..f140e9113c 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -315,7 +315,6 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati char *pretty_url; EAccount *account; EIterator *iter; - GdkPixbuf *pixbuf; GList *icon_list; gd = (GtkDialog *)(send_recv_dialog = gtk_dialog_new_with_buttons(_("Send & Receive Mail"), NULL, GTK_DIALOG_NO_SEPARATOR, NULL)); @@ -398,9 +397,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati } else if (info->timeout_id == 0) info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info); - pixbuf = e_icon_factory_get_icon ("stock_mail-receive", E_ICON_SIZE_LARGE_TOOLBAR); - recv_icon = gtk_image_new_from_pixbuf (pixbuf); - gdk_pixbuf_unref (pixbuf); + recv_icon = e_icon_factory_get_image ("stock_mail-receive", E_ICON_SIZE_LARGE_TOOLBAR); pretty_url = format_url (source->url); label = (GtkLabel *)gtk_label_new (pretty_url); @@ -453,9 +450,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati } else if (info->timeout_id == 0) info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info); - pixbuf = e_icon_factory_get_icon ("stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR); - send_icon = gtk_image_new_from_pixbuf (pixbuf); - gdk_pixbuf_unref (pixbuf); + send_icon = e_icon_factory_get_image ("stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR); pretty_url = format_url (destination); label = (GtkLabel *)gtk_label_new (pretty_url); |