From 7aaf603811ea4853f71edfbc407ed074588e6d5f Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Wed, 25 Sep 2002 18:50:34 +0000 Subject: free adapter->priv. 2002-09-23 Chris Toshok * gui/widgets/e-addressbook-table-adapter.c (addressbook_destroy): free adapter->priv. * gui/widgets/e-addressbook-model.c (addressbook_destroy): free model->query. * gui/component/select-names/e-select-names-manager.c (load_completion_books): use e_book_expand_uri here, and free the expanded uri after calling addressbook_load_uri, plugging a leak. * gui/component/select-names/e-select-names.c (set_book): unref esn->model before we unref esn. fixes an edge case memory corruption bug. (clear_widget): utility function to set a widget's ref to NULL when it's destroyed. (e_select_names_init): hook the status_message, categories option menu, and select_entry to clear_widget. (addressbook_model_set_uri): use e_book_expand_uri. svn path=/trunk/; revision=18217 --- addressbook/gui/component/select-names/e-select-names-manager.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c index 5c24e482fa..9bc06b52d9 100644 --- a/addressbook/gui/component/select-names/e-select-names-manager.c +++ b/addressbook/gui/component/select-names/e-select-names-manager.c @@ -23,6 +23,7 @@ #include "e-select-names-completion.h" #include "e-select-names-popup.h" #include "e-folder-list.h" +#include #include #include #include @@ -396,11 +397,11 @@ load_completion_books (ESelectNamesManager *manager) EBook *book = e_book_new (); gtk_object_ref (GTK_OBJECT (manager)); /* ref ourself before our async call */ - if (!strncmp (f->physical_uri, "file:", 5)) - uri = g_strdup_printf ("%s/addressbook.db", f->physical_uri); - else - uri = g_strdup (f->physical_uri); + uri = e_book_expand_uri (f->physical_uri); + addressbook_load_uri (book, uri, (EBookCallback)open_book_cb, manager); + + g_free (uri); } e_folder_list_free_items (folders); } -- cgit v1.2.3