From 2c71a3328a34e23efdc5b52529ef975c01370c7a Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 17 May 2004 19:09:40 +0000 Subject: Use an E_ICON_SIZE enum value for the icon_size argument to get_icon. 2004-05-17 Jeffrey Stedfast * gui/widgets/e-minicard.c (e_minicard_init): Use an E_ICON_SIZE enum value for the icon_size argument to get_icon. * gui/widgets/eab-gui-util.c (eab_create_image_chooser_widget): Use E_ICON_SIZE_DIALOG as the icon_size argument to get_icon_filename. * gui/widgets/eab-contact-display.c (on_url_requested): Use an E_ICON_SIZE enum as the icon_size argument to get_icon_filename. * gui/contact-editor/e-contact-editor-im.c (setup_service_optmenu): Use E_ICON_SIZE_MENU here. * gui/component/select-names/e-select-names-popup.c (populate_popup_contact): Use E_ICON_SIZE_MENU here instead of 16. * gui/component/addressbook-view.c (set_status_message): Use the E_ICON_SIZE corresponding to 16x16 pixels. svn path=/trunk/; revision=25933 --- addressbook/gui/component/addressbook-view.c | 2 +- addressbook/gui/component/select-names/e-select-names-popup.c | 2 +- addressbook/gui/contact-editor/e-contact-editor-im.c | 2 +- addressbook/gui/widgets/e-minicard.c | 2 +- addressbook/gui/widgets/eab-contact-display.c | 3 ++- addressbook/gui/widgets/eab-gui-util.c | 3 ++- 6 files changed, 8 insertions(+), 6 deletions(-) (limited to 'addressbook/gui') diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 0af61da6e1..72979de66d 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -275,7 +275,7 @@ set_status_message (EABView *eav, const char *message, AddressbookView *view) char *clientid = g_strdup_printf ("%p", view); if (progress_icon == NULL) - progress_icon = e_icon_factory_get_icon (EVOLUTION_CONTACTS_PROGRESS_IMAGE, 16); + progress_icon = e_icon_factory_get_icon (EVOLUTION_CONTACTS_PROGRESS_IMAGE, E_ICON_SIZE_MENU); priv->activity_id = e_activity_handler_operation_started (activity_handler, clientid, progress_icon, message, TRUE); diff --git a/addressbook/gui/component/select-names/e-select-names-popup.c b/addressbook/gui/component/select-names/e-select-names-popup.c index 9fc1179010..8251ed4ea1 100644 --- a/addressbook/gui/component/select-names/e-select-names-popup.c +++ b/addressbook/gui/component/select-names/e-select-names-popup.c @@ -291,7 +291,7 @@ populate_popup_contact (GtkWidget *pop, gboolean list, PopupInfo *info) gtk_widget_show (menuitem); gtk_menu_shell_prepend (GTK_MENU_SHELL (pop), menuitem); - pixbuf = e_icon_factory_get_icon (list ? LIST_ICON_NAME : CONTACT_ICON_NAME, 16); + pixbuf = e_icon_factory_get_icon (list ? LIST_ICON_NAME : CONTACT_ICON_NAME, E_ICON_SIZE_MENU); image = gtk_image_new_from_pixbuf (pixbuf); g_object_unref (pixbuf); gtk_widget_show (image); diff --git a/addressbook/gui/contact-editor/e-contact-editor-im.c b/addressbook/gui/contact-editor/e-contact-editor-im.c index 0be3c2b09f..b77fefd88b 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-im.c +++ b/addressbook/gui/contact-editor/e-contact-editor-im.c @@ -196,7 +196,7 @@ setup_service_optmenu(EContactEditorIm *editor) gtk_container_add(GTK_CONTAINER(item), hbox); gtk_widget_show(hbox); - pixbuf = e_icon_factory_get_icon(im_images[i], 16); + pixbuf = e_icon_factory_get_icon (im_images[i], E_ICON_SIZE_MENU); if (pixbuf != NULL) { image = gtk_image_new_from_pixbuf(pixbuf); diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index bffe91e49e..30b0c17af5 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -236,7 +236,7 @@ e_minicard_init (EMinicard *minicard) minicard->contact = NULL; - minicard->list_icon_pixbuf = e_icon_factory_get_icon (LIST_ICON_NAME, 16); + minicard->list_icon_pixbuf = e_icon_factory_get_icon (LIST_ICON_NAME, E_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 1d4cc794b8..623b798089 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -23,6 +23,7 @@ #include "eab-contact-display.h" #include "e-util/e-html-utils.h" +#include "e-util/e-icon-factory.h" #include #include @@ -75,7 +76,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:"), 16); + filename = e_icon_factory_get_icon_filename (url + strlen ("evo-icon:"), E_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 d934942fea..1b90cc0551 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -32,6 +32,7 @@ #include "util/e-destination.h" #include "widgets/misc/e-image-chooser.h" #include "widgets/misc/e-source-selector.h" +#include #include @@ -994,7 +995,7 @@ eab_create_image_chooser_widget(gchar *name, gtk_widget_show_all (w); if (string1) { - filename = e_icon_factory_get_icon_filename (string1, 48); + filename = e_icon_factory_get_icon_filename (string1, E_ICON_SIZE_DIALOG); e_image_chooser_set_from_file (E_IMAGE_CHOOSER (w), filename); -- cgit v1.2.3