[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=001fc95

The following commit has been merged in the master branch:
commit 001fc95f865d37ed88eb1bc25a010f8113b58e15
Merge: 327269b639e7dfe3d36378cae9c8cf38eef9c3ac 2b6182eb7d5f248f56593c54630d6abbc5a3a553
Author: Thomas Richard <thomas9999 at gmail.com>
Date:   Fri Jan 14 09:35:52 2011 +0100

    Merge branch 'master' of git.kde.org:telepathy-accounts-kcm into profiles

 src/KCMTelepathyAccounts/CMakeLists.txt            |   5 +
 .../abstract-account-parameters-widget.cpp         |  85 ++++++++++++++--
 .../abstract-account-parameters-widget.h           |  21 +++-
 src/KCMTelepathyAccounts/abstract-account-ui.cpp   |   7 +-
 src/KCMTelepathyAccounts/abstract-account-ui.h     |   7 +-
 src/KCMTelepathyAccounts/account-edit-widget.cpp   |  53 +++++-----
 src/KCMTelepathyAccounts/account-edit-widget.h     |   7 +-
 .../generic-advanced-options-widget.cpp            | 112 +++++++++++++++++++++
 ...-widget.h => generic-advanced-options-widget.h} |  30 +++---
 .../include/GenericAdvancedOptionsWidget           |   6 ++
 .../include/ParameterEditModel                     |   7 ++
 src/KCMTelepathyAccounts/parameter-edit-model.cpp  |  73 ++++++++++++--
 src/KCMTelepathyAccounts/parameter-edit-model.h    |   9 +-
 src/KCMTelepathyAccounts/parameter-edit-widget.cpp |  31 ++----
 src/KCMTelepathyAccounts/parameter-edit-widget.h   |   8 +-
 src/KCMTelepathyAccounts/parameter-item.cpp        |   1 -
 src/add-account-assistant.cpp                      |  11 +-
 src/edit-account-dialog.cpp                        |  10 +-
 18 files changed, 376 insertions(+), 107 deletions(-)

diff --cc src/KCMTelepathyAccounts/CMakeLists.txt
index 5cbcff5,1e3a282..87d9ea5
--- a/src/KCMTelepathyAccounts/CMakeLists.txt
+++ b/src/KCMTelepathyAccounts/CMakeLists.txt
@@@ -8,11 -8,12 +8,12 @@@ set (libkcmtelepathyaccounts_SRC
       abstract-account-ui-plugin.cpp
       abstract-account-ui.cpp
       abstract-account-parameters-widget.cpp
+      generic-advanced-options-widget.cpp
       account-edit-widget.cpp
 -     protocol-select-widget.cpp
 -     protocol-list-model.cpp
 +     profile-select-widget.cpp
 +     profile-list-model.cpp
       connection-manager-item.cpp
 -     protocol-item.cpp
 +     profile-item.cpp
       parameter-edit-widget.cpp
       parameter-edit-delegate.cpp
       parameter-edit-model.cpp
@@@ -30,9 -32,10 +32,10 @@@ set (libkcmtelepathyaccounts_HDR
       plugin-macros.h
       connection-manager-item.h
       plugin-manager.h
 -     protocol-select-widget.h
 -     protocol-item.h
 +     profile-select-widget.h
 +     profile-item.h
       parameter-edit-widget.h
+      parameter-edit-model.h
       protocol-parameter-value.h
  )
  
diff --cc src/add-account-assistant.cpp
index a269bbd,69edc11..040ba88
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@@ -127,12 -128,20 +128,20 @@@ void AddAccountAssistant::next(
              d->accountEditWidget = 0;
          }
  
+         // Get the protocol's parameters and values.
+         Tp::ProtocolInfo protocolInfo = item->protocolInfo();
+         Tp::ProtocolParameterList parameters = protocolInfo.parameters();
+ 
+         // Add the parameters to the model.
+         ParameterEditModel *parameterModel = new ParameterEditModel(this);
+         parameterModel->addItems(parameters);
+ 
          // Set up the account edit widget
          d->accountEditWidget = new AccountEditWidget(item->protocolInfo(),
-                                                      QVariantMap(),
+                                                      parameterModel,
                                                       d->pageTwoWidget);
          d->pageTwoWidget->layout()->addWidget(d->accountEditWidget);
 -
 +*/
          KAssistantDialog::next();
      }
  }

-- 
ktp-accounts-kcm packaging