diff options
author | Chris Toshok <toshok@helixcode.com> | 2000-12-31 04:12:33 +0800 |
---|---|---|
committer | Chris Toshok <toshok@src.gnome.org> | 2000-12-31 04:12:33 +0800 |
commit | b941c6f04cef47d9d9038a5e8e41f60a3819ef84 (patch) | |
tree | 8d95612d96f9a1dbd3fa62c62fcb1bf9a3c21d99 /addressbook/gui/component/addressbook-storage.c | |
parent | c4dfc8669bf21acf8c06cc7f79d0864c8e3d4fab (diff) | |
download | gsoc2013-evolution-b941c6f04cef47d9d9038a5e8e41f60a3819ef84.tar.gz gsoc2013-evolution-b941c6f04cef47d9d9038a5e8e41f60a3819ef84.tar.zst gsoc2013-evolution-b941c6f04cef47d9d9038a5e8e41f60a3819ef84.zip |
copy the dialog's source, destroy the dialog after we're done, and make
2000-12-30 Chris Toshok <toshok@helixcode.com>
* 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
Diffstat (limited to 'addressbook/gui/component/addressbook-storage.c')
-rw-r--r-- | addressbook/gui/component/addressbook-storage.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |