From b941c6f04cef47d9d9038a5e8e41f60a3819ef84 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Sat, 30 Dec 2000 20:12:33 +0000 Subject: copy the dialog's source, destroy the dialog after we're done, and make 2000-12-30 Chris Toshok * gui/component/addressbook-config.c (edit_source_clicked): copy the dialog's source, destroy the dialog after we're done, and make sure to update both columns in the clist. (add_source_clicked): copy the dialog's source, and destroy the dialog when we're done. (addressbook_source_dialog_destroy): free up all the dialog's memory. * gui/component/addressbook.c (set_prop): allow file: uri's that point to files, not just dirs that contain addressbook.db. The rule is the addressbook file has to end in .db. * gui/component/addressbook-storage.c (file_source_foreach): contactserver => contactfile. cut and paste error. (addressbook_storage_init_source_uri): use file://%s to build the uri. * gui/component/e-ldap-server-dialog.[ch]: forgot to remove these in my last commit. svn path=/trunk/; revision=7199 --- addressbook/gui/component/addressbook-storage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addressbook/gui/component/addressbook-storage.c') diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c index af4613b9a2..e1b02ec93a 100644 --- a/addressbook/gui/component/addressbook-storage.c +++ b/addressbook/gui/component/addressbook-storage.c @@ -202,7 +202,7 @@ addressbook_storage_init_source_uri (AddressbookSource *source) source->ldap.host, source->ldap.port, source->ldap.rootdn, ldap_unparse_scope(source->ldap.scope)); else - source->uri = g_strdup_printf ("file:%s", + source->uri = g_strdup_printf ("file://%s", source->file.path); } @@ -330,7 +330,7 @@ static void file_source_foreach (AddressbookSource *source, xmlNode *root) { xmlNode *source_root = xmlNewNode (NULL, - (xmlChar *) "contactserver"); + (xmlChar *) "contactfile"); xmlAddChild (root, source_root); -- cgit v1.2.3