aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2008-08-12 01:04:32 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-08-12 01:04:32 +0800
commit434bc25ed6b3f458f3bf119e76bd8b2bcffe5178 (patch)
treeb84c336fba38760d8fe438eb9c32a117c1998752 /calendar
parentbf8758569da2efb6c4e237741325e8d2056dba45 (diff)
downloadgsoc2013-evolution-434bc25ed6b3f458f3bf119e76bd8b2bcffe5178.tar
gsoc2013-evolution-434bc25ed6b3f458f3bf119e76bd8b2bcffe5178.tar.gz
gsoc2013-evolution-434bc25ed6b3f458f3bf119e76bd8b2bcffe5178.tar.bz2
gsoc2013-evolution-434bc25ed6b3f458f3bf119e76bd8b2bcffe5178.tar.lz
gsoc2013-evolution-434bc25ed6b3f458f3bf119e76bd8b2bcffe5178.tar.xz
gsoc2013-evolution-434bc25ed6b3f458f3bf119e76bd8b2bcffe5178.tar.zst
gsoc2013-evolution-434bc25ed6b3f458f3bf119e76bd8b2bcffe5178.zip
** Fixes bug #546892
2008-08-11 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #546892 * e-util/e-icon-factory.c (e_icon_factory_get_image): Kill this function. Use gtk_image_new_from_icon_name(). * e-util/e-icon-factory.c (e_icon_factory_get_icon_list): Kill this function. Use gtk_window_set_icon_name(). * widgets/misc/e-activity-handler.c: * widgets/misc/e-task-widget.c: Purge the GdkPixbuf arguments from the API. We've been ignoring them since the spinner icon was added. * addressbook/gui/contact-editor/e-contact-editor-fullname.c: * addressbook/gui/contact-editor/e-contact-editor-im.c: * addressbook/gui/contact-editor/e-contact-editor-address.c: * calendar/gui/alarm-notify/alarm-notify-dialog.c: * calendar/gui/dialogs/alarm-dialog.c: * calendar/gui/dialogs/alarm-list-dialog.c: * calendar/gui/dialogs/cal-attachment-select-file.c: * calendar/gui/dialogs/changed-comp.c: * calendar/gui/dialogs/delete-error.c: * calendar/gui/dialogs/select-source-dialog.c: * mail/mail-send-recv.c: * mail/message-tag-followup.c: * widgets/misc/e-combo-button.c: * widgets/misc/e-info-label.c: * widgets/misc/e-url-entry.c: * widgets/misc/e-task-widget.c: Prefer gtk_window_set_icon_name() over gtk_window_set_icon_list(). * addressbook/gui/contact-editor/e-contact-editor-im.c: * calendar/gui/dialogs/event-page.c: * calendar/gui/e-timezone-entry.c: * e-util/e-gui-utils.c: * e-util/e-popup.c: * plugins/import-ics-attachments/icsimporter.c: * plugins/itip-formatter/itip-view.c: * mail/em-folder-browser.c: * mail/em-format-html-display.c: * mail/mail-send-recv.c: * mail/message-tag-followup.c: Prefer gtk_image_new_from_icon_name() over e_icon_factory_get_image(). * calendar/gui/alarm-notify/alarm-queue.c: * plugins/mail-notification/mail-notification.c: Prefer gtk_status_icon_set_from_icon_name() over gtk_status_icon_set_from_pixbuf(). * addressbook/gui/component/addressbook-view.c: * calendar/gui/e-calendar-table.c: * calendar/gui/e-calendar-view.c: * calendar/gui/e-memo-table.c: * mail/mail-mt.c: e_activity_handler_operation_started() no longer takes a GdkPixbuf. It was ignoring the pixbuf anyway ever since we added a spinner icon. svn path=/trunk/; revision=35958
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog27
-rw-r--r--calendar/gui/alarm-notify/alarm-notify-dialog.c18
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c17
-rw-r--r--calendar/gui/cal-search-bar.c13
-rw-r--r--calendar/gui/calendar-component.c1
-rw-r--r--calendar/gui/dialogs/alarm-dialog.c10
-rw-r--r--calendar/gui/dialogs/alarm-list-dialog.c10
-rw-r--r--calendar/gui/dialogs/cal-attachment-select-file.c9
-rw-r--r--calendar/gui/dialogs/cancel-comp.c1
-rw-r--r--calendar/gui/dialogs/changed-comp.c9
-rw-r--r--calendar/gui/dialogs/delete-comp.c1
-rw-r--r--calendar/gui/dialogs/delete-error.c14
-rw-r--r--calendar/gui/dialogs/event-editor.c1
-rw-r--r--calendar/gui/dialogs/event-page.c3
-rw-r--r--calendar/gui/dialogs/select-source-dialog.c16
-rw-r--r--calendar/gui/dialogs/task-editor.c1
-rw-r--r--calendar/gui/e-calendar-table.c11
-rw-r--r--calendar/gui/e-calendar-view.c10
-rw-r--r--calendar/gui/e-memo-table.c11
-rw-r--r--calendar/gui/e-timezone-entry.c10
-rw-r--r--calendar/gui/memos-component.c1
-rw-r--r--calendar/gui/memos-control.c2
-rw-r--r--calendar/gui/tasks-component.c1
-rw-r--r--calendar/gui/tasks-control.c2
24 files changed, 81 insertions, 118 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index feda5578cf..ab39ba4492 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,30 @@
+2008-08-11 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #546892
+
+ * gui/alarm-notify/alarm-notify-dialog.c:
+ * gui/dialogs/alarm-dialog.c:
+ * gui/dialogs/alarm-list-dialog.c:
+ * gui/dialogs/cal-attachment-select-file.c:
+ * gui/dialogs/changed-comp.c:
+ * gui/dialogs/delete-error.c:
+ * gui/dialogs/select-source-dialog.c:
+ Prefer gtk_window_set_icon_name() over gtk_window_set_icon_list().
+
+ * gui/dialogs/event-page.c:
+ * gui/e-timezone-entry.c:
+ Prefer gtk_image_new_from_icon_name() over e_icon_factory_get_image().
+
+ * gui/alarm-notify/alarm-queue.c:
+ Prefer gtk_status_icon_set_from_icon_name() over
+ gtk_status_icon_set_from_pixbuf().
+
+ * gui/e-calendar-table.c:
+ * gui/e-calendar-view.c:
+ * gui/e-memo-table.c:
+ e_activity_handler_operation_started() no longer takes a GdkPixbuf.
+ It was ignoring the pixbuf anyway ever since we added a spinner icon.
+
2008-08-08 Milan Crha <mcrha@redhat.com>
** Fix for bug #544117
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 3f7ad5fa4a..bfc0375c8f 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -32,7 +32,6 @@
#include "alarm-notify-dialog.h"
#include "config-data.h"
#include "util.h"
-#include "e-util/e-icon-factory.h"
#include "e-util/e-util-private.h"
@@ -212,8 +211,6 @@ notified_alarms_dialog_new (void)
GtkWidget *edit_btn;
GtkWidget *snooze_btn;
GtkWidget *image;
- char *icon_path;
- GList *icon_list;
GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
AlarmNotificationsDialog *na = NULL;
AlarmNotify *an = g_new0 (AlarmNotify, 1);
@@ -286,10 +283,9 @@ notified_alarms_dialog_new (void)
gtk_widget_realize (an->dialog);
gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (an->dialog)->vbox), 0);
gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (an->dialog)->action_area), 12);
- image = glade_xml_get_widget (an->xml, "alarm-image");
- icon_path = e_icon_factory_get_icon_filename ("stock_alarm", E_ICON_SIZE_DIALOG);
- gtk_image_set_from_file (GTK_IMAGE (image), icon_path);
- g_free (icon_path);
+ image = glade_xml_get_widget (an->xml, "alarm-image");
+ gtk_image_set_from_icon_name (
+ GTK_IMAGE (image), "stock_alarm", GTK_ICON_SIZE_DIALOG);
g_signal_connect (edit_btn, "clicked", G_CALLBACK (edit_pressed_cb), an);
g_signal_connect (snooze_btn, "clicked", G_CALLBACK (snooze_pressed_cb), an);
@@ -298,12 +294,8 @@ notified_alarms_dialog_new (void)
if (!GTK_WIDGET_REALIZED (an->dialog))
gtk_widget_realize (an->dialog);
- icon_list = e_icon_factory_get_icon_list ("stock_alarm");
- if (icon_list) {
- gtk_window_set_icon_list (GTK_WINDOW (an->dialog), icon_list);
- g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
- g_list_free (icon_list);
- }
+
+ gtk_window_set_icon_name (GTK_WINDOW (an->dialog), "stock_alarm");
/* Set callback for updating the snooze "minutes" label */
g_signal_connect (G_OBJECT (an->snooze_time_min), "value_changed",
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 219dfdc82d..720a757eed 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -35,7 +35,6 @@
#include <libgnomeui/gnome-dialog-util.h>
#include <libgnomeui/gnome-uidefs.h>
-#include <e-util/e-icon-factory.h>
#include <libecal/e-cal-time-util.h>
#include <libecal/e-cal-component.h>
@@ -1384,19 +1383,18 @@ static gboolean
tray_icon_blink_cb (gpointer data)
{
static gboolean tray_blink_state = FALSE;
- GdkPixbuf *pixbuf;
+ const gchar *icon_name;
tray_blink_countdown--;
tray_blink_state = !tray_blink_state;
- pixbuf = e_icon_factory_get_icon ((tray_blink_state || tray_blink_countdown <= 0)?
- "stock_appointment-reminder-excl" :
- "stock_appointment-reminder",
- E_ICON_SIZE_LARGE_TOOLBAR);
+ if (tray_blink_state || tray_blink_countdown <= 0)
+ icon_name = "stock_appointment-reminder-excl";
+ else
+ icon_name = "stock_appointment-reminder";
if (tray_icon)
- gtk_status_icon_set_from_pixbuf (tray_icon, pixbuf);
- g_object_unref (pixbuf);
+ gtk_status_icon_set_from_icon_name (tray_icon, icon_name);
if (tray_blink_countdown <= 0)
tray_blink_id = -1;
@@ -1480,7 +1478,8 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
/* create the tray icon */
if (tray_icon == NULL) {
tray_icon = gtk_status_icon_new ();
- gtk_status_icon_set_from_pixbuf (tray_icon, e_icon_factory_get_icon ("stock_appointment-reminder", E_ICON_SIZE_LARGE_TOOLBAR));
+ gtk_status_icon_set_from_icon_name (
+ tray_icon, "stock_appointment-reminder");
g_signal_connect (G_OBJECT (tray_icon), "activate",
G_CALLBACK (icon_activated), NULL);
g_signal_connect (G_OBJECT (tray_icon), "popup-menu",
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
index 450854b7b7..8c7a783fe8 100644
--- a/calendar/gui/cal-search-bar.c
+++ b/calendar/gui/cal-search-bar.c
@@ -28,7 +28,6 @@
#include <glib/gi18n.h>
#include <libedataserver/e-categories.h>
#include <libecal/e-cal-time-util.h>
-#include <e-util/e-icon-factory.h>
#include <libedataserver/e-categories.h>
#include <filter/rule-editor.h>
@@ -546,8 +545,16 @@ generate_viewoption_menu (CALSearchBarItem *subitems)
char *str = NULL;
str = e_str_without_underscores (subitems[i].search.text);
menu_item = gtk_image_menu_item_new_with_label (str);
-/* if (subitems[i].image)
- gtk_image_menu_item_set_image (menu_item, e_icon_factory_get_image (subitems[i].image, E_ICON_SIZE_MENU));*/
+ if (subitems[i].image) {
+ GtkWidget *image;
+
+ image = gtk_image_new_from_icon_name (
+ subitems[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/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index b30729c554..4dff00825c 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -54,7 +54,6 @@
#include "dialogs/event-editor.h"
#include "misc/e-info-label.h"
#include "e-util/e-error.h"
-#include "e-util/e-icon-factory.h"
#include "e-cal-menu.h"
#include "e-cal-popup.h"
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index 48402bbab3..11642e3e47 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -37,7 +37,6 @@
#include <libecal/e-cal-util.h>
#include <libecal/e-cal-time-util.h>
#include "e-util/e-dialog-widgets.h"
-#include "e-util/e-icon-factory.h"
#include "e-util/e-util-private.h"
#include <libebook/e-destination.h>
#include <libedataserverui/e-name-selector.h>
@@ -1142,7 +1141,6 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm)
{
Dialog dialog;
int response_id;
- GList *icon_list;
char *gladefile;
g_return_val_if_fail (alarm != NULL, FALSE);
@@ -1178,12 +1176,8 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm)
gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->vbox), 0);
gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->action_area), 12);
- icon_list = e_icon_factory_get_icon_list ("x-office-calendar");
- if (icon_list) {
- gtk_window_set_icon_list (GTK_WINDOW (dialog.toplevel), icon_list);
- g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
- g_list_free (icon_list);
- }
+ gtk_window_set_icon_name (
+ GTK_WINDOW (dialog.toplevel), "x-office-calendar");
gtk_window_set_transient_for (GTK_WINDOW (dialog.toplevel),
GTK_WINDOW (parent));
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index 8bce8f0eaa..8066061993 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -37,7 +37,6 @@
#include <libecal/e-cal-util.h>
#include <libecal/e-cal-time-util.h>
#include "e-util/e-dialog-widgets.h"
-#include "e-util/e-icon-factory.h"
#include "e-util/e-util-private.h"
#include "alarm-dialog.h"
#include "alarm-list-dialog.h"
@@ -263,7 +262,6 @@ alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store)
{
Dialog dialog;
int response_id;
- GList *icon_list;
char *gladefile;
dialog.ecal = ecal;
@@ -293,12 +291,8 @@ alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store)
gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->vbox), 0);
gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->action_area), 12);
- icon_list = e_icon_factory_get_icon_list ("x-office-calendar");
- if (icon_list) {
- gtk_window_set_icon_list (GTK_WINDOW (dialog.toplevel), icon_list);
- g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
- g_list_free (icon_list);
- }
+ gtk_window_set_icon_name (
+ GTK_WINDOW (dialog.toplevel), "x-office-calendar");
gtk_window_set_transient_for (GTK_WINDOW (dialog.toplevel),
GTK_WINDOW (parent));
diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c
index 2f08acbf07..2d2acb359e 100644
--- a/calendar/gui/dialogs/cal-attachment-select-file.c
+++ b/calendar/gui/dialogs/cal-attachment-select-file.c
@@ -36,7 +36,6 @@
#include <glib/gi18n.h>
#include "cal-attachment-select-file.h"
-#include <e-util/e-icon-factory.h>
enum {
SELECTOR_MODE_MULTI = (1 << 0),
@@ -49,7 +48,6 @@ run_selector(CompEditor *editor, const char *title, guint32 flags, gboolean *sho
GtkWidget *selection;
GtkWidget *showinline = NULL;
char *path;
- GList *icon_list;
path = g_object_get_data ((GObject *) editor, "attach_path");
@@ -90,12 +88,7 @@ run_selector(CompEditor *editor, const char *title, guint32 flags, gboolean *sho
gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:editor");
gtk_window_set_modal ((GtkWindow *) selection, TRUE);
- icon_list = e_icon_factory_get_icon_list ("mail-message-new");
- if (icon_list) {
- gtk_window_set_icon_list (GTK_WINDOW (selection), icon_list);
- g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
- g_list_free (icon_list);
- }
+ gtk_window_set_icon_name (GTK_WINDOW (selection), "mail-message-new");
if (gtk_dialog_run ((GtkDialog *) selection) == GTK_RESPONSE_OK) {
if (showinline_p)
diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
index c0cd28f6c0..4e81e79f44 100644
--- a/calendar/gui/dialogs/cancel-comp.c
+++ b/calendar/gui/dialogs/cancel-comp.c
@@ -25,7 +25,6 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libgnomeui/gnome-uidefs.h>
-#include <e-util/e-icon-factory.h>
#include "e-util/e-error.h"
#include "cancel-comp.h"
diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c
index c994fb6303..5f62e54624 100644
--- a/calendar/gui/dialogs/changed-comp.c
+++ b/calendar/gui/dialogs/changed-comp.c
@@ -24,7 +24,6 @@
#include <glib/gi18n.h>
#include <libgnomeui/gnome-uidefs.h>
-#include <e-util/e-icon-factory.h>
#include "changed-comp.h"
@@ -48,7 +47,6 @@ changed_component_dialog (GtkWindow *parent, ECalComponent *comp, gboolean delet
ECalComponentVType vtype;
char *str;
gint response;
- GList *icon_list;
vtype = e_cal_component_get_vtype (comp);
@@ -105,12 +103,7 @@ changed_component_dialog (GtkWindow *parent, ECalComponent *comp, gboolean delet
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO, "%s", str);
- icon_list = e_icon_factory_get_icon_list ("x-office-calendar");
- if (icon_list) {
- gtk_window_set_icon_list (GTK_WINDOW (dialog), icon_list);
- g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
- g_list_free (icon_list);
- }
+ gtk_window_set_icon_name (GTK_WINDOW (dialog), "x-office-calendar");
response = gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index b87a01a58e..228e84f464 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -23,7 +23,6 @@
#endif
#include <glib/gi18n.h>
-#include <e-util/e-icon-factory.h>
#include "e-util/e-error.h"
#include "../calendar-config.h"
#include "delete-comp.h"
diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c
index d1280da16a..7c264d0638 100644
--- a/calendar/gui/dialogs/delete-error.c
+++ b/calendar/gui/dialogs/delete-error.c
@@ -25,7 +25,6 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libgnomeui/gnome-uidefs.h>
-#include <e-util/e-icon-factory.h>
#include "delete-error.h"
@@ -39,9 +38,9 @@
void
delete_error_dialog (GError *error, ECalComponentVType vtype)
{
- GList *icon_list = NULL;
GtkWidget *dialog;
const char *str;
+ const gchar *icon_name = NULL;
if (!error)
return;
@@ -106,15 +105,12 @@ delete_error_dialog (GError *error, ECalComponentVType vtype)
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK, "%s", str);
if (vtype == E_CAL_COMPONENT_EVENT)
- icon_list = e_icon_factory_get_icon_list ("x-office-calendar");
+ icon_name = "x-office-calendar";
else if (vtype == E_CAL_COMPONENT_TODO)
- icon_list = e_icon_factory_get_icon_list ("stock_todo");
+ icon_name = "stock_todo";
- if (icon_list) {
- gtk_window_set_icon_list (GTK_WINDOW (dialog), icon_list);
- g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
- g_list_free (icon_list);
- }
+ if (icon_name)
+ gtk_window_set_icon_name (GTK_WINDOW (dialog), icon_name);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 1547a67f0e..ca1b581ee6 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -32,7 +32,6 @@
#include <glib/gi18n.h>
#include <misc/e-dateedit.h>
-#include <e-util/e-icon-factory.h>
#include <e-util/e-plugin-ui.h>
#include <e-util/e-util-private.h>
#include <evolution-shell-component-utils.h>
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 749951de93..3f30617be6 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -42,7 +42,6 @@
#include "../e-timezone-entry.h"
#include <e-util/e-dialog-utils.h>
#include <e-util/e-dialog-widgets.h>
-#include <e-util/e-icon-factory.h>
#include <e-util/e-util-private.h>
#include "../e-meeting-attendee.h"
@@ -688,7 +687,7 @@ create_image_event_box (const char *image_text, const char *tip_text)
GtkWidget *image, *box;
box = gtk_event_box_new ();
- image = e_icon_factory_get_image (image_text, E_ICON_SIZE_MENU);
+ image = gtk_image_new_from_icon_name (image_text, GTK_ICON_SIZE_MENU);
gtk_container_add ((GtkContainer *) box, image);
gtk_widget_show_all (box);
diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c
index a669dfcafc..9cc6c57fe3 100644
--- a/calendar/gui/dialogs/select-source-dialog.c
+++ b/calendar/gui/dialogs/select-source-dialog.c
@@ -23,7 +23,6 @@
#endif
#include <glib/gi18n.h>
-#include <e-util/e-icon-factory.h>
#include <libedataserverui/e-source-selector-dialog.h>
#include "select-source-dialog.h"
@@ -40,7 +39,7 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type)
ESource *selected_source = NULL;
const char *gconf_key;
GConfClient *conf_client;
- GList *icon_list = NULL;
+ const gchar *icon_name = NULL;
if (obj_type == E_CAL_SOURCE_TYPE_EVENT)
gconf_key = "/apps/evolution/calendar/sources";
@@ -58,17 +57,14 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type)
dialog = e_source_selector_dialog_new (parent, source_list);
if (obj_type == E_CAL_SOURCE_TYPE_EVENT)
- icon_list = e_icon_factory_get_icon_list ("x-office-calendar");
+ icon_name = "x-office-calendar";
else if (obj_type == E_CAL_SOURCE_TYPE_TODO)
- icon_list = e_icon_factory_get_icon_list ("stock_todo");
+ icon_name = "stock_todo";
else if (obj_type == E_CAL_SOURCE_TYPE_JOURNAL)
- icon_list = e_icon_factory_get_icon_list ("stock_journal");
+ icon_name = "stock_journal";
- if (icon_list) {
- gtk_window_set_icon_list (GTK_WINDOW (dialog), icon_list);
- g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
- g_list_free (icon_list);
- }
+ if (icon_name)
+ gtk_window_set_icon_name (GTK_WINDOW (dialog), icon_name);
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
selected_source = e_source_selector_dialog_peek_primary_selection (E_SOURCE_SELECTOR_DIALOG (dialog));
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 7e2994499a..1d947ead13 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -31,7 +31,6 @@
#include <glade/glade.h>
#include <glib/gi18n.h>
-#include <e-util/e-icon-factory.h>
#include <e-util/e-plugin-ui.h>
#include <e-util/e-util-private.h>
#include <evolution-shell-component-utils.h>
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 4038c73c04..71c8cfae1f 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -1836,10 +1836,6 @@ static char *test[] = {
#endif
-/* Displays messages on the status bar */
-#define EVOLUTION_TASKS_PROGRESS_IMAGE "stock_todo"
-static GdkPixbuf *progress_icon = NULL;
-
void
e_calendar_table_set_activity_handler (ECalendarTable *cal_table, EActivityHandler *activity_handler)
{
@@ -1864,11 +1860,8 @@ e_calendar_table_set_status_message (ECalendarTable *cal_table, const gchar *mes
} else if (cal_table->activity_id == 0) {
char *client_id = g_strdup_printf ("%p", cal_table);
- if (progress_icon == NULL)
- progress_icon = e_icon_factory_get_icon (EVOLUTION_TASKS_PROGRESS_IMAGE, E_ICON_SIZE_STATUS);
-
- cal_table->activity_id = e_activity_handler_operation_started (cal_table->activity_handler, client_id,
- progress_icon, message, TRUE);
+ cal_table->activity_id = e_activity_handler_operation_started (
+ cal_table->activity_handler, client_id, message, TRUE);
g_free (client_id);
} else {
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 8fa9c61830..51507fa2aa 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -61,10 +61,6 @@
#include "e-cal-popup.h"
#include "misc.h"
-/* Used for the status bar messages */
-#define EVOLUTION_CALENDAR_PROGRESS_IMAGE "x-office-calendar"
-static GdkPixbuf *progress_icon = NULL;
-
struct _ECalendarViewPrivate {
/* The GnomeCalendar we are associated to */
GnomeCalendar *calendar;
@@ -582,10 +578,8 @@ e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *messag
} else if (priv->activity_id == 0) {
char *client_id = g_strdup_printf ("%p", cal_view);
- if (progress_icon == NULL)
- progress_icon = e_icon_factory_get_icon (EVOLUTION_CALENDAR_PROGRESS_IMAGE, E_ICON_SIZE_STATUS);
-
- priv->activity_id = e_activity_handler_operation_started (priv->activity_handler, client_id, progress_icon, message, TRUE);
+ priv->activity_id = e_activity_handler_operation_started (
+ priv->activity_handler, client_id, message, TRUE);
g_free (client_id);
} else {
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index 9ce7993101..98f17a7121 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -1095,10 +1095,6 @@ static char *test[] = {
#endif
-/* Displays messages on the status bar */
-#define EVOLUTION_MEMOS_PROGRESS_IMAGE "stock_notes"
-static GdkPixbuf *progress_icon = NULL;
-
void
e_memo_table_set_activity_handler (EMemoTable *memo_table, EActivityHandler *activity_handler)
{
@@ -1123,11 +1119,8 @@ e_memo_table_set_status_message (EMemoTable *memo_table, const gchar *message)
} else if (memo_table->activity_id == 0) {
char *client_id = g_strdup_printf ("%p", memo_table);
- if (progress_icon == NULL)
- progress_icon = e_icon_factory_get_icon (EVOLUTION_MEMOS_PROGRESS_IMAGE, E_ICON_SIZE_STATUS);
-
- memo_table->activity_id = e_activity_handler_operation_started (memo_table->activity_handler, client_id,
- progress_icon, message, TRUE);
+ memo_table->activity_id = e_activity_handler_operation_started (
+ memo_table->activity_handler, client_id, message, TRUE);
g_free (client_id);
} else {
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index d361e622b2..d0c57dc0d3 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -33,7 +33,6 @@
#include <widgets/e-timezone-dialog/e-timezone-dialog.h>
#include <glib/gi18n.h>
#include "e-timezone-entry.h"
-#include <e-util/e-icon-factory.h>
struct _ETimezoneEntryPrivate {
/* The current timezone, set in e_timezone_entry_set_timezone()
@@ -106,7 +105,7 @@ static void
e_timezone_entry_init (ETimezoneEntry *tentry)
{
ETimezoneEntryPrivate *priv;
- GtkWidget *gtk_image;
+ GtkWidget *image;
AtkObject *a11y;
tentry->priv = priv = g_new0 (ETimezoneEntryPrivate, 1);
@@ -130,9 +129,10 @@ e_timezone_entry_init (ETimezoneEntry *tentry)
atk_object_set_name (a11y, _("Select Timezone"));
}
- gtk_image = e_icon_factory_get_image ("stock_timezone", E_ICON_SIZE_BUTTON);
- gtk_container_add (GTK_CONTAINER (priv->button), gtk_image);
- gtk_widget_show (gtk_image);
+ image = gtk_image_new_from_icon_name (
+ "stock_timezone", GTK_ICON_SIZE_BUTTON);
+ gtk_container_add (GTK_CONTAINER (priv->button), image);
+ gtk_widget_show (image);
}
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index d0d17b0945..31280d52cb 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -51,7 +51,6 @@
#include "dialogs/copy-source-dialog.h"
#include "dialogs/memo-editor.h"
#include "widgets/misc/e-info-label.h"
-#include "e-util/e-icon-factory.h"
#include "e-util/e-error.h"
#include "calendar-component.h"
diff --git a/calendar/gui/memos-control.c b/calendar/gui/memos-control.c
index 51125a31cb..e7f9132665 100644
--- a/calendar/gui/memos-control.c
+++ b/calendar/gui/memos-control.c
@@ -35,8 +35,8 @@
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-ui-util.h>
#include <e-util/e-dialog-utils.h>
-#include <e-util/e-print.h>
#include <e-util/e-icon-factory.h>
+#include <e-util/e-print.h>
#include <e-util/e-util-private.h>
#include "calendar-config.h"
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index b7f6cc6ea2..d976202a8c 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -52,7 +52,6 @@
#include "dialogs/task-editor.h"
#include "misc/e-info-label.h"
#include "e-util/e-error.h"
-#include "e-util/e-icon-factory.h"
#define CREATE_TASK_ID "task"
#define CREATE_TASK_ASSIGNED_ID "task-assigned"
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 7a61cf1eae..26927cb412 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -34,8 +34,8 @@
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-ui-util.h>
#include <e-util/e-dialog-utils.h>
-#include <e-util/e-print.h>
#include <e-util/e-icon-factory.h>
+#include <e-util/e-print.h>
#include <e-util/e-util-private.h>
#include "dialogs/cal-prefs-dialog.h"
#include "calendar-config.h"