diff options
Diffstat (limited to 'addressbook/gui')
| -rw-r--r-- | addressbook/gui/component/select-names/e-select-names-manager.c | 9 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-model.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-table-adapter.c | 2 |
3 files changed, 9 insertions, 4 deletions
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 <addressbook/backend/ebook/e-book-util.h> #include <addressbook/backend/ebook/e-destination.h> #include <addressbook/gui/component/addressbook.h> #include <bonobo-conf/bonobo-config-database.h> @@ -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); } diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index 7f59c2313c..9244df8a38 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -125,6 +125,8 @@ addressbook_destroy(GtkObject *object) gtk_object_unref(GTK_OBJECT(model->book)); model->book = NULL; } + + g_free (model->query); } static void diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c index 08c03863aa..abcaf6e6b0 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c @@ -85,6 +85,8 @@ addressbook_destroy(GtkObject *object) EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(object); unlink_model(adapter); + + g_free (adapter->priv); } /* This function returns the number of columns in our ETableModel. */ |