1 files changed, 19 insertions, 178 deletions

diff --git a/modules/addressbook/autocompletion-config.c b/modules/addressbook/autocompletion-config.c
index f8199eef84..d57e8f50ea 100644
--- a/modules/addressbook/autocompletion-config.c
+++ b/modules/addressbook/autocompletion-config.c
@@ -22,78 +22,17 @@
  *
  */
 
-#include <config.h>
-
 #include "autocompletion-config.h"
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libedataserver/e-source-list.h>
+#include <libedataserver/e-source-address-book.h>
+#include <libedataserver/e-source-autocomplete.h>
 #include <libedataserverui/e-source-selector.h>
 #include <libedataserverui/e-name-selector-entry.h>
 
-#include "e-util/e-config.h"
 #include "e-util/e-datetime-format.h"
-#include "addressbook/gui/widgets/eab-config.h"
-
-static void
-source_selection_changed_cb (ESourceSelector *source_selector)
-{
-	ESourceList *source_list;
-	GSList *selection;
-	GSList *l;
-	GSList *groups;
-
-	source_list = e_source_selector_get_source_list (source_selector);
-
-	/* first we clear all the completion flags from all sources */
-	for (groups = e_source_list_peek_groups (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);
-
-			e_source_set_property (source, "completion", NULL);
-		}
-	}
-
-	/* then we loop over the selector's selection, setting the
-	 * property on those sources */
-	selection = e_source_selector_get_selection (source_selector);
-	for (l = selection; l; l = l->next) {
-		ESource *source = E_SOURCE (l->data);
-
-		e_source_set_property (source, "completion", "true");
-	}
-	e_source_selector_free_selection (selection);
-
-	/* XXX we should pop up a dialog if this fails */
-	e_source_list_sync (source_list, NULL);
-}
-
-static void
-initialize_selection (ESourceSelector *source_selector)
-{
-	ESourceList *source_list;
-	GSList *groups;
-
-	source_list = e_source_selector_get_source_list (source_selector);
-
-	for (groups = e_source_list_peek_groups (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 gchar *completion;
-
-			completion = e_source_get_property (source, "completion");
-			if (completion && !g_ascii_strcasecmp (completion, "true"))
-				e_source_selector_select_source (source_selector, source);
-		}
-	}
-}
+#include "misc/e-autocomplete-selector.h"
 
 static GtkWidget *
 add_section (GtkWidget *container,
@@ -131,56 +70,25 @@ add_section (GtkWidget *container,
 	return widget;
 }
 
-static GtkWidget *
-acc_get_toplevel_notebook (EConfig *ec,
-                           EConfigItem *item,
-                           GtkWidget *parent,
-                           GtkWidget *old,
-                           gint position,
-                           gpointer data)
-{
-	if (old)
-		return old;
-
-	old = gtk_notebook_new ();
-	gtk_widget_show (old);
-
-	return old;
-}
-
-static GtkWidget *
-acc_get_general_page (EConfig *ec,
-                      EConfigItem *item,
-                      GtkWidget *parent,
-                      GtkWidget *old,
-                      gint position,
-                      gpointer data)
+GtkWidget *
+autocompletion_config_new (EPreferencesWindow *window)
 {
 	EShellSettings *shell_settings;
-	ESourceList *source_list;
-	GtkWidget *scrolled_window;
-	GtkWidget *source_selector;
+	ESourceRegistry *registry;
+	GtkWidget *container;
 	GtkWidget *itembox;
 	GtkWidget *widget;
 	GtkWidget *vbox;
 	EShell *shell;
 
-	if (old)
-		return old;
-
-	g_return_val_if_fail (GTK_IS_NOTEBOOK (parent), NULL);
-
-	shell = data;
+	shell = e_preferences_window_get_shell (window);
 
 	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
 
+	registry = e_shell_get_registry (shell);
 	shell_settings = e_shell_get_shell_settings (shell);
 
-	source_list = e_source_list_new_for_gconf_default (
-		"/apps/evolution/addressbook/sources");
-
-	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
+	vbox = gtk_vbox_new (FALSE, 12);
 	gtk_widget_show (vbox);
 
 	itembox = add_section (vbox, _("Date/Time Format"), FALSE);
@@ -216,87 +124,20 @@ acc_get_general_page (EConfig *ec,
 	gtk_box_pack_start (GTK_BOX (itembox), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
 
-	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+	widget = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (
-		GTK_SCROLLED_WINDOW (scrolled_window),
+		GTK_SCROLLED_WINDOW (widget),
 		GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (
-		GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
-	gtk_widget_show (scrolled_window);
-
-	source_selector = e_source_selector_new (source_list);
-	initialize_selection (E_SOURCE_SELECTOR (source_selector));
-	g_signal_connect (
-		source_selector, "selection_changed",
-		G_CALLBACK (source_selection_changed_cb), NULL);
-	gtk_container_add (GTK_CONTAINER (scrolled_window), source_selector);
-	gtk_widget_show (source_selector);
-
-	gtk_box_pack_start (GTK_BOX (itembox), scrolled_window, TRUE, TRUE, 0);
-	gtk_widget_show_all (vbox);
-
-	gtk_notebook_append_page (GTK_NOTEBOOK (parent), vbox, gtk_label_new (_("General")));
-
-	return vbox;
-}
-
-/* plugin meta-data */
-static EConfigItem acc_items[] = {
-	{ E_CONFIG_BOOK, (gchar *) "", (gchar *) "acc_toplevel_notebook", acc_get_toplevel_notebook },
-	{ E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) "acc_general", acc_get_general_page }
-};
-
-static void
-acc_free (EConfig *ec,
-          GSList *items,
-          gpointer data)
-{
-	g_slist_free (items);
-}
-
-GtkWidget *
-autocompletion_config_new (EPreferencesWindow *window)
-{
-	GtkWidget *toplevel;
-	GtkWidget *vbox;
-	GSList *l;
-	gint ii;
-	EShell *shell;
-	EABConfig *eab;
-	EABConfigTargetPrefs *target;
-	GSettings *settings;
-
-	shell = e_preferences_window_get_shell (window);
-
-	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
-
-	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
-	gtk_widget_show (vbox);
-
-	/** @HookPoint-EABConfig: Contacts Preferences Page
-	 * @Id: org.gnome.evolution.addressbook.prefs
-	 * @Type: E_CONFIG_BOOK
-	 * @Class: org.gnome.evolution.addressbook.config:1.0
-	 * @Target: EABConfigTargetPrefs
-	 *
-	 * The main contacts preferences page.
-	 */
-	eab = eab_config_new (E_CONFIG_BOOK, "org.gnome.evolution.addressbook.prefs");
-
-	l = NULL;
-	for (ii = 0; ii < G_N_ELEMENTS (acc_items); ii++)
-		l = g_slist_prepend (l, &acc_items[ii]);
-	e_config_add_items ((EConfig *) eab, l, acc_free, shell);
-
-	settings = g_settings_new ("org.gnome.evolution.addressbook");
+		GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN);
+	gtk_box_pack_start (GTK_BOX (itembox), widget, TRUE, TRUE, 0);
+	gtk_widget_show (widget);
 
-	target = eab_config_target_new_prefs (eab, settings);
-	e_config_set_target ((EConfig *) eab, (EConfigTarget *) target);
-	toplevel = e_config_create_widget ((EConfig *) eab);
-	gtk_box_pack_start (GTK_BOX (vbox), toplevel, TRUE, TRUE, 0);
+	container = widget;
 
-	g_object_unref (settings);
+	widget = e_autocomplete_selector_new (registry);
+	gtk_container_add (GTK_CONTAINER (container), widget);
+	gtk_widget_show (widget);
 
 	return vbox;
 }