From 268185761bcdee059f5d3b52937ee3c5667b79e5 Mon Sep 17 00:00:00 2001
From: Chris Toshok <toshok@ximian.com>
Date: Sat, 6 Dec 2003 23:19:01 +0000
Subject: 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
---
 .../GNOME_Evolution_Addressbook.server.in.in       | 51 ++++++++++------------
 1 file changed, 23 insertions(+), 28 deletions(-)

(limited to 'addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in')

diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
index df47e0cffe..fb55b0df58 100644
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
+++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
@@ -93,34 +93,6 @@
 
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_LDAPStorage_ConfigControl:@VERSION@"
-            type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ConfigControl:@VERSION@"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution2:config_item:title" type="string"
-		       _value="Directory Servers"/>
-
-	<oaf_attribute name="evolution2:config_item:description" type="string"
-		       _value="Configure access to LDAP directory servers here"/>
-
-	<oaf_attribute name="evolution2:config_item:icon_name" type="string"
-		       value="ldap-settings.png"/>
-
-	<oaf_attribute name="evolution2:config_item:type" type="stringv">
-		<item value="contacts/ldap"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution2:config_item:priority" type="string" value="-6"/>
-    
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution Addressbook LDAP Configuration Control"/>
-
-</oaf_server>
-
 <oaf_server iid="OAFIID:GNOME_Evolution_SMime_CertificateManager_ConfigControl:@VERSION@"
             type="factory"
             location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
@@ -145,4 +117,27 @@
                                                                                           
 </oaf_server>
 
+<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Autocompletion_ConfigControl:@VERSION@"
+	    type="factory"
+	    location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/Evolution/ConfigControl:@VERSION@"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="evolution2:config_item:title" type="string"
+		_value="Autocompletion"/>
+
+	<oaf_attribute name="evolution2:config_item:description" type="string"
+		_value="Configure autocomple here"/>
+
+	<oaf_attribute name="evolution2:config_item:icon_name" type="string"
+		value="folder-settings.png"/>
+
+	<oaf_attribute name="evolution2:config_item:priority" type="string" value="-9"/>
+
+	<oaf_attribute name="name" type="string"
+		_value="Evolution folder settings configuration control"/>
+</oaf_server>
+
 </oaf_info>
-- 
cgit v1.2.3