[evolution-groupwise] Fix auth types in groupwise imap provider

[Chenthill Palanisamy <pchen src gnome org>]

commit 8fdcc8414605472c6201ed4982602ccb398b29eb
Author: Chenthill Palanisamy <pchenthill novell com>
Date:   Mon May 14 13:04:07 2012 +0530

    Fix auth types in groupwise imap provider

 src/camel/camel-groupwise-store.c              |   10 +++++++++-
 src/camel/groupwise/camel-groupwise-provider.c |   10 +---------
 src/camel/imapx/Makefile.am                    |   12 ++++++++++--
 src/camel/imapx/camel-gwimap-provider.c        |   12 ++----------
 4 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/src/camel/camel-groupwise-store.c b/src/camel/camel-groupwise-store.c
index 2b597bb..2abc39f 100644
--- a/src/camel/camel-groupwise-store.c
+++ b/src/camel/camel-groupwise-store.c
@@ -63,8 +63,16 @@ struct _CamelGroupwiseStorePrivate {
 	GHashTable *parent_hash;
 	EGwConnection *cnc;
 };
+CamelServiceAuthType camel_groupwise_password_authtype = {
+	N_("Password"),
+
+	N_("This option will connect to the GroupWise server using a "
+	   "plaintext password."),
+
+	"",
+	TRUE
+};
 
-extern CamelServiceAuthType camel_groupwise_password_authtype; /*for the query_auth_types function */
 
 static GInitableIface *parent_initable_interface;
 
diff --git a/src/camel/groupwise/camel-groupwise-provider.c b/src/camel/groupwise/camel-groupwise-provider.c
index b61c8bb..732aa87 100644
--- a/src/camel/groupwise/camel-groupwise-provider.c
+++ b/src/camel/groupwise/camel-groupwise-provider.c
@@ -101,15 +101,7 @@ static CamelProvider groupwise_provider = {
 	/* ... */
 };
 
-CamelServiceAuthType camel_groupwise_password_authtype = {
-	N_("Password"),
-
-	N_("This option will connect to the GroupWise server using a "
-	   "plaintext password."),
-
-	"",
-	TRUE
-};
+extern CamelServiceAuthType camel_groupwise_password_authtype; /*for the query_auth_types function */
 
 static gint
 groupwise_auto_detect_cb (CamelURL *url,
diff --git a/src/camel/imapx/Makefile.am b/src/camel/imapx/Makefile.am
index 9539ad7..c7f47da 100644
--- a/src/camel/imapx/Makefile.am
+++ b/src/camel/imapx/Makefile.am
@@ -21,8 +21,16 @@ noinst_HEADERS =			\
 
 libcamelgwimap_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
-libcamelgwimap_la_LIBADD =				\
-	$(CAMEL_LIBS)
+libcamelgwimap_la_LIBADD =					\
+	$(top_builddir)/src/server/libegroupwise-1.2.la		\
+	$(top_builddir)/src/camel/libcamelgroupwise.la		\
+	$(CAMEL_LIBS)						\
+	$(EVOLUTION_PLUGIN_LIBS)				\
+        $(LIBEDATASERVER_LIBS)					\
+        $(LIBEBACKEND_LIBS)					\
+        $(LIBECAL_LIBS)						\
+	$(SOUP_LIBS)						\
+	$(EVOLUTION_DATA_SERVER_LIBS)
 
 EXTRA_DIST = libcamelgwimap.urls
 
diff --git a/src/camel/imapx/camel-gwimap-provider.c b/src/camel/imapx/camel-gwimap-provider.c
index a3f110c..a6f1485 100644
--- a/src/camel/imapx/camel-gwimap-provider.c
+++ b/src/camel/imapx/camel-gwimap-provider.c
@@ -128,15 +128,7 @@ static CamelProvider gwimap_provider = {
 
 void camel_gwimap_module_init (void);
 
-CamelServiceAuthType camel_gwimap_password_authtype = {
-	N_("Password"),
-
-	N_("This option will connect to the IMAP server using a "
-	   "plaintext password."),
-
-	"",
-	TRUE
-};
+extern CamelServiceAuthType camel_imapx_password_authtype;
 
 void
 camel_gwimap_module_init (void)
@@ -145,7 +137,7 @@ camel_gwimap_module_init (void)
 	gwimap_provider.url_hash = gwimap_url_hash;
 	gwimap_provider.url_equal = gwimap_url_equal;
 	gwimap_provider.authtypes = camel_sasl_authtype_list (FALSE);
-	gwimap_provider.authtypes = g_list_prepend (gwimap_provider.authtypes, &camel_gwimap_password_authtype);
+	gwimap_provider.authtypes = g_list_prepend (gwimap_provider.authtypes, &camel_imapx_password_authtype);
 	gwimap_provider.translation_domain = GETTEXT_PACKAGE;
 
 	/* TEMPORARY */