aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog19
-rw-r--r--mail/em-config.c1
-rw-r--r--mail/em-event.c1
-rw-r--r--mail/em-folder-browser.c25
-rw-r--r--mail/em-folder-utils.c1
-rw-r--r--mail/em-format-hook.c2
-rw-r--r--mail/em-format-html-display.c15
-rw-r--r--mail/em-junk-hook.c1
-rw-r--r--mail/em-menu.c1
-rw-r--r--mail/em-network-prefs.c1
-rw-r--r--mail/em-popup.c1
-rw-r--r--mail/mail-mt.c7
-rw-r--r--mail/mail-send-recv.c17
-rw-r--r--mail/message-tag-followup.c17
14 files changed, 60 insertions, 49 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ae6c4780f3..84dff3cac6 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,22 @@
+2008-08-11 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #546892
+
+ * em-folder-browser.c:
+ * em-format-html-display.c:
+ * mail-send-recv.c:
+ * message-tag-followup.c:
+ Prefer gtk_image_new_from_icon_name() over e_icon_factory_get_image().
+
+ * mail-send-recv.c:
+ * message-tag-followup.c:
+ Prefer gtk_window_set_icon_name() over gtk_window_set_icon_list().
+
+ * mail-mt.c:
+ e_activity_handler_cancelable_operation_started() no longer takes a
+ GdkPixbuf. It was ignoring the pixbuf anyway ever since we added a
+ spinner icon.
+
2008-08-11 Milan Crha <mcrha@redhat.com>
** Fix for bug #519292
diff --git a/mail/em-config.c b/mail/em-config.c
index f350074701..b4e9e3c981 100644
--- a/mail/em-config.c
+++ b/mail/em-config.c
@@ -33,7 +33,6 @@
#include "em-config.h"
#include "libedataserver/e-msgport.h"
-#include <e-util/e-icon-factory.h>
#include "em-utils.h"
#include "em-composer-utils.h"
diff --git a/mail/em-event.c b/mail/em-event.c
index 2ce8d8afc0..950f2488fb 100644
--- a/mail/em-event.c
+++ b/mail/em-event.c
@@ -32,7 +32,6 @@
#include "em-event.h"
#include "composer/e-msg-composer.h"
#include "libedataserver/e-msgport.h"
-#include <e-util/e-icon-factory.h>
#include <camel/camel-store.h>
#include <camel/camel-folder.h>
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index d1d03dc47e..fff9fa7c98 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -293,10 +293,19 @@ generate_viewoption_menu (GtkWidget *emfv)
for (i = 0; emfb_view_items[i].search.id != -1; ++i) {
if (emfb_view_items[i].search.text) {
char *str;
+
str = e_str_without_underscores (_(emfb_view_items[i].search.text));
menu_item = gtk_image_menu_item_new_with_label (str);
- if (emfb_view_items[i].image)
- gtk_image_menu_item_set_image ((GtkImageMenuItem *)menu_item, e_icon_factory_get_image (emfb_view_items[i].image, E_ICON_SIZE_MENU));
+ if (emfb_view_items[i].image) {
+ GtkWidget *image;
+
+ image = gtk_image_new_from_icon_name (
+ emfb_view_items[i].image,
+ GTK_ICON_SIZE_MENU);
+ gtk_image_menu_item_set_image (
+ GTK_IMAGE_MENU_ITEM (menu_item),
+ image);
+ }
g_free (str);
} else {
menu_item = gtk_menu_item_new ();
@@ -351,8 +360,16 @@ generate_viewoption_menu (GtkWidget *emfv)
char *str;
str = e_str_without_underscores (_(temp_view_items[i].search.text));
menu_item = gtk_image_menu_item_new_with_label (str);
- if (temp_view_items[i].image)
- gtk_image_menu_item_set_image ((GtkImageMenuItem *)menu_item, e_icon_factory_get_image (temp_view_items[i].image, E_ICON_SIZE_MENU));
+ if (temp_view_items[i].image) {
+ GtkWidget *image;
+
+ image = gtk_image_new_from_icon_name (
+ temp_view_items[i].image,
+ GTK_ICON_SIZE_MENU);
+ gtk_image_menu_item_set_image (
+ GTK_IMAGE_MENU_ITEM (menu_item),
+ image);
+ }
g_free (str);
} else {
menu_item = gtk_menu_item_new ();
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 551d14bcec..b1ec99f25e 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -51,7 +51,6 @@
#include "e-util/e-mktemp.h"
#include "e-util/e-request.h"
-#include "e-util/e-icon-factory.h"
#include "e-util/e-error.h"
diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c
index d548418493..58d0563887 100644
--- a/mail/em-format-hook.c
+++ b/mail/em-format-hook.c
@@ -31,8 +31,6 @@
#include "em-format-hook.h"
-#include <e-util/e-icon-factory.h>
-
#include <glib/gi18n.h>
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 36b7e74cf6..199ff19b67 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -1181,15 +1181,16 @@ efhd_xpkcs7mime_button(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObje
{
GtkWidget *icon, *button;
struct _smime_pobject *po = (struct _smime_pobject *)pobject;
- const char *name;
+ const char *icon_name;
/* FIXME: need to have it based on encryption and signing too */
if (po->valid->sign.status != 0)
- name = smime_sign_table[po->valid->sign.status].icon;
+ icon_name = smime_sign_table[po->valid->sign.status].icon;
else
- name = smime_encrypt_table[po->valid->encrypt.status].icon;
+ icon_name = smime_encrypt_table[po->valid->encrypt.status].icon;
- icon = e_icon_factory_get_image (name, E_ICON_SIZE_LARGE_TOOLBAR);
+ icon = gtk_image_new_from_icon_name (
+ icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
gtk_widget_show(icon);
button = gtk_button_new();
@@ -2371,7 +2372,8 @@ efhd_attachment_optional(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPOb
button = gtk_button_new();
hbox = gtk_hbox_new (FALSE, 0);
- img = e_icon_factory_get_image ("stock_show-all", E_ICON_SIZE_BUTTON);
+ img = gtk_image_new_from_icon_name (
+ "stock_show-all", GTK_ICON_SIZE_BUTTON);
label = gtk_label_new_with_mnemonic(_("View _Unformatted"));
g_object_set_data (G_OBJECT (button), "text-label", (gpointer)label);
gtk_box_pack_start (GTK_BOX (hbox), img, TRUE, TRUE, 2);
@@ -2390,7 +2392,8 @@ efhd_attachment_optional(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPOb
button = gtk_button_new();
hbox = gtk_hbox_new (FALSE, 0);
- img = e_icon_factory_get_image ("stock_open", E_ICON_SIZE_BUTTON);
+ img = gtk_image_new_from_stock (
+ GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON);
label = gtk_label_new_with_mnemonic(_("O_pen With"));
gtk_box_pack_start (GTK_BOX (hbox), img, TRUE, TRUE, 2);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 2);
diff --git a/mail/em-junk-hook.c b/mail/em-junk-hook.c
index d2bf9983f9..0b63334d41 100644
--- a/mail/em-junk-hook.c
+++ b/mail/em-junk-hook.c
@@ -29,7 +29,6 @@
#include <glib.h>
#include "em-junk-hook.h"
#include "mail-session.h"
-#include <e-util/e-icon-factory.h>
#include "e-util/e-error.h"
#include "em-utils.h"
#include <camel/camel-junk-plugin.h>
diff --git a/mail/em-menu.c b/mail/em-menu.c
index a6a60af235..e8021e1bea 100644
--- a/mail/em-menu.c
+++ b/mail/em-menu.c
@@ -33,7 +33,6 @@
#include "em-menu.h"
#include "libedataserver/e-msgport.h"
-#include <e-util/e-icon-factory.h>
#include "em-utils.h"
#include "em-composer-utils.h"
diff --git a/mail/em-network-prefs.c b/mail/em-network-prefs.c
index 31b703864a..2f3f85d791 100644
--- a/mail/em-network-prefs.c
+++ b/mail/em-network-prefs.c
@@ -42,7 +42,6 @@
#include "e-util/e-error.h"
#include "e-util/e-util-private.h"
-#include "e-util/e-icon-factory.h"
#include "mail-config.h"
#include "em-config.h"
diff --git a/mail/em-popup.c b/mail/em-popup.c
index 76e59daad3..10fae903be 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -35,7 +35,6 @@
#include "em-popup.h"
#include "libedataserver/e-msgport.h"
-#include <e-util/e-icon-factory.h>
#include "em-utils.h"
#include "em-composer-utils.h"
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index d147132689..9657da5f13 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -71,8 +71,6 @@ struct _MailMsgPrivate {
gboolean cancelable;
};
-static GdkPixbuf *progress_icon = NULL;
-
/* mail_msg stuff */
#ifdef LOG_OPS
static FILE *log;
@@ -983,9 +981,6 @@ op_status_exec (struct _op_status_msg *m)
} else {
data->activity_state = 1;
- if (progress_icon == NULL)
- progress_icon = e_icon_factory_get_icon ("mail-unread", E_ICON_SIZE_MENU);
-
MAIL_MT_UNLOCK (mail_msg_lock);
if (msg->info->desc)
what = msg->info->desc (msg);
@@ -996,7 +991,7 @@ op_status_exec (struct _op_status_msg *m)
what = g_strdup("");
}
- data->activity_id = e_activity_handler_cancelable_operation_started (activity_handler, "evolution-mail", progress_icon, what, TRUE, (void (*) (gpointer)) camel_operation_cancel, msg->cancel);
+ data->activity_id = e_activity_handler_cancelable_operation_started (activity_handler, "evolution-mail", what, TRUE, (void (*) (gpointer)) camel_operation_cancel, msg->cancel);
g_free (what);
MAIL_MT_LOCK (mail_msg_lock);
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index ab4cc41006..588d1287ae 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -46,7 +46,6 @@
#include "mail-send-recv.h"
#include "mail-folder-cache.h"
#include "em-event.h"
-#include <e-util/e-icon-factory.h>
#include <e-util/gconf-bridge.h>
#define d(x)
@@ -379,7 +378,6 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati
char *pretty_url;
EAccount *account;
EIterator *iter;
- GList *icon_list;
EMEventTargetSendReceive *target;
gd = (GtkDialog *)(send_recv_dialog = gtk_dialog_new_with_buttons(_("Send & Receive Mail"), NULL, GTK_DIALOG_NO_SEPARATOR, NULL));
@@ -401,12 +399,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati
gtk_widget_show (cancel_button);
gtk_dialog_add_action_widget (gd, cancel_button, GTK_RESPONSE_CANCEL);
- icon_list = e_icon_factory_get_icon_list ("mail-send-receive");
- if (icon_list) {
- gtk_window_set_icon_list (GTK_WINDOW (gd), icon_list);
- g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
- g_list_free (icon_list);
- }
+ gtk_window_set_icon_name (GTK_WINDOW (gd), "mail-send-receive");
num_sources = 0;
@@ -487,8 +480,8 @@ 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);
- recv_icon = e_icon_factory_get_image (
- "mail-inbox", E_ICON_SIZE_LARGE_TOOLBAR);
+ recv_icon = gtk_image_new_from_icon_name (
+ "mail-inbox", GTK_ICON_SIZE_LARGE_TOOLBAR);
pretty_url = format_url (source->url, account->name);
label = gtk_label_new (NULL);
gtk_label_set_ellipsize (
@@ -564,8 +557,8 @@ 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);
- send_icon = e_icon_factory_get_image (
- "mail-outbox", E_ICON_SIZE_LARGE_TOOLBAR);
+ send_icon = gtk_image_new_from_icon_name (
+ "mail-outbox", GTK_ICON_SIZE_LARGE_TOOLBAR);
pretty_url = format_url (destination, NULL);
label = gtk_label_new (NULL);
gtk_label_set_ellipsize (
diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c
index 48f55456e4..52fc313e30 100644
--- a/mail/message-tag-followup.c
+++ b/mail/message-tag-followup.c
@@ -35,7 +35,6 @@
#include <libgnomeui/gnome-pixmap.h>
#include <glib/gi18n.h>
-#include "e-util/e-icon-factory.h"
#include "e-util/e-util-private.h"
#include "misc/e-dateedit.h"
@@ -271,19 +270,13 @@ construct (MessageTagEditor *editor)
GtkWidget *widget;
GList *strings;
GladeXML *gui;
- GList *icon_list;
- GdkPixbuf *pixbuf;
int i;
char *gladefile;
gtk_window_set_title (GTK_WINDOW (editor), _("Flag to Follow Up"));
- icon_list = e_icon_factory_get_icon_list ("stock_mail-flag-for-followup");
- if (icon_list) {
- gtk_window_set_icon_list (GTK_WINDOW (editor), icon_list);
- g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
- g_list_free (icon_list);
- }
+ gtk_window_set_icon_name (
+ GTK_WINDOW (editor), "stock_mail-flag-for-followup");
gtk_dialog_set_has_separator (GTK_DIALOG (editor), FALSE);
gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (editor)->vbox), 0);
@@ -302,9 +295,9 @@ construct (MessageTagEditor *editor)
gtk_box_set_child_packing (GTK_BOX (GTK_DIALOG (editor)->vbox), widget, TRUE, TRUE, 6, GTK_PACK_START);
widget = glade_xml_get_widget (gui, "pixmap");
- pixbuf = e_icon_factory_get_icon ("stock_mail-flag-for-followup", E_ICON_SIZE_DIALOG);
- gtk_image_set_from_pixbuf ((GtkImage *)widget, pixbuf);
- g_object_unref (pixbuf);
+ gtk_image_set_from_icon_name (
+ GTK_IMAGE (widget), "stock_mail-flag-for-followup",
+ GTK_ICON_SIZE_DIALOG);
followup->message_list = GTK_TREE_VIEW (glade_xml_get_widget (gui, "message_list"));
model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);