change prototype to fix warning, and change the comment to read

2003-12-06  Chris Toshok  <toshok@ximian.com>

	* gui/component/select-names/e-select-names-manager.c
	(open_book_cb): change prototype to fix warning, and change the
	comment to read load_source instead of load_uri (which isn't what
	we use anymore.)
	(update_completion_books): just use our source list for this.
	check the "completion" source property.
	(source_list_changed): recreate the completion books.
	(e_select_names_manager_init): connect to the source_list's
	changed signal.
	(e_select_names_manager_dispose): don't need to free the
	completion_uids list anymore.

	* gui/component/select-names/e-select-names-config.c
	(e_select_names_config_get_completion_books,
	e_select_names_config_set_completion_books,
	e_select_names_config_add_notification_completion_books): remove.

	* gui/component/select-names/e-select-names-config.h: remove the
	completion books calls, since we can just use the source list.

	* gui/component/component-factory.c (factory): create the
	autocompletion control.

	* gui/component/autocompletion-config.[ch]: new config control for
	selecting completion folders.  Uses e-source-selector.  Could
	probably be beautified a bit.

	* gui/component/Makefile.am (libevolution_addressbook_la_SOURCES):
	add autocompletion-config.[ch]

	* gui/component/GNOME_Evolution_Addressbook.server.in.in: remove
	the ldap config control server, and add the autocompletion one.

svn path=/trunk/; revision=23663

4 files changed, 20 insertions, 74 deletions

diff --git a/addressbook/gui/component/select-names/e-select-names-config.c b/addressbook/gui/component/select-names/e-select-names-config.c
index 1792a8a061..8335ed7c3b 100644
--- a/addressbook/gui/component/select-names/e-select-names-config.c
+++ b/addressbook/gui/component/select-names/e-select-names-config.c
@@ -59,35 +59,6 @@ e_select_names_config_remove_notification (guint id)
 	gconf_client_notify_remove (config, id);
 }
 
-/* The current list of completion books */
-GSList *
-e_select_names_config_get_completion_books (void)
-{
-	e_select_names_config_init ();
-	
-	return gconf_client_get_list (config, SELECT_NAMES_CONFIG_COMPLETION_BOOKS, GCONF_VALUE_STRING, NULL);
-}
-
-void
-e_select_names_config_set_completion_books (GSList *selected)
-{
-	e_select_names_config_init ();
-
-	gconf_client_set_list (config, SELECT_NAMES_CONFIG_COMPLETION_BOOKS, GCONF_VALUE_STRING, selected, NULL);
-}
-
-guint
-e_select_names_config_add_notification_completion_books (GConfClientNotifyFunc func, gpointer data)
-{
-	guint id;
-
-	e_select_names_config_init ();
-	
-	id = gconf_client_notify_add (config, SELECT_NAMES_CONFIG_COMPLETION_BOOKS, func, data, NULL, NULL);
-	
-	return id;
-}
-
 char *
 e_select_names_config_get_last_completion_book (void)
 {
diff --git a/addressbook/gui/component/select-names/e-select-names-config.h b/addressbook/gui/component/select-names/e-select-names-config.h
index 9247e43337..12d2c1314d 100644
--- a/addressbook/gui/component/select-names/e-select-names-config.h
+++ b/addressbook/gui/component/select-names/e-select-names-config.h
@@ -29,11 +29,6 @@
 
 void e_select_names_config_remove_notification (guint id);
 
-/* The current list of completion uris */
-GSList   *e_select_names_config_get_completion_books (void);
-void	  e_select_names_config_set_completion_books (GSList *selected);
-guint	  e_select_names_config_add_notification_completion_books (GConfClientNotifyFunc func, gpointer data);
-
 /* The last completion book */
 char 	  *e_select_names_config_get_last_completion_book	(void);
 void	  e_select_names_config_set_last_completion_book	(const char *last_completion_book);
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 41b355eea8..1b7cbbb38e 100644
--- a/addressbook/gui/component/select-names/e-select-names-manager.c
+++ b/addressbook/gui/component/select-names/e-select-names-manager.c
@@ -374,8 +374,10 @@ e_select_names_manager_discard_saved_models (ESelectNamesManager *manager)
 /* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
 
 static void
-open_book_cb (EBook *book, EBookStatus status, ESelectNamesManager *manager)
+open_book_cb (EBook *book, EBookStatus status, gpointer user_data)
 {
+	ESelectNamesManager *manager = E_SELECT_NAMES_MANAGER (user_data);
+
 	if (status == E_BOOK_ERROR_OK) {
 		GList *l;
 		for (l = manager->entries; l; l = l->next) {
@@ -387,40 +389,34 @@ open_book_cb (EBook *book, EBookStatus status, ESelectNamesManager *manager)
 		g_object_ref (book);
 	}
 
-	g_object_unref (manager); /* unref ourself (matches ref before the load_uri call below) */
+	g_object_unref (manager); /* unref ourself (matches ref before the load_source call below) */
 }
 
 static void
 update_completion_books (ESelectNamesManager *manager)
 {
-	GSList *completion_uids, *l;
-
-	/* Get the selection in gconf */
-	completion_uids  = e_select_names_config_get_completion_books ();
+	GSList *groups;
 
 	/* Add all the completion books */
-	for (l = completion_uids; l; l = l->next) {
-		char *uid = l->data;
-		ESource *source;
-		
-		source = e_source_list_peek_source_by_uid (manager->source_list, uid);
-		if (source) {
-			EBook *book;
-
-			book = e_book_new ();			
-
-			addressbook_load_source (book, source, (EBookCallback)open_book_cb, manager);			
+	for (groups = e_source_list_peek_groups (manager->source_list); groups; groups = groups->next) {
+		ESourceGroup *group = E_SOURCE_GROUP (groups->data);
+		GSList *sources;
+
+		for (sources = e_source_group_peek_sources (group); sources; sources = sources->next) {
+			ESource *source = E_SOURCE (sources->data);
+			const char *completion = e_source_get_property (source, "completion");
+			if (completion && !g_ascii_strcasecmp (completion, "true")) {
+				EBook *book = e_book_new ();
+				g_object_ref (manager);
+				addressbook_load_source (book, source, open_book_cb, manager);
+			}
 		}
-		
-		g_free (uid);
 	}
-	g_slist_free (completion_uids);
 }
 
 static void
-config_completion_books_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
+source_list_changed (ESourceList *source_list, ESelectNamesManager *manager)
 {
-	ESelectNamesManager *manager = data;
 	GList *l;
 	
 	for (l = manager->entries; l; l = l->next) {
@@ -428,9 +424,6 @@ config_completion_books_changed_cb (GConfClient *client, guint id, GConfEntry *e
 		e_select_names_completion_clear_books (E_SELECT_NAMES_COMPLETION (entry->comp));
 	}
 
-	g_slist_foreach (manager->completion_uids, (GFunc)g_free, NULL);
-	g_slist_free (manager->completion_uids);
-
 	g_list_foreach (manager->completion_books, (GFunc)g_object_unref, NULL);
 	g_list_free (manager->completion_books);
 	manager->completion_books = NULL;
@@ -625,17 +618,14 @@ e_select_names_manager_init (ESelectNamesManager *manager)
 	manager->entries  = NULL;
 
 	manager->source_list =  e_source_list_new_for_gconf_default ("/apps/evolution/addressbook/sources");
-	
-	manager->completion_uids  = e_select_names_config_get_completion_books ();
+	g_signal_connect (manager->source_list, "changed", G_CALLBACK (source_list_changed), manager);
+
 	manager->completion_books  = NULL;
 
 	manager->minimum_query_length = e_select_names_config_get_min_query_length ();
 
 	update_completion_books (manager);
 
-	not = e_select_names_config_add_notification_completion_books (config_completion_books_changed_cb, manager);
-	manager->notifications = g_list_append (manager->notifications, GUINT_TO_POINTER (not));
-
 	not = e_select_names_config_add_notification_min_query_length (config_min_query_length_changed_cb, manager);
 	manager->notifications = g_list_append (manager->notifications, GUINT_TO_POINTER (not));
 }
@@ -669,15 +659,6 @@ e_select_names_manager_dispose (GObject *object)
 		manager->source_list = NULL;
 	}
 	
-	if (manager->completion_uids) {
-		GSList *l;
-		
-		for (l = manager->completion_uids; l; l = l->next)
-			g_free (l->data);
-		g_slist_free (manager->completion_uids);
-		manager->completion_uids = NULL;
-	}
-
 	if (manager->completion_books) {
 		g_list_foreach (manager->completion_books, (GFunc) g_object_unref, NULL);
 		g_list_free (manager->completion_books);
diff --git a/addressbook/gui/component/select-names/e-select-names-manager.h b/addressbook/gui/component/select-names/e-select-names-manager.h
index 18bead5512..0830d299d5 100644
--- a/addressbook/gui/component/select-names/e-select-names-manager.h
+++ b/addressbook/gui/component/select-names/e-select-names-manager.h
@@ -33,7 +33,6 @@ struct _ESelectNamesManager {
 	ESelectNames *names;
 
 	ESourceList *source_list;	
-	GSList *completion_uids;
 	GList *completion_books;
 	
 	int minimum_query_length;