From 1dcca79ec4ade696bb31dd9d3914a92ab3fd0cef Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 26 Sep 2002 20:43:40 +0000 Subject: Change folder type to "contacts/ldap". (addressbook_storage_add_source): * gui/component/addressbook-storage.c (load_source_data): Change folder type to "contacts/ldap". (addressbook_storage_add_source): Likewise. (create_ldap_folder): Check for type being "contacts" not ldap contacts, since the ldap-specific type doesn't appear in the menu. svn path=/trunk/; revision=18241 --- addressbook/ChangeLog | 9 +++++++++ addressbook/gui/component/addressbook-storage.c | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'addressbook') diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 25c93710d9..f3f7b1be63 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,12 @@ +2002-09-26 Dan Winship + + * gui/component/addressbook-storage.c (load_source_data): Change + folder type to "contacts/ldap". + (addressbook_storage_add_source): Likewise. + (create_ldap_folder): Check for type being "contacts" not + ldap contacts, since the ldap-specific type doesn't appear in the + menu. + 2002-09-25 Dan Winship * gui/component/addressbook-component.c (folder_types): Rename diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c index 95c132cbcf..dcff420a63 100644 --- a/addressbook/gui/component/addressbook-storage.c +++ b/addressbook/gui/component/addressbook-storage.c @@ -142,7 +142,7 @@ create_ldap_folder (EvolutionStorage *storage, const Bonobo_Listener listener, const CORBA_char *description, const CORBA_char *parent_physical_uri, gpointer data) { - if (strcmp (type, "ldap-contacts")) { + if (strcmp (type, "contacts")) { notify_listener (listener, GNOME_Evolution_Storage_UNSUPPORTED_TYPE); return; } @@ -459,7 +459,7 @@ load_source_data (const char *file_path) path = g_strdup_printf ("/%s", source->name); evolution_storage_new_folder (storage, path, source->name, - "ldap-contacts", source->uri, + "contacts/ldap", source->uri, source->description, NULL, 0, FALSE, 0); sources = g_list_append (sources, source); @@ -578,7 +578,7 @@ addressbook_storage_add_source (AddressbookSource *source) /* And then to the ui */ addressbook_get_other_contact_storage(); path = g_strdup_printf ("/%s", source->name); - evolution_storage_new_folder (storage, path, source->name, "ldap-contacts", + evolution_storage_new_folder (storage, path, source->name, "contacts/ldap", source->uri, source->description, NULL, 0, FALSE, 0); g_free (path); -- cgit v1.2.3