[evolution-groupwise] Fix couple of issues with new gwimap provider

[Chenthill Palanisamy <pchen src gnome org>]

commit 2a0cb20d3354eb50aa7f99cfbe03f19f7389a93e
Author: Chenthill Palanisamy <pchenthill novell com>
Date:   Tue May 8 15:13:29 2012 +0530

    Fix couple of issues with new gwimap provider

 src/camel/imapx/camel-gwimap-settings.c |    6 ++----
 src/camel/imapx/camel-gwimap-settings.h |    1 -
 src/plugins/Makefile.am                 |    1 +
 3 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/src/camel/imapx/camel-gwimap-settings.c b/src/camel/imapx/camel-gwimap-settings.c
index d981317..5e4055b 100644
--- a/src/camel/imapx/camel-gwimap-settings.c
+++ b/src/camel/imapx/camel-gwimap-settings.c
@@ -31,12 +31,10 @@ enum {
 	PROP_SOAP_PORT
 };
 
-G_DEFINE_TYPE_WITH_CODE (
+G_DEFINE_TYPE (
 	CamelGwImapSettings,
 	camel_gwimap_settings,
-	CAMEL_TYPE_OFFLINE_SETTINGS,
-	G_IMPLEMENT_INTERFACE (
-		CAMEL_TYPE_NETWORK_SETTINGS, NULL))
+	CAMEL_TYPE_IMAPX_SETTINGS)
 
 static void
 gwimap_settings_set_property (GObject *object,
diff --git a/src/camel/imapx/camel-gwimap-settings.h b/src/camel/imapx/camel-gwimap-settings.h
index 0906603..57dcbdc 100644
--- a/src/camel/imapx/camel-gwimap-settings.h
+++ b/src/camel/imapx/camel-gwimap-settings.h
@@ -59,7 +59,6 @@ GType		camel_gwimap_settings_get_type
 					(void) G_GNUC_CONST;
 
 					
-					
 const gchar *	camel_gwimap_settings_get_soap_port
 					(CamelGwImapSettings *settings);
 void		camel_gwimap_settings_set_soap_port
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index b612869..efae700 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -75,6 +75,7 @@ liborg_gnome_groupwise_features_la_SOURCES = 	\
 liborg_gnome_groupwise_features_la_LIBADD=			\
 	$(top_builddir)/src/server/libegroupwise-1.2.la   	\
 	$(top_builddir)/src/camel/libcamelgroupwise.la		\
+	$(top_builddir)/src/camel/imapx/libcamelgwimap.la	\
 	$(EVOLUTION_SHELL_LIBS)					\
 	$(EVOLUTION_PLUGIN_LIBS)				\
 	$(LIBECAL_LIBS)						\