From b37af8f269484ebd836996c140ea718885954ca3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 22 Oct 2007 18:49:30 +0000 Subject: ** Fixes part of bug #417999 2007-10-22 Matthew Barnes ** Fixes part of bug #417999 * addressbook/gui/contact-editor/contact-editor.glade: * addressbook/gui/contact-editor/e-contact-editor.c: * addressbook/gui/contact-editor/e-contact-quick-add.c: * addressbook/gui/contact-list-editor/contact-list-editor.c: * addressbook/gui/contact-list-editor/contact-list-editor.glade: * calendar/gui/dialogs/event-page.c: * calendar/gui/dialogs/event-page.glade: * calendar/gui/dialogs/memo-page.c: * calendar/gui/dialogs/memo-page.glade: * calendar/gui/dialogs/task-page.c: * calendar/gui/dialogs/task-page.glade: * calendar/gui/e-itip-control.c: * plugins/bbdb/bbdb.c: * plugins/bbdb/gaimbuddies.c: * plugins/itip-formatter/itip-view.c: * widgets/misc/e-pilot-settings.c: Use ESourceComboBox instead of ESourceOptionMenu (deprecated). svn path=/trunk/; revision=34408 --- addressbook/gui/contact-editor/e-contact-quick-add.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'addressbook/gui/contact-editor/e-contact-quick-add.c') diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index 15b0de4925..1fc68734f0 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include "e-contact-editor.h" @@ -269,8 +269,12 @@ clicked_cb (GtkWidget *w, gint button, gpointer closure) } static void -source_selected (GtkWidget *source_option_menu, ESource *source, QuickAdd *qa) +source_changed (ESourceComboBox *source_combo_box, QuickAdd *qa) { + ESource *source; + + source = e_source_combo_box_get_active (source_combo_box); + if (qa->book) { g_object_unref (qa->book); qa->book = NULL; @@ -319,16 +323,20 @@ build_quick_add_dialog (QuickAdd *qa) gconf_client = gconf_client_get_default (); source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources"); g_object_unref (gconf_client); - qa->option_menu = e_source_option_menu_new (source_list); + qa->option_menu = e_source_combo_box_new (source_list); book = e_book_new_default_addressbook (NULL); - e_source_option_menu_select (E_SOURCE_OPTION_MENU (qa->option_menu), e_book_get_source(book)); + e_source_combo_box_set_active ( + E_SOURCE_COMBO_BOX (qa->option_menu), + e_book_get_source (book)); if (qa->book) { g_object_unref (qa->book); qa->book = NULL; } qa->book = book ; - source_selected(qa->option_menu, e_source_option_menu_peek_selected ((ESourceOptionMenu *)qa->option_menu), qa); - g_signal_connect (qa->option_menu, "source_selected", G_CALLBACK (source_selected), qa); + source_changed (E_SOURCE_COMBO_BOX (qa->option_menu), qa); + g_signal_connect ( + qa->option_menu, "changed", + G_CALLBACK (source_changed), qa); g_object_unref (source_list); -- cgit v1.2.3