[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=1a5e272

The following commit has been merged in the master branch:
commit 1a5e2724d2f9d0ce4e3a11ae427bcbea8616e34d
Author: Dominik Schmidt <dev at dominik-schmidt.de>
Date:   Sun Jan 9 05:30:18 2011 +0100

    Make the haze icq plugin load.
---
 haze/haze-icq-account-ui.cpp                  | 22 +++-------
 haze/icq-main-options-widget.ui               | 63 ++++++++++-----------------
 haze/kcmtelepathyaccounts_plugin_haze.desktop |  2 +-
 3 files changed, 31 insertions(+), 56 deletions(-)

diff --git a/haze/haze-icq-account-ui.cpp b/haze/haze-icq-account-ui.cpp
index 687a408..cb5fe34 100644
--- a/haze/haze-icq-account-ui.cpp
+++ b/haze/haze-icq-account-ui.cpp
@@ -46,22 +46,14 @@ HazeIcqAccountUi::HazeIcqAccountUi(QObject *parent)
     registerSupportedParameter("account", QVariant::String);
     registerSupportedParameter("password", QVariant::String);
 
-    registerSupportedParameter("port", QVariant::UInt);
+    //registerSupportedParameter("port", QVariant::UInt);
     registerSupportedParameter("server", QVariant::String);
-    registerSupportedParameter("require-encryption", QVariant::Bool);
-    registerSupportedParameter("old-ssl", QVariant::Bool);
-    registerSupportedParameter("low-bandwidth", QVariant::Bool);
-    registerSupportedParameter("ignore-ssl-errors", QVariant::Bool);
-    registerSupportedParameter("keepalive-interval", QVariant::UInt);
-
-    registerSupportedParameter("stun-server", QVariant::String);
-    registerSupportedParameter("stun-port", QVariant::UInt);
-    registerSupportedParameter("fallback-stun-server", QVariant::String);
-    registerSupportedParameter("fallback-stun-port", QVariant::UInt);
-    registerSupportedParameter("https-proxy-server", QVariant::String);
-    registerSupportedParameter("https-proxy-port", QVariant::UInt);
-    registerSupportedParameter("fallback-socks5-proxies", QVariant::StringList);
-    registerSupportedParameter("fallback-conference-server", QVariant::String);
+
+    registerSupportedParameter("use-ssl", QVariant::Bool);
+    registerSupportedParameter("always-use-rv-proxy", QVariant::Bool);
+    registerSupportedParameter("allow-multiple-logins", QVariant::Bool);
+    registerSupportedParameter("charset", QVariant::String);
+    
 }
 
 HazeIcqAccountUi::~HazeIcqAccountUi()
diff --git a/haze/icq-main-options-widget.ui b/haze/icq-main-options-widget.ui
index e73a0b2..4438fa3 100644
--- a/haze/icq-main-options-widget.ui
+++ b/haze/icq-main-options-widget.ui
@@ -15,47 +15,30 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <widget class="QLabel" name="accountLabel">
-         <property name="text">
-          <string>Jabber ID:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="KLineEdit" name="accountLineEdit"/>
-       </item>
-      </layout>
+    <layout class="QFormLayout" name="formLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="accountLabel">
+       <property name="text">
+        <string>UIN:</string>
+       </property>
+      </widget>
      </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <widget class="QLabel" name="passwordLabel">
-         <property name="text">
-          <string>Password:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="KLineEdit" name="passwordLineEdit">
-         <property name="echoMode">
-          <enum>QLineEdit::Password</enum>
-         </property>
-         <property name="passwordMode">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
+     <item row="0" column="1">
+      <widget class="KLineEdit" name="accountLineEdit"/>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="passwordLabel">
+       <property name="text">
+        <string>Password:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="KLineEdit" name="passwordLineEdit">
+       <property name="passwordMode">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
diff --git a/haze/kcmtelepathyaccounts_plugin_haze.desktop b/haze/kcmtelepathyaccounts_plugin_haze.desktop
index e59382c..c6a4086 100644
--- a/haze/kcmtelepathyaccounts_plugin_haze.desktop
+++ b/haze/kcmtelepathyaccounts_plugin_haze.desktop
@@ -6,7 +6,7 @@ Name=Haze Account Configuration User Interface
 Type=Service
 ServiceTypes=KCMTelepathyAccounts/AccountUiPlugin
 
-X-KDE-Library=kcmtelepathyaccounts_plugin_haze_
+X-KDE-Library=kcmtelepathyaccounts_plugin_haze
 X-KDE-PluginInfo-Author=Dominik Schmidt
 X-KDE-PluginInfo-Email=kde at dominik-schmidt.de
 X-KDE-PluginInfo-Name=haze

-- 
ktp-accounts-kcm packaging