From 1b787a9f326fa5d4224f1a0fe7be56f455b2eedd Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date: Wed, 22 Aug 2012 19:23:41 +0200
Subject: [PATCH] UOA: Set password auth mechanism/method on generic IM
 services

https://bugzilla.gnome.org/show_bug.cgi?id=680776
---
 ubuntu-online-accounts/cc-plugins/generate-plugins.py         | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/aim-im.service     | 4 ++++
 .../cc-plugins/services/gadugadu-im.service                   | 4 ++++
 .../cc-plugins/services/groupwise-im.service                  | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/icq-im.service     | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/irc-im.service     | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/jabber-im.service  | 4 ++++
 .../cc-plugins/services/local-xmpp-im.service                 | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/mxit-im.service    | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/myspace-im.service | 4 ++++
 .../cc-plugins/services/sametime-im.service                   | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/sip-im.service     | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/yahoo-im.service   | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/yahoojp-im.service | 4 ++++
 ubuntu-online-accounts/cc-plugins/services/zephyr-im.service  | 4 ++++
 15 files changed, 60 insertions(+)

diff --git a/ubuntu-online-accounts/cc-plugins/generate-plugins.py b/ubuntu-online-accounts/cc-plugins/generate-plugins.py
index d8d10e6b..9eadede0 100755
--- a/ubuntu-online-accounts/cc-plugins/generate-plugins.py
+++ b/ubuntu-online-accounts/cc-plugins/generate-plugins.py
@@ -139,6 +139,10 @@ def generate_service_file(p):
       <setting name="manager">%s</setting>
       <setting name="protocol">%s</setting>
     </group>
+    <group name="auth">
+      <setting name="method">password</setting>
+      <setting name="mechanism">password</setting>
+    </group>
   </template>
 
 </service>
diff --git a/ubuntu-online-accounts/cc-plugins/services/aim-im.service b/ubuntu-online-accounts/cc-plugins/services/aim-im.service
index 63a4d7d7..5fcb0029 100644
--- a/ubuntu-online-accounts/cc-plugins/services/aim-im.service
+++ b/ubuntu-online-accounts/cc-plugins/services/aim-im.service
@@ -13,6 +13,10 @@
       <setting name="manager">haze</setting>
       <setting name="protocol">aim</setting>
     </group>
+    <group name="auth">
+      <setting name="method">password</setting>
+      <setting name="mechanism">password</setting>
+    </group>
   </template>
 
 </service>
diff --git a/ubuntu-online-accounts/cc-plugins/services/gadugadu-im.service b/ubuntu-online-accounts/cc-plugins/services/gadugadu-im.service
index 76e5903d..1f240232 100644
--- a/ubuntu-online-accounts/cc-plugins/services/gadugadu-im.service
+++ b/ubuntu-online-accounts/cc-plugins/services/gadugadu-im.service
@@ -13,6 +13,10 @@
       <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/ubuntu-online-accounts/cc-plugins/services/groupwise-im.service b/ubuntu-online-accounts/cc-plugins/services/groupwise-im.service
index ef866889..a3d9e9b0 100644
--- a/ubuntu-online-accounts/cc-plugins/services/groupwise-im.service
+++ b/ubuntu-online-accounts/cc-plugins/services/groupwise-im.service
@@ -13,6 +13,10 @@
       <setting name="manager">haze</setting>
       <setting name="protocol">groupwise</setting>
     </group>
+    <group name="auth">
+      <setting name="method">password</setting>
+      <setting name="mechanism">password</setting>
+    </group>
   </template>
 
 </service>
diff --git a/ubuntu-online-accounts/cc-plugins/services/icq-im.service b/ubuntu-online-accounts/cc-plugins/services/icq-im.service
index e67f25a1..f52be180 100644
--- a/ubuntu-online-accounts/cc-plugins/services/icq-im.service
+++ b/ubuntu-online-accounts/cc-plugins/services/icq-im.service
@@ -13,6 +13,10 @@
       <setting name="manager">haze</setting>
       <setting name="protocol">icq</setting>
     </group>
+    <group name="auth">
+      <setting name="method">password</setting>
+      <setting name="mechanism">password</setting>
+    </group>
   </template>
 
 </service>
diff --git a/ubuntu-online-accounts/cc-plugins/services/irc-im.service b/ubuntu-online-accounts/cc-plugins/services/irc-im.service
index a3e2cfe7..011d66b8 100644
--- a/ubuntu-online-accounts/cc-plugins/services/irc-im.service
+++ b/ubuntu-online-accounts/cc-plugins/services/irc-im.service
@@ -13,6 +13,10 @@
       <setting name="manager">idle</setting>
       <setting name="protocol">irc</setting>
     </group>
+    <group name="auth">
+      <setting name="method">password</setting>
+      <setting name="mechanism">password</setting>
+    </group>
   </template>
 
 </service>
diff --git a/ubuntu-online-accounts/cc-plugins/services/jabber-im.service b/ubuntu-online-accounts/cc-plugins/services/jabber-im.service
index 156fa6bd..b7cef60b 100644
--- a/ubuntu-online-accounts/cc-plugins/services/jabber-im.service
+++ b/ubuntu-online-accounts/cc-plugins/services/jabber-im.service
@@ -13,6 +13,10 @@
       <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/ubuntu-online-accounts/cc-plugins/services/local-xmpp-im.service b/ubuntu-online-accounts/cc-plugins/services/local-xmpp-im.service
index c8dbb29a..836610a6 100644
--- a/ubuntu-online-accounts/cc-plugins/services/local-xmpp-im.service
+++ b/ubuntu-online-accounts/cc-plugins/services/local-xmpp-im.service
@@ -13,6 +13,10 @@
       <setting name="manager">salut</setting>
       <setting name="protocol">local-xmpp</setting>
     </group>
+    <group name="auth">
+      <setting name="method">password</setting>
+      <setting name="mechanism">password</setting>
+    </group>
   </template>
 
 </service>
diff --git a/ubuntu-online-accounts/cc-plugins/services/mxit-im.service b/ubuntu-online-accounts/cc-plugins/services/mxit-im.service
index 5c986c15..705c73bc 100644
--- a/ubuntu-online-accounts/cc-plugins/services/mxit-im.service
+++ b/ubuntu-online-accounts/cc-plugins/services/mxit-im.service
@@ -13,6 +13,10 @@
       <setting name="manager">haze</setting>
       <setting name="protocol">mxit</setting>
     </group>
+    <group name="auth">
+      <setting name="method">password</setting>
+      <setting name="mechanism">password</setting>
+    </group>
   </template>
 
 </service>
diff --git a/ubuntu-online-accounts/cc-plugins/services/myspace-im.service b/ubuntu-online-accounts/cc-plugins/services/myspace-im.service
index 38488db5..04c038dd 100644
--- a/ubuntu-online-accounts/cc-plugins/services/myspace-im.service
+++ b/ubuntu-online-accounts/cc-plugins/services/myspace-im.service
@@ -13,6 +13,10 @@
       <setting name="manager">haze</setting>
       <setting name="protocol">myspace</setting>
     </group>
+    <group name="auth">
+      <setting name="method">password</setting>
+      <setting name="mechanism">password</setting>
+    </group>
   </template>
 
 </service>
diff --git a/ubuntu-online-accounts/cc-plugins/services/sametime-im.service b/ubuntu-online-accounts/cc-plugins/services/sametime-im.service
index 623a017a..cb844c87 100644
--- a/ubuntu-online-accounts/cc-plugins/services/sametime-im.service
+++ b/ubuntu-online-accounts/cc-plugins/services/sametime-im.service
@@ -13,6 +13,10 @@
       <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/ubuntu-online-accounts/cc-plugins/services/sip-im.service b/ubuntu-online-accounts/cc-plugins/services/sip-im.service
index e46ef7ab..364b833d 100644
--- a/ubuntu-online-accounts/cc-plugins/services/sip-im.service
+++ b/ubuntu-online-accounts/cc-plugins/services/sip-im.service
@@ -13,6 +13,10 @@
       <setting name="manager">sofiasip</setting>
       <setting name="protocol">sip</setting>
     </group>
+    <group name="auth">
+      <setting name="method">password</setting>
+      <setting name="mechanism">password</setting>
+    </group>
   </template>
 
 </service>
diff --git a/ubuntu-online-accounts/cc-plugins/services/yahoo-im.service b/ubuntu-online-accounts/cc-plugins/services/yahoo-im.service
index 6fffb851..0f0b2d52 100644
--- a/ubuntu-online-accounts/cc-plugins/services/yahoo-im.service
+++ b/ubuntu-online-accounts/cc-plugins/services/yahoo-im.service
@@ -13,6 +13,10 @@
       <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/ubuntu-online-accounts/cc-plugins/services/yahoojp-im.service b/ubuntu-online-accounts/cc-plugins/services/yahoojp-im.service
index d3a4592a..4bb66c35 100644
--- a/ubuntu-online-accounts/cc-plugins/services/yahoojp-im.service
+++ b/ubuntu-online-accounts/cc-plugins/services/yahoojp-im.service
@@ -13,6 +13,10 @@
       <setting name="manager">haze</setting>
       <setting name="protocol">yahoojp</setting>
     </group>
+    <group name="auth">
+      <setting name="method">password</setting>
+      <setting name="mechanism">password</setting>
+    </group>
   </template>
 
 </service>
diff --git a/ubuntu-online-accounts/cc-plugins/services/zephyr-im.service b/ubuntu-online-accounts/cc-plugins/services/zephyr-im.service
index bcf3592e..12da3000 100644
--- a/ubuntu-online-accounts/cc-plugins/services/zephyr-im.service
+++ b/ubuntu-online-accounts/cc-plugins/services/zephyr-im.service
@@ -13,6 +13,10 @@
       <setting name="manager">haze</setting>
       <setting name="protocol">zephyr</setting>
     </group>
+    <group name="auth">
+      <setting name="method">password</setting>
+      <setting name="mechanism">password</setting>
+    </group>
   </template>
 
 </service>
-- 
2.39.2