From f575a7626a769b0a99e080944749958d644d4aef Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 24 May 2009 11:54:43 -0400 Subject: Eliminate redundant E_ICON_SIZE_* enumeration. --- addressbook/gui/component/addressbook-view.c | 34 +++++----- addressbook/gui/contact-editor/e-contact-editor.c | 2 +- addressbook/gui/widgets/e-minicard.c | 2 +- addressbook/gui/widgets/eab-contact-display.c | 2 +- addressbook/gui/widgets/eab-gui-util.c | 2 +- calendar/gui/calendar-commands.c | 48 +++++++------- calendar/gui/e-calendar-table.c | 4 +- calendar/gui/e-day-view.c | 10 +-- calendar/gui/e-itip-control.c | 4 +- calendar/gui/e-memo-table.c | 2 +- calendar/gui/e-week-view.c | 10 +-- calendar/gui/memos-control.c | 24 +++---- calendar/gui/tasks-control.c | 26 ++++---- e-util/e-icon-factory.c | 81 +++++------------------ e-util/e-icon-factory.h | 35 +++------- mail/em-folder-browser.c | 10 +-- mail/em-folder-tree.c | 18 ++--- mail/em-folder-view.c | 80 +++++++++++----------- mail/em-format-html-display.c | 2 +- mail/em-format-html.c | 2 +- mail/message-list.c | 2 +- plugins/calendar-weather/calendar-weather.c | 2 +- plugins/groupwise-features/proxy-login.c | 2 +- plugins/groupwise-features/proxy.c | 2 +- shell/e-shell-importer.c | 2 +- shell/e-shell-settings-dialog.c | 2 +- shell/e-shell-window-commands.c | 24 +++---- shell/e-user-creatable-items-handler.c | 4 +- shell/evolution-shell-component-utils.h | 2 +- 29 files changed, 186 insertions(+), 254 deletions(-) diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 2f77fc4e50..756c6bf96e 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -599,23 +599,23 @@ static BonoboUIVerb verbs [] = { }; static EPixmap pixmaps [] = { - E_PIXMAP ("/commands/ChangeFolderProperties", "document-properties", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ContactDelete", "edit-delete", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ContactsCopy", "edit-copy", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ContactsCut", "edit-cut", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ContactsPaste", "edit-paste", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ContactsPrint", "document-print", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ContactsPrintPreview", "document-print-preview", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ContactsSaveAsVCard", "document-save-as", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ContactsSendContactToOther", "mail-forward", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ContactsSendMessageToContact", "mail-message-new", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FolderCopy", "edit-copy", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FolderDelete", "edit-delete", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FolderMove", "folder-move", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FolderSave", "document-save-as", E_ICON_SIZE_MENU), - - E_PIXMAP ("/Toolbar/ContactsPrint", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/ContactDelete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/commands/ChangeFolderProperties", "document-properties", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactDelete", "edit-delete", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsCopy", "edit-copy", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsCut", "edit-cut", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsPaste", "edit-paste", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsPrint", "document-print", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsPrintPreview", "document-print-preview", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsSaveAsVCard", "document-save-as", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsSendContactToOther", "mail-forward", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsSendMessageToContact", "mail-message-new", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FolderCopy", "edit-copy", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FolderDelete", "edit-delete", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FolderMove", "folder-move", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FolderSave", "document-save-as", GTK_ICON_SIZE_MENU), + + E_PIXMAP ("/Toolbar/ContactsPrint", "document-print", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/ContactDelete", "edit-delete", GTK_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP_END }; diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 9eaf9897ba..e3c149ac85 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -2815,7 +2815,7 @@ update_preview_cb (GtkFileChooser *file_chooser, gpointer data) pixbuf = gdk_pixbuf_new_from_file_at_size (filename, 128, 128, NULL); if (!pixbuf) { gchar *alternate_file; - alternate_file = e_icon_factory_get_icon_filename ("stock_person",E_ICON_SIZE_DIALOG); + alternate_file = e_icon_factory_get_icon_filename ("stock_person", GTK_ICON_SIZE_DIALOG); if (alternate_file) { pixbuf = gdk_pixbuf_new_from_file_at_size (alternate_file, 128, 128, NULL); g_free (alternate_file); diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index cbbcc80d5c..c2cf1d7a41 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -246,7 +246,7 @@ e_minicard_init (EMinicard *minicard) minicard->contact = NULL; - minicard->list_icon_pixbuf = e_icon_factory_get_icon (LIST_ICON_NAME, E_ICON_SIZE_MENU); + minicard->list_icon_pixbuf = e_icon_factory_get_icon (LIST_ICON_NAME, GTK_ICON_SIZE_MENU); minicard->list_icon_size = gdk_pixbuf_get_height (minicard->list_icon_pixbuf); minicard->editor = NULL; diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index 4e7418dc5c..cb605ecf05 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -241,7 +241,7 @@ on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle, gsize data_length; gchar *filename; - filename = e_icon_factory_get_icon_filename (url + strlen ("evo-icon:"), E_ICON_SIZE_MENU); + filename = e_icon_factory_get_icon_filename (url + strlen ("evo-icon:"), GTK_ICON_SIZE_MENU); if (g_file_get_contents (filename, &data, &data_length, NULL)) { gtk_html_stream_write (handle, data, data_length); g_free (data); diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 49bcde21f6..15f03c6c8b 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -1023,7 +1023,7 @@ eab_create_image_chooser_widget(gchar *name, gtk_widget_show_all (w); if (string1) { - filename = e_icon_factory_get_icon_filename (string1, E_ICON_SIZE_DIALOG); + filename = e_icon_factory_get_icon_filename (string1, GTK_ICON_SIZE_DIALOG); e_image_chooser_set_from_file (E_IMAGE_CHOOSER (w), filename); diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index fd2bdbef88..c0c60dbbf9 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -586,30 +586,30 @@ static BonoboUIVerb verbs [] = { }; static EPixmap pixmaps [] = { - E_PIXMAP ("/commands/CalendarPrev", "go-previous", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/CalendarPrint", "document-print", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/DeleteAllOccurrences", "edit-delete", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/DeleteOccurrence", "edit-delete", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/CalendarGoto", "go-jump", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/CalendarNext", "go-next", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/CalendarPrintPreview", "document-print-preview", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/Copy", "edit-copy", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/Cut", "edit-cut", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/Delete", "edit-delete", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/Paste", "edit-paste", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/CalendarToday", "go-today", E_ICON_SIZE_MENU), - - E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/Prev", "go-previous", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/Next", "go-next", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/Goto", "go-jump", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/DayView", "view-calendar-day", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/WorkWeekView", "view-calendar-workweek", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/WeekView", "view-calendar-week", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MonthView", "view-calendar-month", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/ListView", "view-calendar-list", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/Today", "go-today", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/commands/CalendarPrev", "go-previous", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/CalendarPrint", "document-print", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/DeleteAllOccurrences", "edit-delete", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/DeleteOccurrence", "edit-delete", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/CalendarGoto", "go-jump", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/CalendarNext", "go-next", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/CalendarPrintPreview", "document-print-preview", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/Copy", "edit-copy", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/Cut", "edit-cut", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/Delete", "edit-delete", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/Paste", "edit-paste", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/CalendarToday", "go-today", GTK_ICON_SIZE_MENU), + + E_PIXMAP ("/Toolbar/Print", "document-print", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Delete", "edit-delete", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Prev", "go-previous", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Next", "go-next", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Goto", "go-jump", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/DayView", "view-calendar-day", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/WorkWeekView", "view-calendar-workweek", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/WeekView", "view-calendar-week", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/MonthView", "view-calendar-month", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/ListView", "view-calendar-list", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Today", "go-today", GTK_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP_END }; diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index ac920020f9..e51918f06c 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -680,14 +680,14 @@ e_calendar_table_init (ECalendarTable *cal_table) if (!icon_pixbufs[0]) for (i = 0; i < E_CALENDAR_MODEL_NUM_ICONS; i++) { - icon_pixbufs[i] = e_icon_factory_get_icon (icon_names[i], E_ICON_SIZE_LIST); + icon_pixbufs[i] = e_icon_factory_get_icon (icon_names[i], GTK_ICON_SIZE_MENU); } cell = e_cell_toggle_new (0, E_CALENDAR_MODEL_NUM_ICONS, icon_pixbufs); e_table_extras_add_cell(extras, "icon", cell); e_table_extras_add_pixbuf(extras, "icon", icon_pixbufs[0]); - pixbuf = e_icon_factory_get_icon ("stock_check-filled", E_ICON_SIZE_LIST); + pixbuf = e_icon_factory_get_icon ("stock_check-filled", GTK_ICON_SIZE_MENU); e_table_extras_add_pixbuf(extras, "complete", pixbuf); g_object_unref(pixbuf); diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 96bc63d592..d1d1cb4353 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -1161,11 +1161,11 @@ e_day_view_realize (GtkWidget *widget) gdk_gc_set_colormap (day_view->main_gc, colormap); /* Create the pixmaps. */ - day_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU); - day_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU); - day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU); - day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU); - day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); + day_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", GTK_ICON_SIZE_MENU); + day_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", GTK_ICON_SIZE_MENU); + day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", GTK_ICON_SIZE_MENU); + day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", GTK_ICON_SIZE_MENU); + day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", GTK_ICON_SIZE_MENU); /* Set the canvas item colors. */ diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index c5a483ea8e..5e6e62281e 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -1003,7 +1003,7 @@ write_error_html (EItipControl *itip, const gchar *itip_err) /* The column for the image */ gtk_html_stream_printf (html_stream, ""); /* The image */ - filename = e_icon_factory_get_icon_filename ("stock_new-meeting", E_ICON_SIZE_DIALOG); + filename = e_icon_factory_get_icon_filename ("stock_new-meeting", GTK_ICON_SIZE_DIALOG); gtk_html_stream_printf (html_stream, "", filename); g_free (filename); @@ -1063,7 +1063,7 @@ write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title, gtk_html_write (GTK_HTML (priv->html), html_stream, const_html, strlen(const_html)); /* The image */ - filename = e_icon_factory_get_icon_filename ("stock_new-meeting", E_ICON_SIZE_DIALOG); + filename = e_icon_factory_get_icon_filename ("stock_new-meeting", GTK_ICON_SIZE_DIALOG); gtk_html_stream_printf (html_stream, "", filename); g_free (filename); diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index 067a87bf29..cc9f778568 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -252,7 +252,7 @@ e_memo_table_init (EMemoTable *memo_table) if (!icon_pixbufs[0]) for (i = 0; i < E_MEMO_MODEL_NUM_ICONS; i++) { - icon_pixbufs[i] = e_icon_factory_get_icon (icon_names[i], E_ICON_SIZE_LIST); + icon_pixbufs[i] = e_icon_factory_get_icon (icon_names[i], GTK_ICON_SIZE_MENU); } cell = e_cell_toggle_new (0, E_MEMO_MODEL_NUM_ICONS, icon_pixbufs); diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index eaa6a3a47c..316ba5effc 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -733,11 +733,11 @@ e_week_view_realize (GtkWidget *widget) gdk_gc_set_colormap (week_view->main_gc, colormap); /* Create the pixmaps. */ - week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU); - week_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU); - week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU); - week_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); - week_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU); + week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", GTK_ICON_SIZE_MENU); + week_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", GTK_ICON_SIZE_MENU); + week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", GTK_ICON_SIZE_MENU); + week_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", GTK_ICON_SIZE_MENU); + week_view->meeting_icon = e_icon_factory_get_icon ("stock_people", GTK_ICON_SIZE_MENU); } static void diff --git a/calendar/gui/memos-control.c b/calendar/gui/memos-control.c index 54f1dbc2ae..7b743a9378 100644 --- a/calendar/gui/memos-control.c +++ b/calendar/gui/memos-control.c @@ -210,18 +210,18 @@ static BonoboUIVerb verbs [] = { }; static EPixmap pixmaps [] = { - E_PIXMAP ("/commands/MemosCopy", "edit-copy", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MemosCut", "edit-cut", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MemosDelete", "edit-delete", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MemosPaste", "edit-paste", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MemosPrint", "document-print", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MemosPrintPreview", "document-print-preview", E_ICON_SIZE_MENU), - - E_PIXMAP ("/Toolbar/Cut", "edit-cut", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/Copy", "edit-copy", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/Paste", "edit-paste", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/commands/MemosCopy", "edit-copy", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MemosCut", "edit-cut", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MemosDelete", "edit-delete", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MemosPaste", "edit-paste", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MemosPrint", "document-print", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MemosPrintPreview", "document-print-preview", GTK_ICON_SIZE_MENU), + + E_PIXMAP ("/Toolbar/Cut", "edit-cut", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Copy", "edit-copy", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Paste", "edit-paste", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Print", "document-print", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Delete", "edit-delete", GTK_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP_END }; diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c index a0633aa636..0d83becf21 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -283,19 +283,19 @@ static BonoboUIVerb verbs [] = { }; static EPixmap pixmaps [] = { - E_PIXMAP ("/commands/TasksCopy", "edit-copy", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/TasksCut", "edit-cut", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/TasksDelete", "edit-delete", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/TasksForward", "mail-forward", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/TasksPaste", "edit-paste", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/TasksPrint", "document-print", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/TasksPrintPreview", "document-print-preview", E_ICON_SIZE_MENU), - - E_PIXMAP ("/Toolbar/Cut", "edit-cut", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/Copy", "edit-copy", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/Paste", "edit-paste", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/commands/TasksCopy", "edit-copy", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/TasksCut", "edit-cut", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/TasksDelete", "edit-delete", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/TasksForward", "mail-forward", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/TasksPaste", "edit-paste", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/TasksPrint", "document-print", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/TasksPrintPreview", "document-print-preview", GTK_ICON_SIZE_MENU), + + E_PIXMAP ("/Toolbar/Cut", "edit-cut", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Copy", "edit-copy", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Paste", "edit-paste", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Print", "document-print", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Delete", "edit-delete", GTK_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP_END }; diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index 7e9cf4cad7..299dfff6f5 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -166,27 +166,6 @@ load_icon (const char *icon_key, const char *icon_name, int size, int scale) return icon_new (icon_key, pixbuf); } -static GtkIconSize -e_icon_size_to_gtk_icon_size (guint size) -{ - switch (size) { - case E_ICON_SIZE_MENU: - return GTK_ICON_SIZE_MENU; - case E_ICON_SIZE_BUTTON: - return GTK_ICON_SIZE_BUTTON; - case E_ICON_SIZE_SMALL_TOOLBAR: - return GTK_ICON_SIZE_SMALL_TOOLBAR; - case E_ICON_SIZE_LARGE_TOOLBAR: - return GTK_ICON_SIZE_LARGE_TOOLBAR; - case E_ICON_SIZE_DND: - return GTK_ICON_SIZE_DND; - case E_ICON_SIZE_DIALOG: - return GTK_ICON_SIZE_DIALOG; - default: - g_assert_not_reached (); - } -} - static void icon_theme_changed_cb (GtkIconTheme *icon_theme, gpointer user_data) { @@ -250,48 +229,35 @@ e_icon_factory_shutdown (void) /** * e_icon_factory_get_icon_filename: * @icon_name: name of the icon - * @size: MENU/SMALL_TOOLBAR/etc + * @size: size of the icon * * Looks up the icon to use based on name and size. * * Returns the requested icon pixbuf. **/ -char * -e_icon_factory_get_icon_filename (const char *icon_name, int icon_size) +gchar * +e_icon_factory_get_icon_filename (const gchar *icon_name, + GtkIconSize icon_size) { + GtkIconTheme *icon_theme; GtkIconInfo *icon_info; - char *filename; + gchar *filename = NULL; gint width, height; g_return_val_if_fail (icon_name != NULL, NULL); - g_return_val_if_fail (strcmp (icon_name, ""), NULL); - - if (icon_size >= E_ICON_NUM_SIZES) { - g_critical ( - "calling %s with unknown icon_size value (%d)", - G_STRFUNC, icon_size); - /* if ((icon_size = pixel_size_to_icon_size (icon_size)) == -1)*/ - return NULL; - } - if (! gtk_icon_size_lookup_for_settings (gtk_settings_get_default (), - e_icon_size_to_gtk_icon_size (icon_size), - &width, &height)) - return NULL; + icon_theme = gtk_icon_theme_get_default (); - d(g_message ("Size is %d", icon_size)); - d(g_message ("looking up %s at %dx%d", icon_name, width, height)); + if (!gtk_icon_size_lookup (icon_size, &width, &height)) + return NULL; - g_static_mutex_lock (&mutex); icon_info = gtk_icon_theme_lookup_icon ( icon_theme, icon_name, height, 0); if (icon_info != NULL) { filename = g_strdup ( gtk_icon_info_get_filename (icon_info)); gtk_icon_info_free (icon_info); - } else - filename = NULL; - g_static_mutex_unlock (&mutex); + } return filename; } @@ -300,7 +266,7 @@ e_icon_factory_get_icon_filename (const char *icon_name, int icon_size) /** * e_icon_factory_get_icon: * @icon_name: name of the icon - * @icon_size: size of the icon (one of the E_ICON_SIZE_* enum values) + * @icon_size: size of the icon * * Returns the specified icon of the requested size (may perform * scaling to achieve this). If @icon_name is a full path, that file @@ -311,38 +277,21 @@ e_icon_factory_get_icon_filename (const char *icon_name, int icon_size) * requested icon, then a "broken-image" icon is returned. **/ GdkPixbuf * -e_icon_factory_get_icon (const char *icon_name, int icon_size) +e_icon_factory_get_icon (const gchar *icon_name, + GtkIconSize icon_size) { GdkPixbuf *pixbuf; char *icon_key; Icon *icon; int size, width, height; - if (icon_size >= E_ICON_NUM_SIZES) { - g_critical ( - "calling %s with unknown icon_size value (%d)", - G_STRFUNC, icon_size); - /*if ((icon_size = pixel_size_to_icon_size (icon_size)) == -1) */ - return NULL; - } + g_return_val_if_fail (icon_name != NULL, NULL); - if (! gtk_icon_size_lookup_for_settings (gtk_settings_get_default (), - e_icon_size_to_gtk_icon_size (icon_size), - &width, &height)) + if (!gtk_icon_size_lookup (icon_size, &width, &height)) return NULL; - d(g_message ("Size is %d", icon_size)); - d(g_message ("looking up %s at %dx%d", icon_name, width, height)); - size = height; - if (icon_name == NULL || !strcmp (icon_name, "")) { - if (size >= 24) - return gdk_pixbuf_scale_simple (broken24_pixbuf, size, size, GDK_INTERP_NEAREST); - else - return gdk_pixbuf_scale_simple (broken16_pixbuf, size, size, GDK_INTERP_NEAREST); - } - icon_key = g_alloca (strlen (icon_name) + 7); sprintf (icon_key, "%dx%d/%s", size, size, icon_name); diff --git a/e-util/e-icon-factory.h b/e-util/e-icon-factory.h index f8d1fc2fc7..c864b1be8e 100644 --- a/e-util/e-icon-factory.h +++ b/e-util/e-icon-factory.h @@ -26,31 +26,14 @@ #include -enum { - E_ICON_SIZE_MENU, - E_ICON_SIZE_BUTTON, - E_ICON_SIZE_SMALL_TOOLBAR, - E_ICON_SIZE_LARGE_TOOLBAR, - E_ICON_SIZE_DND, - E_ICON_SIZE_DIALOG, - E_ICON_NUM_SIZES -}; - -/* standard size for list/tree widgets (16x16) */ -#define E_ICON_SIZE_LIST E_ICON_SIZE_MENU - -/* standard size for status bar icons (16x16) */ -#define E_ICON_SIZE_STATUS E_ICON_SIZE_MENU - - - -void e_icon_factory_init (void); -void e_icon_factory_shutdown (void); - -char *e_icon_factory_get_icon_filename (const char *icon_name, int icon_size); - -GdkPixbuf *e_icon_factory_get_icon (const char *icon_name, int icon_size); - -GdkPixbuf *e_icon_factory_pixbuf_scale (GdkPixbuf *pixbuf, int width, int height); +void e_icon_factory_init (void); +void e_icon_factory_shutdown (void); +gchar * e_icon_factory_get_icon_filename(const gchar *icon_name, + GtkIconSize icon_size); +GdkPixbuf * e_icon_factory_get_icon (const gchar *icon_name, + GtkIconSize icon_size); +GdkPixbuf * e_icon_factory_pixbuf_scale (GdkPixbuf *pixbuf, + gint width, + gint height); #endif /* _E_ICON_FACTORY_H_ */ diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 0aba4c1045..0a68c1921a 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -1796,11 +1796,11 @@ static BonoboUIVerb emfb_verbs[] = { }; static EPixmap emfb_pixmaps[] = { - E_PIXMAP ("/commands/FolderCreate", "folder-new", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ChangeFolderProperties", "document-properties", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FolderCopy", "folder-copy", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FolderMove", "folder-move", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageMarkAllAsRead", "mail-read", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FolderCreate", "folder-new", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ChangeFolderProperties", "document-properties", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FolderCopy", "folder-copy", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FolderMove", "folder-move", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageMarkAllAsRead", "mail-read", GTK_ICON_SIZE_MENU), E_PIXMAP_END }; diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 4393b2bb73..6c653116c4 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -290,15 +290,15 @@ render_pixbuf (GtkTreeViewColumn *column, GtkCellRenderer *renderer, const char *folder_name; if (!initialised) { - folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("folder", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_INBOX] = e_icon_factory_get_icon ("mail-inbox", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_OUTBOX] = e_icon_factory_get_icon ("mail-outbox", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("user-trash", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("mail-mark-junk", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_SHARED_TO_ME] = e_icon_factory_get_icon ("stock_shared-to-me", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_SHARED_BY_ME] = e_icon_factory_get_icon ("stock_shared-by-me", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_SENT] = e_icon_factory_get_icon ("mail-sent", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_VIRTUAL] = e_icon_factory_get_icon ("folder-saved-search", E_ICON_SIZE_MENU); + folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("folder", GTK_ICON_SIZE_MENU); + folder_icons[FOLDER_ICON_INBOX] = e_icon_factory_get_icon ("mail-inbox", GTK_ICON_SIZE_MENU); + folder_icons[FOLDER_ICON_OUTBOX] = e_icon_factory_get_icon ("mail-outbox", GTK_ICON_SIZE_MENU); + folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("user-trash", GTK_ICON_SIZE_MENU); + folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("mail-mark-junk", GTK_ICON_SIZE_MENU); + folder_icons[FOLDER_ICON_SHARED_TO_ME] = e_icon_factory_get_icon ("stock_shared-to-me", GTK_ICON_SIZE_MENU); + folder_icons[FOLDER_ICON_SHARED_BY_ME] = e_icon_factory_get_icon ("stock_shared-by-me", GTK_ICON_SIZE_MENU); + folder_icons[FOLDER_ICON_SENT] = e_icon_factory_get_icon ("mail-sent", GTK_ICON_SIZE_MENU); + folder_icons[FOLDER_ICON_VIRTUAL] = e_icon_factory_get_icon ("folder-saved-search", GTK_ICON_SIZE_MENU); initialised = TRUE; } diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 62bab8a48f..a433323bb2 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -2089,46 +2089,46 @@ static BonoboUIVerb emfv_message_verbs[] = { }; static EPixmap emfv_message_pixmaps[] = { - E_PIXMAP ("/commands/EditCopy", "edit-copy", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/EditCut", "edit-cut", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/EditPaste", "edit-paste", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MailCompose", "mail-message-new", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageApplyFilters", "stock_mail-filters-apply", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageCopy", "mail-copy", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageDelete", "user-trash", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageFilterJunk", "mail-mark-junk", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageFollowUpFlag", "stock_mail-flag-for-followup", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageForward", "mail-forward", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageMarkAsImportant", "mail-mark-important", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageMarkAsJunk", "mail-mark-junk", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageMarkAsNotJunk", "mail-mark-notjunk", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageMarkAsRead", "mail-mark-read", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageMarkAsUnRead", "mail-mark-unread", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageMove", "mail-move", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageReplyAll", "mail-reply-all", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageReplySender", "mail-reply-sender", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageSaveAs", "document-save-as", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageSearch", "edit-find", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/PrintMessage", "document-print", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/PrintPreviewMessage", "document-print-preview", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/TextZoomIn", "zoom-in", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/TextZoomOut", "zoom-out", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/TextZoomReset", "zoom-original", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ViewLoadImages", "image-x-generic", E_ICON_SIZE_MENU), - - E_PIXMAP ("/menu/MessagePlaceholder/Message/MessageNavigation/GoTo", "go-jump", E_ICON_SIZE_MENU), - - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplySender", "mail-reply-sender", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplyAll", "mail-reply-all", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageForward", "mail-forward", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/PrintMessage", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMove", "mail-move", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageCopy", "mail-copy", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageDelete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMarkAsJunk", "mail-mark-junk", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMarkAsNotJunk", "mail-mark-notjunk", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailNextButtons/MailNext", "go-next", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailNextButtons/MailPrevious", "go-previous", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/commands/EditCopy", "edit-copy", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/EditCut", "edit-cut", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/EditPaste", "edit-paste", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MailCompose", "mail-message-new", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageApplyFilters", "stock_mail-filters-apply", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageCopy", "mail-copy", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageDelete", "user-trash", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageFilterJunk", "mail-mark-junk", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageFollowUpFlag", "stock_mail-flag-for-followup", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageForward", "mail-forward", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageMarkAsImportant", "mail-mark-important", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageMarkAsJunk", "mail-mark-junk", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageMarkAsNotJunk", "mail-mark-notjunk", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageMarkAsRead", "mail-mark-read", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageMarkAsUnRead", "mail-mark-unread", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageMove", "mail-move", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageReplyAll", "mail-reply-all", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageReplySender", "mail-reply-sender", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageSaveAs", "document-save-as", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageSearch", "edit-find", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/PrintMessage", "document-print", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/PrintPreviewMessage", "document-print-preview", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/TextZoomIn", "zoom-in", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/TextZoomOut", "zoom-out", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/TextZoomReset", "zoom-original", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ViewLoadImages", "image-x-generic", GTK_ICON_SIZE_MENU), + + E_PIXMAP ("/menu/MessagePlaceholder/Message/MessageNavigation/GoTo", "go-jump", GTK_ICON_SIZE_MENU), + + E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplySender", "mail-reply-sender", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplyAll", "mail-reply-all", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageForward", "mail-forward", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/MailMessageToolbar/PrintMessage", "document-print", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMove", "mail-move", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageCopy", "mail-copy", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageDelete", "edit-delete", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMarkAsJunk", "mail-mark-junk", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMarkAsNotJunk", "mail-mark-notjunk", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/MailNextButtons/MailNext", "go-next", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/MailNextButtons/MailPrevious", "go-previous", GTK_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP_END }; diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index cf1626ecd0..1a56f21e48 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -967,7 +967,7 @@ static void efhd_message_prefix(EMFormat *emf, CamelStream *stream, CamelMimePar camel_stream_printf(stream, ""); comp = camel_folder_get_message_user_tag(emf->folder, emf->uid, "completed-on"); - iconpath = e_icon_factory_get_icon_filename (comp && comp[0] ? "stock_flag-for-followup-done" : "stock_flag-for-followup", E_ICON_SIZE_MENU); + iconpath = e_icon_factory_get_icon_filename (comp && comp[0] ? "stock_flag-for-followup-done" : "stock_flag-for-followup", GTK_ICON_SIZE_MENU); if (iconpath) { CamelMimePart *iconpart; diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 23926f8ed6..6d116a69ba 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -700,7 +700,7 @@ efh_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, Camel icon = smime_sign_table[valid->sign.status].icon; else icon = smime_encrypt_table[valid->encrypt.status].icon; - iconpath = e_icon_factory_get_icon_filename(icon, E_ICON_SIZE_DIALOG); + iconpath = e_icon_factory_get_icon_filename(icon, GTK_ICON_SIZE_DIALOG); iconpart = em_format_html_file_part((EMFormatHTML *)emf, "image/png", iconpath); if (iconpart) { (void)em_format_add_puri(emf, sizeof(EMFormatPURI), classid, iconpart, efh_write_image); diff --git a/mail/message-list.c b/mail/message-list.c index e2c23db51a..1fc0a9a09a 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -1637,7 +1637,7 @@ message_list_init_images (void) for (i = 0; i < G_N_ELEMENTS (states_pixmaps); i++) { if (states_pixmaps[i].icon_name) - states_pixmaps[i].pixbuf = e_icon_factory_get_icon (states_pixmaps[i].icon_name, E_ICON_SIZE_MENU); + states_pixmaps[i].pixbuf = e_icon_factory_get_icon (states_pixmaps[i].icon_name, GTK_ICON_SIZE_MENU); else states_pixmaps[i].pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) empty_xpm); } diff --git a/plugins/calendar-weather/calendar-weather.c b/plugins/calendar-weather/calendar-weather.c index f61d90c4d0..9354cbb0b1 100644 --- a/plugins/calendar-weather/calendar-weather.c +++ b/plugins/calendar-weather/calendar-weather.c @@ -86,7 +86,7 @@ e_plugin_lib_enable (EPluginLib *epl, int enable) for (i = 0; categories[i].description; i++) { char *filename; - filename = e_icon_factory_get_icon_filename (categories[i].icon_name, E_ICON_SIZE_MENU); + filename = e_icon_factory_get_icon_filename (categories[i].icon_name, GTK_ICON_SIZE_MENU); e_categories_add (_(categories[i].description), NULL, filename, FALSE); g_free (filename); } diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index 46210d0956..9811c6fd6d 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -441,7 +441,7 @@ proxy_login_update_tree (void) char *proxy_email; EGwConnection *cnc; proxyLoginPrivate *priv = pld->priv; - gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", E_ICON_SIZE_DIALOG); + gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", GTK_ICON_SIZE_DIALOG); broken_image = file_name ? gdk_pixbuf_new_from_file (file_name, NULL) : NULL; cnc = proxy_login_get_cnc (pld->account, priv->main ? (GTK_WINDOW (gtk_widget_get_toplevel (priv->main))) : NULL); diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index 8bf212ee24..60be390eb3 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -602,7 +602,7 @@ proxy_update_tree_view (EAccount *account) GdkPixbuf *broken_image = NULL; GList *list_iter; proxyHandler *aclInstance; - gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", E_ICON_SIZE_DIALOG); + gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", GTK_ICON_SIZE_DIALOG); proxyDialogPrivate *priv; prd = g_object_get_data ((GObject *)account, "prd"); diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index 68ce5abec0..8bc3b12c5c 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -700,7 +700,7 @@ e_shell_importer_start_import (EShellWindow *shell_window) data->import = e_import_new("org.gnome.evolution.shell.importer"); - icon = e_icon_factory_get_icon ("stock_mail-import", E_ICON_SIZE_DIALOG); + icon = e_icon_factory_get_icon ("stock_mail-import", GTK_ICON_SIZE_DIALOG); dialog_open = TRUE; data->window = shell_window; diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c index 11b8ad7719..4d735eba7d 100644 --- a/shell/e-shell-settings-dialog.c +++ b/shell/e-shell-settings-dialog.c @@ -202,7 +202,7 @@ load_pages (EShellSettingsDialog *dialog) if (g_path_is_absolute (icon_path)) { icon = gdk_pixbuf_new_from_file (icon_path, NULL); } else { - icon = e_icon_factory_get_icon (icon_path, E_ICON_SIZE_DIALOG); + icon = e_icon_factory_get_icon (icon_path, GTK_ICON_SIZE_DIALOG); } } diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index 289c5cbea8..3d148781f1 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -1125,27 +1125,27 @@ static BonoboUIVerb help_verbs [] = { }; static EPixmap pixmaps [] = { - E_PIXMAP ("/Toolbar/SendReceive", "mail-send-receive", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/menu/File/OpenNewWindow", "window-new", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/File/SendReceive", "mail-send-receive", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/File/FileImporter", "stock_mail-import", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/File/Print/FilePageSetup", "stock_print-setup", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/File/ToggleOffline", "stock_disconnect", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/File/FileClose", "window-close", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/File/FileExit", "application-exit", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/Edit/Settings", "preferences-desktop", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/Help/HelpOpenFAQ", "help-faq", E_ICON_SIZE_MENU), + E_PIXMAP ("/Toolbar/SendReceive", "mail-send-receive", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/menu/File/OpenNewWindow", "window-new", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/SendReceive", "mail-send-receive", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/FileImporter", "stock_mail-import", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/Print/FilePageSetup", "stock_print-setup", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/ToggleOffline", "stock_disconnect", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/FileClose", "window-close", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/FileExit", "application-exit", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/menu/Edit/Settings", "preferences-desktop", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/menu/Help/HelpOpenFAQ", "help-faq", GTK_ICON_SIZE_MENU), E_PIXMAP_END }; static EPixmap offline_pixmaps [] = { - E_PIXMAP ("/menu/File/ToggleOffline", "stock_disconnect", E_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/ToggleOffline", "stock_disconnect", GTK_ICON_SIZE_MENU), E_PIXMAP_END }; static EPixmap online_pixmaps [] = { - E_PIXMAP ("/menu/File/ToggleOffline", "stock_connect", E_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/ToggleOffline", "stock_connect", GTK_ICON_SIZE_MENU), E_PIXMAP_END }; diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c index 30b0d1dfa2..abc4848663 100644 --- a/shell/e-user-creatable-items-handler.c +++ b/shell/e-user-creatable-items-handler.c @@ -260,9 +260,9 @@ ensure_menu_items (EUserCreatableItemsHandler *handler) item->icon = NULL; item->icon_toolbar = NULL; } else { - item->icon = e_icon_factory_get_icon (corba_item->iconName, E_ICON_SIZE_MENU); + item->icon = e_icon_factory_get_icon (corba_item->iconName, GTK_ICON_SIZE_MENU); if (item_is_default (item, component->alias)) - item->icon_toolbar = e_icon_factory_get_icon (corba_item->iconName, E_ICON_SIZE_LARGE_TOOLBAR); + item->icon_toolbar = e_icon_factory_get_icon (corba_item->iconName, GTK_ICON_SIZE_LARGE_TOOLBAR); else item->icon_toolbar = NULL; } diff --git a/shell/evolution-shell-component-utils.h b/shell/evolution-shell-component-utils.h index 0fe71de8f4..eb04edae52 100644 --- a/shell/evolution-shell-component-utils.h +++ b/shell/evolution-shell-component-utils.h @@ -33,7 +33,7 @@ extern "C" { typedef struct _EPixmap { const char *path; const char *name; - gint size; + GtkIconSize size; char *pixbuf; } EPixmap; -- cgit v1.2.3