[evolution-data-server] ENameSelectorEntry: Remove USER_QUERY_FIELDS macro.

[Matthew Barnes <mbarnes src gnome org>]

commit 02452e2fe5a085186ab2d6f5494199c3db55cd62
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Apr 12 09:41:47 2012 -0400

    ENameSelectorEntry: Remove USER_QUERY_FIELDS macro.
    
    No schema was ever defined for this GConf key so it couldn't have been
    that important.  The symbol name itself is not namespaced properly (no
    "E" prefix).  And it's inappropriate to use Evolution-specific keys in
    E-D-S to begin with.
    
    This is an API break.  There will be more along these lines.

 configure.ac                                       |    2 +-
 .../libedataserverui/libedataserverui-sections.txt |    1 -
 libedataserverui/e-name-selector-dialog.c          |    3 ---
 libedataserverui/e-name-selector-entry.c           |    2 --
 libedataserverui/e-name-selector-entry.h           |    7 -------
 5 files changed, 1 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9db9836..98872e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,7 +83,7 @@ LIBEDATASERVER_CURRENT=16
 LIBEDATASERVER_REVISION=0
 LIBEDATASERVER_AGE=0
 
-LIBEDATASERVERUI_CURRENT=1
+LIBEDATASERVERUI_CURRENT=2
 LIBEDATASERVERUI_REVISION=0
 LIBEDATASERVERUI_AGE=0
 
diff --git a/docs/reference/libedataserverui/libedataserverui-sections.txt b/docs/reference/libedataserverui/libedataserverui-sections.txt
index af8675c..254456d 100644
--- a/docs/reference/libedataserverui/libedataserverui-sections.txt
+++ b/docs/reference/libedataserverui/libedataserverui-sections.txt
@@ -253,7 +253,6 @@ e_name_selector_dialog_get_type
 <TITLE>ENameSelectorEntry</TITLE>
 MINIMUM_QUERY_LENGTH
 FORCE_SHOW_ADDRESS
-USER_QUERY_FIELDS
 ENameSelectorEntry
 e_name_selector_entry_new
 e_name_selector_entry_peek_contact_store
diff --git a/libedataserverui/e-name-selector-dialog.c b/libedataserverui/e-name-selector-dialog.c
index 1555de1..3085f44 100644
--- a/libedataserverui/e-name-selector-dialog.c
+++ b/libedataserverui/e-name-selector-dialog.c
@@ -391,9 +391,6 @@ e_name_selector_dialog_init (ENameSelectorDialog *name_selector_dialog)
 	gconf_client = gconf_client_get_default ();
 	uid = gconf_client_get_string (gconf_client, "/apps/evolution/addressbook/display/primary_addressbook",
 			NULL);
-	/* read user_query_fields here, because we are using it in call of setup_name_selector_model */
-	name_selector_dialog->priv->user_query_fields = gconf_client_get_list (
-		gconf_client, USER_QUERY_FIELDS, GCONF_VALUE_STRING, NULL);
 	g_object_unref (gconf_client);
 
 	setup_name_selector_model (name_selector_dialog);
diff --git a/libedataserverui/e-name-selector-entry.c b/libedataserverui/e-name-selector-entry.c
index 66a1281..7826d8f 100644
--- a/libedataserverui/e-name-selector-entry.c
+++ b/libedataserverui/e-name-selector-entry.c
@@ -3024,8 +3024,6 @@ e_name_selector_entry_init (ENameSelectorEntry *name_selector_entry)
 		else COMPLETION_CUE_MIN_LEN = 3;
 	}
 	COMPLETION_FORCE_SHOW_ADDRESS = gconf_client_get_bool (gconf, FORCE_SHOW_ADDRESS, NULL);
-	name_selector_entry->priv->user_query_fields = gconf_client_get_list (
-		gconf, USER_QUERY_FIELDS, GCONF_VALUE_STRING, NULL);
 	g_object_unref (G_OBJECT (gconf));
 
 	/* Edit signals */
diff --git a/libedataserverui/e-name-selector-entry.h b/libedataserverui/e-name-selector-entry.h
index 99a18ab..4a4e71d 100644
--- a/libedataserverui/e-name-selector-entry.h
+++ b/libedataserverui/e-name-selector-entry.h
@@ -58,13 +58,6 @@
  **/
 #define FORCE_SHOW_ADDRESS   "/apps/evolution/addressbook/completion/show_address"
 
-/**
- * USER_QUERY_FIELDS:
- *
- * Since: 2.24
- **/
-#define USER_QUERY_FIELDS "/apps/evolution/addressbook/completion/user_query_fields"
-
 G_BEGIN_DECLS
 
 typedef struct _ENameSelectorEntry ENameSelectorEntry;