From 59c9ee2c94e877c37b155e1f3b863dfab0582753 Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Thu, 2 Mar 2006 16:09:31 +0000 Subject: [PATCH] fixes #303046 --- ChangeLog | 7 +++++++ libedataserverui/e-name-selector-dialog.c | 24 +++++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 804bddb..7d4de57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-03-02 Devashish Sharma + + Fixes #303046 + * libedataserverui/e-name-selector-dialog.c: + (e_name_selector_dialog_init): Select contacts from address book + screen doesn't use current contact source + 2006-02-27 Srinivasa Ragavan * configure.in, NEWS: Release updates. Bump version. diff --git a/libedataserverui/e-name-selector-dialog.c b/libedataserverui/e-name-selector-dialog.c index b9cbaba..b7ed3d7 100644 --- a/libedataserverui/e-name-selector-dialog.c +++ b/libedataserverui/e-name-selector-dialog.c @@ -222,6 +222,29 @@ e_name_selector_dialog_init (ENameSelectorDialog *name_selector_dialog) /* Create source menu */ widget = e_source_option_menu_new (name_selector_dialog->source_list); + + GConfClient *gconf_client; + char *uid; + + gconf_client = gconf_client_get_default(); + uid = gconf_client_get_string (gconf_client, "/apps/evolution/addressbook/display/primary_addressbook", + NULL); + g_object_unref (gconf_client); + if (uid) { + ESource *source = e_source_list_peek_source_by_uid(name_selector_dialog->source_list, uid); + if (source) { + e_source_option_menu_select ((ESourceOptionMenu *)widget, source); + source_selected (name_selector_dialog, source); + } + else { + source_selected (name_selector_dialog, find_first_source (name_selector_dialog->source_list)); + } + g_free (uid); + } + else { + source_selected (name_selector_dialog, find_first_source (name_selector_dialog->source_list)); + } + g_signal_connect_swapped (widget, "source_selected", G_CALLBACK (source_selected), name_selector_dialog); label = glade_xml_get_widget (name_selector_dialog->gui, "AddressBookLabel"); @@ -243,7 +266,6 @@ e_name_selector_dialog_init (ENameSelectorDialog *name_selector_dialog) /* TODO: Remember last used source */ - source_selected (name_selector_dialog, find_first_source (name_selector_dialog->source_list)); /* Set up dialog defaults */ -- 2.7.4