From 8633b93b122f0e832a9081190f40f87633c35894 Mon Sep 17 00:00:00 2001
From: Christoph Haas <christoph.h@sprinternet.at>
Date: Thu, 3 Oct 2013 19:29:42 +0000
Subject: [PATCH] v1.0.1: 03.10.2013  - compatible with WebApp 1.4

---
 build.xml                    |  2 +-
 changelog.txt                |  3 +++
 js/plugin.contactimporter.js | 16 +++++++++-------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 44d59b5..12d2292 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
 <project default="all">
 	<!--############# CONFIGURE ALL PROPERTIES FOR THE REPLACER HERE ################-->
-	<property name="plugin_version" value="0.9"/>
+	<property name="plugin_version" value="1.0.4"/>
 	<!-- EOC -->
 	
 	<property name="root-folder" value="${basedir}/../"/>
diff --git a/changelog.txt b/changelog.txt
index 502e22f..f6fec2b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,6 @@
+v1.0.1: 03.10.2013
+ - compatible with WebApp 1.4
+
 v1.0: 24.6.2013
  - import vcards (1 or more vcards in a file)
  - chooseable destination addressbook
\ No newline at end of file
diff --git a/js/plugin.contactimporter.js b/js/plugin.contactimporter.js
index 3370a08..d8bfb32 100644
--- a/js/plugin.contactimporter.js
+++ b/js/plugin.contactimporter.js
@@ -31,12 +31,6 @@ Zarafa.plugins.contactimporter.ImportPlugin = Ext.extend(Zarafa.core.Plugin, {
      */
 	constructor: function (config) {
 		config = config || {};
-		
-		 Ext.applyIf(config, {
-			name : 'contactimporter',
-			displayName : _('Contactimporter Plugin'),
-			about : Zarafa.plugins.contactimporter.ABOUT
-		});
 				
 		Zarafa.plugins.contactimporter.ImportPlugin.superclass.constructor.call(this, config);
 	},
@@ -237,6 +231,14 @@ Zarafa.plugins.contactimporter.ImportPlugin = Ext.extend(Zarafa.core.Plugin, {
  *############################################################################################################################*/
 Zarafa.onReady(function() {
 	if(container.getSettingsModel().get("zarafa/v1/plugins/contactimporter/enable") === true) {
-		container.registerPlugin(new Zarafa.plugins.contactimporter.ImportPlugin);
+		if(container.getSettingsModel().get("zarafa/v1/plugins/calendarimporter/enable") === true) {
+			container.registerPlugin(new Zarafa.core.PluginMetaData({
+				name : 'contactimporter',
+				displayName : _('Contactimporter Plugin'),
+				about : Zarafa.plugins.contactimporter.ABOUT,
+				allowUserDisable : true,
+				pluginConstructor : Zarafa.plugins.contactimporter.ImportPlugin
+			}));
+		}
 	}
 });