From 7ade227e6409c98a4010992450e111cf7bb10520 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 14 Aug 2008 20:19:12 +0000 Subject: Merge revisions 35951:35992 from trunk. svn path=/branches/kill-bonobo/; revision=35994 --- addressbook/gui/contact-editor/e-contact-editor-address.c | 10 ++-------- .../gui/contact-editor/e-contact-editor-fullname.c | 10 ++-------- addressbook/gui/contact-editor/e-contact-editor-im.c | 14 ++++---------- addressbook/gui/contact-editor/e-contact-editor.c | 15 +++------------ 4 files changed, 11 insertions(+), 38 deletions(-) (limited to 'addressbook/gui/contact-editor') 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 #include -#include #include #include @@ -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 #include "e-contact-editor-fullname.h" -#include #include #include #include @@ -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 #include #include -#include #include 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..a226cfe132 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -28,10 +28,7 @@ #include #include #include -#include -#include #include -#include #include #include @@ -45,6 +42,7 @@ #include "addressbook/gui/component/addressbook.h" #include "addressbook/printing/e-contact-print.h" #include "addressbook/gui/widgets/eab-gui-util.h" +#include "e-util/e-util.h" #include "e-util/e-gui-utils.h" #include "e-util/e-error.h" #include "misc/e-dateedit.h" @@ -3210,14 +3208,8 @@ app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data) static void show_help_cb (GtkWidget *widget, gpointer data) { - GError *error = NULL; - - gnome_help_display ( - "evolution.xml", "usage-contact-cards", &error); - if (error != NULL) { - g_warning ("%s", error->message); - g_error_free (error); - } + /* FIXME Pass a proper parent window. */ + e_display_help (NULL, "usage-contact-cards"); } static GList * @@ -3314,7 +3306,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(); -- cgit v1.2.3