diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2008-08-12 01:04:32 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-12 01:04:32 +0800 |
commit | 434bc25ed6b3f458f3bf119e76bd8b2bcffe5178 (patch) | |
tree | b84c336fba38760d8fe438eb9c32a117c1998752 /addressbook/gui/contact-editor | |
parent | bf8758569da2efb6c4e237741325e8d2056dba45 (diff) | |
download | gsoc2013-evolution-434bc25ed6b3f458f3bf119e76bd8b2bcffe5178.tar gsoc2013-evolution-434bc25ed6b3f458f3bf119e76bd8b2bcffe5178.tar.gz gsoc2013-evolution-434bc25ed6b3f458f3bf119e76bd8b2bcffe5178.tar.bz2 gsoc2013-evolution-434bc25ed6b3f458f3bf119e76bd8b2bcffe5178.tar.lz gsoc2013-evolution-434bc25ed6b3f458f3bf119e76bd8b2bcffe5178.tar.xz gsoc2013-evolution-434bc25ed6b3f458f3bf119e76bd8b2bcffe5178.tar.zst gsoc2013-evolution-434bc25ed6b3f458f3bf119e76bd8b2bcffe5178.zip |
** Fixes bug #546892
2008-08-11 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #546892
* e-util/e-icon-factory.c (e_icon_factory_get_image):
Kill this function. Use gtk_image_new_from_icon_name().
* e-util/e-icon-factory.c (e_icon_factory_get_icon_list):
Kill this function. Use gtk_window_set_icon_name().
* widgets/misc/e-activity-handler.c:
* widgets/misc/e-task-widget.c:
Purge the GdkPixbuf arguments from the API. We've been ignoring
them since the spinner icon was added.
* addressbook/gui/contact-editor/e-contact-editor-fullname.c:
* addressbook/gui/contact-editor/e-contact-editor-im.c:
* addressbook/gui/contact-editor/e-contact-editor-address.c:
* calendar/gui/alarm-notify/alarm-notify-dialog.c:
* calendar/gui/dialogs/alarm-dialog.c:
* calendar/gui/dialogs/alarm-list-dialog.c:
* calendar/gui/dialogs/cal-attachment-select-file.c:
* calendar/gui/dialogs/changed-comp.c:
* calendar/gui/dialogs/delete-error.c:
* calendar/gui/dialogs/select-source-dialog.c:
* mail/mail-send-recv.c:
* mail/message-tag-followup.c:
* widgets/misc/e-combo-button.c:
* widgets/misc/e-info-label.c:
* widgets/misc/e-url-entry.c:
* widgets/misc/e-task-widget.c:
Prefer gtk_window_set_icon_name() over gtk_window_set_icon_list().
* addressbook/gui/contact-editor/e-contact-editor-im.c:
* calendar/gui/dialogs/event-page.c:
* calendar/gui/e-timezone-entry.c:
* e-util/e-gui-utils.c:
* e-util/e-popup.c:
* plugins/import-ics-attachments/icsimporter.c:
* plugins/itip-formatter/itip-view.c:
* mail/em-folder-browser.c:
* mail/em-format-html-display.c:
* mail/mail-send-recv.c:
* mail/message-tag-followup.c:
Prefer gtk_image_new_from_icon_name() over e_icon_factory_get_image().
* calendar/gui/alarm-notify/alarm-queue.c:
* plugins/mail-notification/mail-notification.c:
Prefer gtk_status_icon_set_from_icon_name() over
gtk_status_icon_set_from_pixbuf().
* addressbook/gui/component/addressbook-view.c:
* calendar/gui/e-calendar-table.c:
* calendar/gui/e-calendar-view.c:
* calendar/gui/e-memo-table.c:
* mail/mail-mt.c:
e_activity_handler_operation_started() no longer takes a GdkPixbuf.
It was ignoring the pixbuf anyway ever since we added a spinner icon.
svn path=/trunk/; revision=35958
Diffstat (limited to 'addressbook/gui/contact-editor')
4 files changed, 8 insertions, 27 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c index 7b2a54424b..1a1e6e18ed 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-address.c +++ b/addressbook/gui/contact-editor/e-contact-editor-address.c @@ -22,7 +22,6 @@ #include <config.h> #include <e-contact-editor-address.h> -#include <e-util/e-icon-factory.h> #include <e-util/e-util-private.h> #include <glib/gi18n.h> @@ -417,7 +416,6 @@ e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address) { GladeXML *gui; GtkWidget *widget; - GList *icon_list; char *gladefile; gtk_dialog_add_buttons (GTK_DIALOG (e_contact_editor_address), @@ -450,12 +448,8 @@ e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address) gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0); g_object_unref(widget); - icon_list = e_icon_factory_get_icon_list ("contact-new"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_address), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); - g_list_free (icon_list); - } + gtk_window_set_icon_name ( + GTK_WINDOW (e_contact_editor_address), "contact-new"); } static void diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c index 0943e2111f..af0db54e7e 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c @@ -21,7 +21,6 @@ #include <config.h> #include "e-contact-editor-fullname.h" -#include <e-util/e-icon-factory.h> #include <e-util/e-util-private.h> #include <libgnome/gnome-util.h> #include <glib/gi18n.h> @@ -100,7 +99,6 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam { GladeXML *gui; GtkWidget *widget; - GList *icon_list; char *gladefile; gtk_widget_realize (GTK_WIDGET (e_contact_editor_fullname)); @@ -136,12 +134,8 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0); g_object_unref(widget); - icon_list = e_icon_factory_get_icon_list ("contact-new"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_fullname), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); - g_list_free (icon_list); - } + gtk_window_set_icon_name ( + GTK_WINDOW (e_contact_editor_fullname), "contact-new"); } static void diff --git a/addressbook/gui/contact-editor/e-contact-editor-im.c b/addressbook/gui/contact-editor/e-contact-editor-im.c index d438444147..8b421c0b3b 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-im.c +++ b/addressbook/gui/contact-editor/e-contact-editor-im.c @@ -24,7 +24,6 @@ #include <libgnome/gnome-util.h> #include <glib/gi18n.h> #include <string.h> -#include <e-util/e-icon-factory.h> #include <e-util/e-util-private.h> static void e_contact_editor_im_init (EContactEditorIm *card); @@ -189,7 +188,8 @@ setup_service_optmenu(EContactEditorIm *editor) gtk_container_add(GTK_CONTAINER(item), hbox); gtk_widget_show(hbox); - image = e_icon_factory_get_image (im_images[i], E_ICON_SIZE_MENU); + image = gtk_image_new_from_icon_name ( + im_images[i], GTK_ICON_SIZE_MENU); gtk_size_group_add_widget(sg, image); @@ -240,7 +240,6 @@ e_contact_editor_im_init (EContactEditorIm *e_contact_editor_im) { GladeXML *gui; GtkWidget *widget; - GList *icon_list; char *gladefile; gtk_dialog_add_buttons (GTK_DIALOG (e_contact_editor_im), @@ -279,13 +278,8 @@ e_contact_editor_im_init (EContactEditorIm *e_contact_editor_im) gtk_widget_grab_focus(glade_xml_get_widget(gui, "entry-username")); - /* set the icon */ - icon_list = e_icon_factory_get_icon_list ("contact-new"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_im), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); - g_list_free (icon_list); - } + gtk_window_set_icon_name ( + GTK_WINDOW (e_contact_editor_im), "contact-new"); } static void diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index c0616d9916..ebdc6bf22f 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -3314,7 +3314,6 @@ e_contact_editor_init (EContactEditor *e_contact_editor) { GladeXML *gui; GtkWidget *widget, *label; - char *icon_path; char *gladefile; e_contact_editor->name = e_contact_name_new(); |