From c13ea522069443479b5370d6bb0084b281272ef2 Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Mon, 19 Apr 2004 15:19:05 +0000 Subject: Set the default image for the contact photo to be the stock_person image 2004-04-19 Rodney Dawes * gui/contact-editor/contact-editor.glade: Set the default image for the contact photo to be the stock_person image in the icon theme 2004-04-19 Michael Terry * gui/component/GNOME_Evolution_Addressbook.server.in.in: * gui/component/addressbook-component.c: * gui/component/addressbook-view.c: * gui/component/select-names/e-select-names-popup.c: * gui/contact-editor/e-contact-editor-address.c: * gui/contact-editor/e-contact-editor-fullname.c: * gui/contact-editor/e-contact-editor-im.c: * gui/contact-list-editor/contact-list-editor.glade: * gui/contact-list-editor/e-contact-list-editor.c: * gui/merging/eab-contact-commit-duplicate-detected.glade: * gui/merging/eab-contact-duplicate-detected.glade: * gui/widgets/e-minicard.c: * gui/widgets/eab-contact-display.c: * gui/widgets/eab-gui-util.c: Update the addressbook to use the icon theme via the EIconFactory object in e-util svn path=/trunk/; revision=25514 --- .../gui/component/select-names/e-select-names-popup.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'addressbook/gui/component/select-names') 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 0ad6fda909..9fc1179010 100644 --- a/addressbook/gui/component/select-names/e-select-names-popup.c +++ b/addressbook/gui/component/select-names/e-select-names-popup.c @@ -44,9 +44,10 @@ #include #include "eab-gui-util.h" #include "e-select-names-popup.h" +#include -#define LIST_ICON_FILENAME "contact-list-16.png" -#define CONTACT_ICON_FILENAME "evolution-contacts-mini.png" +#define LIST_ICON_NAME "stock_contact-list" +#define CONTACT_ICON_NAME "stock_contact" typedef struct _PopupInfo PopupInfo; struct _PopupInfo { @@ -191,6 +192,7 @@ toggle_html_mail_cb (GtkWidget *w, gpointer user_data) static void populate_popup_contact (GtkWidget *pop, gboolean list, PopupInfo *info) { + GdkPixbuf *pixbuf; GtkWidget *image; EContact *contact; GtkWidget *menuitem; @@ -289,9 +291,9 @@ populate_popup_contact (GtkWidget *pop, gboolean list, PopupInfo *info) gtk_widget_show (menuitem); gtk_menu_shell_prepend (GTK_MENU_SHELL (pop), menuitem); - image = gtk_image_new_from_file (list - ? EVOLUTION_IMAGESDIR "/" LIST_ICON_FILENAME - : EVOLUTION_IMAGESDIR "/" CONTACT_ICON_FILENAME); + pixbuf = e_icon_factory_get_icon (list ? LIST_ICON_NAME : CONTACT_ICON_NAME, 16); + image = gtk_image_new_from_pixbuf (pixbuf); + g_object_unref (pixbuf); gtk_widget_show (image); menuitem = gtk_image_menu_item_new_with_label (e_destination_get_name (info->dest)); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), -- cgit v1.2.3