[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=035d463

The following commit has been merged in the master branch:
commit 035d46350f36baf27b38ef44118edeab3cbc7d2f
Author: Lasath Fernando <kde at lasath.org>
Date:   Fri Feb 18 20:43:44 2011 +1100

    Created advanced options widget for haze-yahoo
    still has some bugs though.
---
 haze/CMakeLists.txt                |  2 ++
 haze/haze-yahoo-account.cpp        | 21 +++++++++++++++++----
 haze/yahoo-main-options-widget.cpp |  7 +++++++
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/haze/CMakeLists.txt b/haze/CMakeLists.txt
index 49711ad..67d43a1 100644
--- a/haze/CMakeLists.txt
+++ b/haze/CMakeLists.txt
@@ -11,12 +11,14 @@ set (kcmtelepathyaccounts_plugin_haze_SRCS
      icq-server-settings-widget.cpp
      haze-yahoo-account.cpp
      yahoo-main-options-widget.cpp
+     yahoo-server-settings-widget.cpp
 )
 
 kde4_add_ui_files (kcmtelepathyaccounts_plugin_haze_SRCS
                    icq-main-options-widget.ui
                    icq-server-settings-widget.ui
                    yahoo-main-options-widget.ui
+                   yahoo-server-settings-widget.ui
 )
 
 kde4_add_plugin (kcmtelepathyaccounts_plugin_haze
diff --git a/haze/haze-yahoo-account.cpp b/haze/haze-yahoo-account.cpp
index 7cdad17..d4d1250 100644
--- a/haze/haze-yahoo-account.cpp
+++ b/haze/haze-yahoo-account.cpp
@@ -19,18 +19,28 @@
  */
 
 #include "haze-yahoo-account.h"
+#include "yahoo-server-settings-widget.h"
 
 #include <KDebug>
+#include <KCMTelepathyAccounts/GenericAdvancedOptionsWidget>
 
 HazeYahooAccount::HazeYahooAccount(QObject* parent)
         : AbstractAccountUi(parent)
 {
     kDebug();
 
-    // only these two parameters are supported at the moment,
-    // I'll add more once I determine which are important
+    //register that all options are supported
     registerSupportedParameter("account", QVariant::String);
     registerSupportedParameter("password", QVariant::String);
+    
+    registerSupportedParameter("port", QVariant::UInt);
+    registerSupportedParameter("xfer-host", QVariant::String);
+    registerSupportedParameter("xfer-port", QVariant::UInt);
+    
+    registerSupportedParameter("room-list-locale", QVariant::String);
+    registerSupportedParameter("charset", QVariant::String);
+    registerSupportedParameter("proxy-ssl", QVariant::Bool);
+    registerSupportedParameter("ignore-invites", QVariant::Bool);
 }
 
 HazeYahooAccount::~HazeYahooAccount()
@@ -40,7 +50,7 @@ HazeYahooAccount::~HazeYahooAccount()
 
 bool HazeYahooAccount::hasAdvancedOptionsWidget() const
 {
-    return false;
+    return true;
 }
 
 AbstractAccountParametersWidget* HazeYahooAccount::mainOptionsWidget(
@@ -54,5 +64,8 @@ AbstractAccountParametersWidget* HazeYahooAccount::advancedOptionsWidget(
         ParameterEditModel* model,
         QWidget* parent) const
 {
-    return NULL;
+    GenericAdvancedOptionsWidget *advancedOptionsWidget = new GenericAdvancedOptionsWidget(model, parent);
+    AbstractAccountParametersWidget* yahooserversettings = new YahooServerSettingsWidget(model, parent);
+    advancedOptionsWidget->addTab(yahooserversettings, "Advanced");
+    return advancedOptionsWidget;
 }
diff --git a/haze/yahoo-main-options-widget.cpp b/haze/yahoo-main-options-widget.cpp
index f07822d..8b171bd 100644
--- a/haze/yahoo-main-options-widget.cpp
+++ b/haze/yahoo-main-options-widget.cpp
@@ -21,11 +21,18 @@
 #include "yahoo-main-options-widget.h"
 
 #include <KDebug>
+#include <KCMTelepathyAccounts/parameter-edit-model.h>
 
 YahooMainOptionsWidget::YahooMainOptionsWidget(ParameterEditModel* model, QWidget* parent)
         : AbstractAccountParametersWidget(model, parent)
 {
     kDebug();
+    
+    kDebug() << "Creating Yahoo Account";
+    
+    foreach (Tp::ProtocolParameter param, model->parameters()) {
+        kDebug() << "Found parameter: " << param.name() << param.type() << param.defaultValue();
+    }
 
     //setup the Ui
     m_ui = new Ui::YahooMainOptionsWidget;

-- 
ktp-accounts-kcm packaging