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. --- 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 +- 5 files changed, 17 insertions(+), 17 deletions(-) (limited to 'shell') 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