aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2011-06-24 00:30:36 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:42:32 +0800
commit54e056e2ddd661e589ccbc31b3faa2999631175e (patch)
tree42c18758598ee6f6973800ddff890a3cc56424e3 /addressbook
parentaa1c135937b7c533ff8b599cf6009a4507afb51c (diff)
downloadgsoc2013-evolution-54e056e2ddd661e589ccbc31b3faa2999631175e.tar
gsoc2013-evolution-54e056e2ddd661e589ccbc31b3faa2999631175e.tar.gz
gsoc2013-evolution-54e056e2ddd661e589ccbc31b3faa2999631175e.tar.bz2
gsoc2013-evolution-54e056e2ddd661e589ccbc31b3faa2999631175e.tar.lz
gsoc2013-evolution-54e056e2ddd661e589ccbc31b3faa2999631175e.tar.xz
gsoc2013-evolution-54e056e2ddd661e589ccbc31b3faa2999631175e.tar.zst
gsoc2013-evolution-54e056e2ddd661e589ccbc31b3faa2999631175e.zip
Postpone ENameSelector loading as much as possible
Also fixes few memory leaks around ENameSelector and cancels loading of its address books when not needed any more.
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/gui/contact-list-editor/e-contact-list-editor.c10
1 files changed, 2 insertions, 8 deletions
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 a4f30ca573..a6a9ceca15 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -1133,7 +1133,6 @@ setup_custom_widgets (EContactListEditor *editor)
GtkWidget *combo_box;
ESourceList *source_list;
ENameSelectorEntry *name_selector_entry;
- ENameSelector *name_selector;
GtkWidget *old, *parent;
EContactListEditorPrivate *priv;
GError *error = NULL;
@@ -1162,14 +1161,8 @@ setup_custom_widgets (EContactListEditor *editor)
old = CONTACT_LIST_EDITOR_WIDGET (editor, "email-entry");
g_return_if_fail (old != NULL);
- name_selector = e_name_selector_new ();
-
- e_name_selector_model_add_section (
- e_name_selector_peek_model (name_selector),
- "Members", _("_Members"), NULL);
-
name_selector_entry = e_name_selector_peek_section_entry (
- name_selector, "Members");
+ priv->name_selector, "Members");
gtk_widget_set_name (
GTK_WIDGET (name_selector_entry),
@@ -1316,6 +1309,7 @@ contact_list_editor_dispose (GObject *object)
EContactListEditorPrivate *priv = editor->priv;
if (priv->name_selector) {
+ e_name_selector_cancel_loading (priv->name_selector);
g_object_unref (priv->name_selector);
priv->name_selector = NULL;
}