diff options
| -rw-r--r-- | shell/ChangeLog | 13 | ||||
| -rw-r--r-- | shell/e-component-registry.c | 2 | ||||
| -rw-r--r-- | shell/e-shell-importer.c | 4 | ||||
| -rw-r--r-- | shell/e-shell-settings-dialog.c | 2 | ||||
| -rw-r--r-- | shell/e-shell-startup-wizard.c | 2 | ||||
| -rw-r--r-- | shell/e-user-creatable-items-handler.c | 2 |
6 files changed, 19 insertions, 6 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index ac5e388a7a..a6f36fe11d 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,16 @@ +2004-04-19 Jeffrey Stedfast <fejj@ximian.com> + + * e-user-creatable-items-handler.c (ensure_menu_items): Same. + + * e-shell-startup-wizard.c (make_timezone_page): Same. + + * e-shell-settings-dialog.c (load_pages): Same. + + * e-shell-importer.c (e_shell_importer_start_import): Same. + + * e-component-registry.c (query_components): Don't use absolute + pixel sizes, use the E_ICON_SIZE enums instead. + 2004-04-19 Michael Terry <mike@mterry.name> * GNOME_Evolution_Test.server.in.in: Change component icons to use the diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c index 855ec1c350..a803af223c 100644 --- a/shell/e-component-registry.c +++ b/shell/e-component-registry.c @@ -173,7 +173,7 @@ query_components (EComponentRegistry *registry) if (icon_name == NULL) { icon = NULL; } else { - icon = e_icon_factory_get_icon (icon_name, 24); + icon = e_icon_factory_get_icon (icon_name, E_ICON_SIZE_LARGE_TOOLBAR); } sort_order_string = bonobo_server_info_prop_lookup (& info_list->_buffer[i], diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index d167ad36e8..5482409cb1 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -1147,8 +1147,8 @@ e_shell_importer_start_import (EShellWindow *shell_window) return; } - icon = e_icon_factory_get_icon ("stock_import", 48); - + icon = e_icon_factory_get_icon ("stock_import", E_ICON_SIZE_DIALOG); + dialog_open = TRUE; data->window = shell_window; data->shell = e_shell_window_peek_shell (data->window); diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c index a34b7c4843..dbfb2c502a 100644 --- a/shell/e-shell-settings-dialog.c +++ b/shell/e-shell-settings-dialog.c @@ -204,7 +204,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, 48); + icon = e_icon_factory_get_icon (icon_path, E_ICON_SIZE_DIALOG); } } diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c index 984a83df40..b659abffa5 100644 --- a/shell/e-shell-startup-wizard.c +++ b/shell/e-shell-startup-wizard.c @@ -501,7 +501,7 @@ make_timezone_page (SWData *data) page->page = glade_xml_get_widget (data->wizard, "timezone-page"); g_return_val_if_fail (page->page != NULL, NULL); - pixbuf = e_icon_factory_get_icon ("stock_timezone", 48); + pixbuf = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_DIALOG); gnome_druid_page_standard_set_logo (GNOME_DRUID_PAGE_STANDARD (page->page), pixbuf); g_object_unref (pixbuf); diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c index f1e08d36b3..b0ed095522 100644 --- a/shell/e-user-creatable-items-handler.c +++ b/shell/e-user-creatable-items-handler.c @@ -267,7 +267,7 @@ ensure_menu_items (EUserCreatableItemsHandler *handler) if (corba_item->iconName == "") { item->icon = NULL; } else { - item->icon = e_icon_factory_get_icon (corba_item->iconName, 16); + item->icon = e_icon_factory_get_icon (corba_item->iconName, E_ICON_SIZE_MENU); } if (corba_item->type == GNOME_Evolution_CREATABLE_OBJECT) |