[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=0658327

The following commit has been merged in the master branch:
commit 06583274ca1fabe9fb654c07c70cafd8ab5ba7f1
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon May 25 17:24:37 2015 +0200

    Adapt the rest of providers and services to the new format
---
 data/kaccounts/ktp-gadugadu.provider.in        |  8 +-------
 data/kaccounts/ktp-haze-gadugadu-im.service.in | 11 +++++++++++
 data/kaccounts/ktp-haze-sametime-im.service.in | 11 +++++++++++
 data/kaccounts/ktp-haze-sametime.provider.in   |  8 +-------
 data/kaccounts/ktp-haze-yahoo-im.service.in    | 11 +++++++++++
 data/kaccounts/ktp-haze-yahoo.provider.in      |  8 +-------
 data/kaccounts/ktp-jabber-im.service.in        | 11 +++++++++++
 data/kaccounts/ktp-jabber.provider.in          |  8 +-------
 data/kaccounts/ktp-kde-talk-im.service.in      | 11 +++++++++++
 data/kaccounts/ktp-kde-talk.provider.in        |  8 +-------
 10 files changed, 60 insertions(+), 35 deletions(-)

diff --git a/data/kaccounts/ktp-gadugadu.provider.in b/data/kaccounts/ktp-gadugadu.provider.in
index b0745f8..687dd9d 100644
--- a/data/kaccounts/ktp-gadugadu.provider.in
+++ b/data/kaccounts/ktp-gadugadu.provider.in
@@ -5,12 +5,6 @@
     <!-- Tooltip text appearing over the button to create this type of account -->
     <_description>Gadu-Gadu (GG) chat account</_description>
     <translations>kaccounts-providers</translations>
-
-    <template>
-        <group name="auth">
-            <setting name="method">password</setting>
-            <setting name="mechanism">password</setting>
-        </group>
-    </template>
+    <plugin>ktpaccountskcm_plugin_kaccounts</plugin>
 </provider>
 
diff --git a/data/kaccounts/ktp-haze-gadugadu-im.service.in b/data/kaccounts/ktp-haze-gadugadu-im.service.in
index fa54296..5d9e09f 100644
--- a/data/kaccounts/ktp-haze-gadugadu-im.service.in
+++ b/data/kaccounts/ktp-haze-gadugadu-im.service.in
@@ -6,5 +6,16 @@
   <icon>im-gadugadu</icon>
   <provider>ktp-gadugadu</provider>
   <translations>kaccounts-providers</translations>
+
+  <template>
+      <group name="telepathy">
+          <setting name="manager">haze</setting>
+          <setting name="protocol">gadugadu</setting>
+      </group>
+      <group name="auth">
+          <setting name="method">password</setting>
+          <setting name="mechanism">password</setting>
+      </group>
+  </template>
 </service>
 
diff --git a/data/kaccounts/ktp-haze-sametime-im.service.in b/data/kaccounts/ktp-haze-sametime-im.service.in
index d6be520..f135a3e 100644
--- a/data/kaccounts/ktp-haze-sametime-im.service.in
+++ b/data/kaccounts/ktp-haze-sametime-im.service.in
@@ -6,4 +6,15 @@
     <icon>im-user</icon>
     <provider>ktp-haze-sametime</provider>
     <translations>kaccounts-providers</translations>
+
+    <template>
+        <group name="telepathy">
+            <setting name="manager">haze</setting>
+            <setting name="protocol">sametime</setting>
+        </group>
+        <group name="auth">
+            <setting name="method">password</setting>
+            <setting name="mechanism">password</setting>
+        </group>
+    </template>
 </service>
diff --git a/data/kaccounts/ktp-haze-sametime.provider.in b/data/kaccounts/ktp-haze-sametime.provider.in
index 0fff261..72892b7 100644
--- a/data/kaccounts/ktp-haze-sametime.provider.in
+++ b/data/kaccounts/ktp-haze-sametime.provider.in
@@ -5,11 +5,5 @@
     <!-- Tooltip text appearing over the button to create this type of account -->
     <_description>Chat account in an IBM Sametime network</_description>
     <translations>kaccounts-providers</translations>
-
-    <template>
-        <group name="auth">
-            <setting name="method">password</setting>
-            <setting name="mechanism">password</setting>
-        </group>
-    </template>
+    <plugin>ktpaccountskcm_plugin_kaccounts</plugin>
 </provider>
diff --git a/data/kaccounts/ktp-haze-yahoo-im.service.in b/data/kaccounts/ktp-haze-yahoo-im.service.in
index 1101f19..28bac3c 100644
--- a/data/kaccounts/ktp-haze-yahoo-im.service.in
+++ b/data/kaccounts/ktp-haze-yahoo-im.service.in
@@ -6,5 +6,16 @@
   <icon>im-yahoo</icon>
   <provider>ktp-haze-yahoo</provider>
   <translations>kaccounts-providers</translations>
+
+  <template>
+      <group name="telepathy">
+          <setting name="manager">haze</setting>
+          <setting name="protocol">yahoo</setting>
+      </group>
+      <group name="auth">
+          <setting name="method">password</setting>
+          <setting name="mechanism">password</setting>
+      </group>
+  </template>
 </service>
 
diff --git a/data/kaccounts/ktp-haze-yahoo.provider.in b/data/kaccounts/ktp-haze-yahoo.provider.in
index 058c87a..810a4c3 100644
--- a/data/kaccounts/ktp-haze-yahoo.provider.in
+++ b/data/kaccounts/ktp-haze-yahoo.provider.in
@@ -5,12 +5,6 @@
     <!-- Tooltip text appearing over the button to create this type of account -->
     <_description>Yahoo! Messenger chat account</_description>
     <translations>kaccounts-providers</translations>
-
-    <template>
-        <group name="auth">
-            <setting name="method">password</setting>
-            <setting name="mechanism">password</setting>
-        </group>
-    </template>
+    <plugin>ktpaccountskcm_plugin_kaccounts</plugin>
 </provider>
 
diff --git a/data/kaccounts/ktp-jabber-im.service.in b/data/kaccounts/ktp-jabber-im.service.in
index 11f7f18..ba3454b 100644
--- a/data/kaccounts/ktp-jabber-im.service.in
+++ b/data/kaccounts/ktp-jabber-im.service.in
@@ -6,4 +6,15 @@
   <icon>im-jabber-talk</icon>
   <provider>ktp-jabber</provider>
   <translations>kaccounts-providers</translations>
+
+  <template>
+      <group name="telepathy">
+          <setting name="manager">gabble</setting>
+          <setting name="protocol">jabber</setting>
+      </group>
+      <group name="auth">
+          <setting name="method">password</setting>
+          <setting name="mechanism">password</setting>
+      </group>
+  </template>
 </service>
diff --git a/data/kaccounts/ktp-jabber.provider.in b/data/kaccounts/ktp-jabber.provider.in
index f1cae56..f4921da 100644
--- a/data/kaccounts/ktp-jabber.provider.in
+++ b/data/kaccounts/ktp-jabber.provider.in
@@ -5,11 +5,5 @@
     <!-- Tooltip text appearing over the button to create this type of account -->
     <_description>Jabber chat account</_description>
     <translations>kaccounts-providers</translations>
-
-    <template>
-        <group name="auth">
-            <setting name="method">password</setting>
-            <setting name="mechanism">password</setting>
-        </group>
-    </template>
+    <plugin>ktpaccountskcm_plugin_kaccounts</plugin>
 </provider>
diff --git a/data/kaccounts/ktp-kde-talk-im.service.in b/data/kaccounts/ktp-kde-talk-im.service.in
index 42f358a..e117dae 100644
--- a/data/kaccounts/ktp-kde-talk-im.service.in
+++ b/data/kaccounts/ktp-kde-talk-im.service.in
@@ -6,4 +6,15 @@
   <icon>kde</icon>
   <provider>ktp-kde-talk</provider>
   <translations>kaccounts-providers</translations>
+
+  <template>
+      <group name="telepathy">
+          <setting name="manager">gabble</setting>
+          <setting name="protocol">jabber</setting>
+      </group>
+      <group name="auth">
+          <setting name="method">password</setting>
+          <setting name="mechanism">password</setting>
+      </group>
+  </template>
 </service>
diff --git a/data/kaccounts/ktp-kde-talk.provider.in b/data/kaccounts/ktp-kde-talk.provider.in
index 6fe4dc6..2f06b45 100644
--- a/data/kaccounts/ktp-kde-talk.provider.in
+++ b/data/kaccounts/ktp-kde-talk.provider.in
@@ -6,11 +6,5 @@
     <!-- Tooltip text appearing over the button to create this type of account -->
     <_description>KDE Talk chat account</_description>
     <translations>kaccounts-providers</translations>
-
-    <template>
-        <group name="auth">
-            <setting name="method">password</setting>
-            <setting name="mechanism">password</setting>
-        </group>
-    </template>
+    <plugin>ktpaccountskcm_plugin_kaccounts</plugin>
 </provider>

-- 
ktp-accounts-kcm packaging