[evolution/account-mgmt: 10/50] Adapt EContactListEditor to the new ESource API.



commit d32fa3e50e7051356716dd63671da6168df2b3b1
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Dec 8 00:16:45 2010 -0500

    Adapt EContactListEditor to the new ESource API.

 .../gui/contact-list-editor/contact-list-editor.ui |    1 +
 .../contact-list-editor/e-contact-list-editor.c    |   14 --------------
 2 files changed, 1 insertions(+), 14 deletions(-)
---
diff --git a/addressbook/gui/contact-list-editor/contact-list-editor.ui b/addressbook/gui/contact-list-editor/contact-list-editor.ui
index 6cef3e2..2abb7e2 100644
--- a/addressbook/gui/contact-list-editor/contact-list-editor.ui
+++ b/addressbook/gui/contact-list-editor/contact-list-editor.ui
@@ -83,6 +83,7 @@
                 </child>
                 <child>
                   <object class="ESourceComboBox" type-func="e_source_combo_box_get_type" id="source-combo-box">
+                    <property name="extension-name">Address Book</property>
                     <property name="visible">True</property>
                   </object>
                   <packing>
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 1750f5a..2ec0b1c 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -1145,11 +1145,9 @@ static void
 setup_custom_widgets (EContactListEditor *editor)
 {
 	GtkWidget *combo_box;
-	ESourceList *source_list;
 	ENameSelectorEntry *name_selector_entry;
 	GtkWidget *old, *parent;
 	EContactListEditorPrivate *priv;
-	GError *error = NULL;
 	guint ba = 0, la = 0, ra = 0, ta = 0, xo = 0, xp = 0, yo = 0, yp = 0;
 
 	g_return_if_fail (editor != NULL);
@@ -1157,18 +1155,6 @@ setup_custom_widgets (EContactListEditor *editor)
 	priv = editor->priv;
 
 	combo_box = WIDGET (SOURCE_MENU);
-	if (!e_book_client_get_sources (&source_list, &error))
-		source_list = NULL;
-	g_object_set (combo_box, "source-list", source_list, NULL);
-	if (source_list)
-		g_object_unref (source_list);
-
-	if (error) {
-		g_warning (
-			"%s: Failed to get sources: %s",
-			G_STRFUNC, error->message);
-		g_error_free (error);
-	}
 
 	g_signal_connect (
 		combo_box, "changed", G_CALLBACK (



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]