[evolution-kolab] EPlugin: get the plugin back into build process

[Christian Hilberg <chilberg src gnome org>]

commit 1c11ab3b1b2918cac3f25493369c48b1b455ca7f
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Jul 16 18:41:21 2012 +0200

    EPlugin: get the plugin back into build process
    
    * removed the account creation/editing from the EPlugin,
      since this infrastructure is no longer being used for
      account management
    * do not link to libekolabbackend (only headers are used
      from this lib), since both, libekolab and libekolabbackend
      are static libs now and the latter already links to the
      former
    * this leaves the EPlugin with the Kolab folder context
      menus and the XFB tooltip (which can be rewritten to
      EExtension later)

 configure.ac                          |    3 +
 po/POTFILES.in                        |    1 -
 src/Makefile.am                       |    1 +
 src/eplugin/Makefile.am               |    5 +-
 src/eplugin/e-kolab-account-setup.c   |  652 ---------------------------------
 src/eplugin/e-kolab-account-setup.h   |   59 ---
 src/eplugin/e-kolab-plugin.c          |    1 -
 src/eplugin/org-gnome-kolab.eplug.xml |   25 --
 src/libekolab/Makefile.am             |    2 +-
 9 files changed, 6 insertions(+), 743 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ba3f6d2..1dfe1f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -178,6 +178,8 @@ AC_SUBST_FILE(EVO_PLUGIN_RULE)
 dnl *******************
 dnl Special directories
 dnl *******************
+plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-3.0`
+AC_SUBST(plugindir)
 
 eds_moduledir=`$PKG_CONFIG --variable=moduledir libebackend-1.2`
 AC_SUBST(eds_moduledir)
@@ -255,6 +257,7 @@ src/calendar/Makefile
 src/camel/Makefile
 src/collection/Makefile
 src/configuration/Makefile
+src/eplugin/Makefile
 src/libekolab/Makefile
 src/libekolabconv/Makefile
 src/libekolabconv/main/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a4f2e35..5a16245 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,6 @@
 # List of source files containing translatable strings.
 src/camel/camel-kolab-imapx-provider.c
 src/configuration/e-mail-config-kolab-backend.c
-src/eplugin/e-kolab-account-setup.c
 src/eplugin/e-kolab-backend-sync-conflict.c
 src/eplugin/e-kolab-folder-metadata.c
 src/eplugin/e-kolab-folder-permissions.c
diff --git a/src/Makefile.am b/src/Makefile.am
index ffcadf0..41f3ce3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,7 @@ SUBDIRS =		\
 	calendar	\
 	collection	\
 	configuration	\
+	eplugin		\
 	tests
 
 bin_PROGRAMS = evolution_kolab
diff --git a/src/eplugin/Makefile.am b/src/eplugin/Makefile.am
index ef44993..821be3b 100644
--- a/src/eplugin/Makefile.am
+++ b/src/eplugin/Makefile.am
@@ -10,7 +10,6 @@ AM_CPPFLAGS =				\
 	$(ADD_CFLAGS)
 
 noinst_HEADERS =			\
-	e-kolab-account-setup.h		\
 	e-kolab-backend-sync-conflict.h	\
 	e-kolab-folder-metadata.h	\
 	e-kolab-folder-permissions.h	\
@@ -27,7 +26,6 @@ plugin_DATA = org-gnome-kolab.eplug
 plugin_LTLIBRARIES = liborg-gnome-kolab.la
 
 liborg_gnome_kolab_la_SOURCES =		\
-	e-kolab-account-setup.c		\
 	e-kolab-backend-sync-conflict.c	\
 	e-kolab-folder-metadata.c	\
 	e-kolab-folder-permissions.c	\
@@ -43,8 +41,7 @@ liborg_gnome_kolab_la_LIBADD =		\
 	$(GLIB_LIBS)			\
 	$(GTK_LIBS)			\
 	$(EVOLUTION_LIBS)		\
-	$(KOLAB_LIB_EKOLAB)		\
-	$(KOLAB_LIB_EKOLABBACKEND)
+	$(KOLAB_LIB_EKOLAB)
 
 EXTRA_DIST =				\
 	org-gnome-kolab.eplug.xml	\
diff --git a/src/eplugin/e-kolab-plugin.c b/src/eplugin/e-kolab-plugin.c
index dae156e..0acc2bb 100644
--- a/src/eplugin/e-kolab-plugin.c
+++ b/src/eplugin/e-kolab-plugin.c
@@ -32,7 +32,6 @@
 
 #include <config.h>
 
-#include "e-kolab-account-setup.h"
 #include "e-kolab-plugin-types.h"
 #include "e-kolab-plugin-ui.h"
 #include "e-kolab-plugin.h"
diff --git a/src/eplugin/org-gnome-kolab.eplug.xml b/src/eplugin/org-gnome-kolab.eplug.xml
index fa062eb..d2345d4 100644
--- a/src/eplugin/org-gnome-kolab.eplug.xml
+++ b/src/eplugin/org-gnome-kolab.eplug.xml
@@ -12,31 +12,6 @@
 
     <description>Kolab2 Plugin</description>
 
-    <!-- backend configuration -->
-
-    <!-- addressbook configuration -->
-    <hook class="org.gnome.evolution.addressbook.config:1.0">
-      <group target="source"
-	     id="com.novell.evolution.addressbook.config.accountEditor"
-	     check="e_kolab_plugin_addressbook_check"
-	     commit="e_kolab_plugin_addressbook_commit">
-	<item type="item"
-	      path="00.general/10.display/50.createcontacts"
-	      factory="e_kolab_plugin_addressbook_create" />
-      </group>
-    </hook>
-    <!-- calendar configuration -->
-    <hook class="org.gnome.evolution.calendar.config:1.0">
-      <group target="source"
-	     id="org.gnome.evolution.calendar.calendarProperties"
-	     check="e_kolab_plugin_calendar_check"
-	     commit="e_kolab_plugin_calendar_commit">
-	<item type="item_table"
-	      path="00.general/10.source/40.pcalendar"
-	      factory="e_kolab_plugin_calendar_create" />
-      </group>
-    </hook>
-
     <!-- Kolab folder UI extensions -->
 
     <hook class="org.gnome.evolution.ui:1.0">
diff --git a/src/libekolab/Makefile.am b/src/libekolab/Makefile.am
index 902ef40..a2cfb7e 100644
--- a/src/libekolab/Makefile.am
+++ b/src/libekolab/Makefile.am
@@ -50,10 +50,10 @@ libekolab_la_SOURCES =			\
 	camel-imapx-extd-server.c	\
 	camel-imapx-extd-store.c	\
 	camel-imapx-metadata.c		\
-	kolab-enumtypes.c		\
 	kolab-data-folder-metadata.c	\
 	kolab-data-folder-permissions.c	\
 	kolab-data-imap-account.c	\
+	kolab-enumtypes.c		\
 	kolab-settings-handler.c
 
 noinst_HEADERS =			\