diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2008-08-12 01:04:32 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-12 01:04:32 +0800 |
commit | 434bc25ed6b3f458f3bf119e76bd8b2bcffe5178 (patch) | |
tree | b84c336fba38760d8fe438eb9c32a117c1998752 /calendar/gui/dialogs | |
parent | bf8758569da2efb6c4e237741325e8d2056dba45 (diff) | |
download | gsoc2013-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/gui/dialogs')
-rw-r--r-- | calendar/gui/dialogs/alarm-dialog.c | 10 | ||||
-rw-r--r-- | calendar/gui/dialogs/alarm-list-dialog.c | 10 | ||||
-rw-r--r-- | calendar/gui/dialogs/cal-attachment-select-file.c | 9 | ||||
-rw-r--r-- | calendar/gui/dialogs/cancel-comp.c | 1 | ||||
-rw-r--r-- | calendar/gui/dialogs/changed-comp.c | 9 | ||||
-rw-r--r-- | calendar/gui/dialogs/delete-comp.c | 1 | ||||
-rw-r--r-- | calendar/gui/dialogs/delete-error.c | 14 | ||||
-rw-r--r-- | calendar/gui/dialogs/event-editor.c | 1 | ||||
-rw-r--r-- | calendar/gui/dialogs/event-page.c | 3 | ||||
-rw-r--r-- | calendar/gui/dialogs/select-source-dialog.c | 16 | ||||
-rw-r--r-- | calendar/gui/dialogs/task-editor.c | 1 |
11 files changed, 18 insertions, 57 deletions
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> |