[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=a14ca10

The following commit has been merged in the master branch:
commit a14ca1069ff7cfaa8bee818a28f8152001a664dd
Merge: ba894b0abded5e920d9d74e077abd6e0df49efb2 49687e5b9f8988e67315d5233c834cd8656b4883
Author: Thomas Richard <thomas9999 at gmail.com>
Date:   Sun Jan 9 18:00:23 2011 +0100

    Merge branch 'master' of git.kde.org:telepathy-accounts-kcm into approved
    
    Conflicts:
    	src/KCMTelepathyAccounts/account-edit-widget.cpp
    	src/KCMTelepathyAccounts/account-edit-widget.ui

 src/KCMTelepathyAccounts/account-edit-widget.cpp | 17 ++++---
 src/KCMTelepathyAccounts/account-edit-widget.h   |  4 +-
 src/KCMTelepathyAccounts/account-edit-widget.ui  | 62 +++++++++++++++++++++---
 src/KCMTelepathyAccounts/protocol-item.cpp       |  6 +--
 src/KCMTelepathyAccounts/protocol-item.h         |  3 +-
 src/add-account-assistant.cpp                    |  8 +--
 src/edit-account-dialog.cpp                      |  6 +--
 7 files changed, 74 insertions(+), 32 deletions(-)

diff --cc src/KCMTelepathyAccounts/account-edit-widget.cpp
index bb37484,7ff8a62..9ec1d7f
--- a/src/KCMTelepathyAccounts/account-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/account-edit-widget.cpp
@@@ -62,17 -61,24 +61,21 @@@ AccountEditWidget::AccountEditWidget(co
      kDebug();
  
      // Set up the interface
 -    d->ui.setupUi(this);
 -
 -    // create a layout on the central widget so that the config page is properly
 -    // resized
 -    QHBoxLayout* layout = new QHBoxLayout(d->ui.centralWidget);
 -    layout->setContentsMargins(0,0,0,0);
 +    d->ui = new Ui::AccountEditWidget;
 +    d->ui->setupUi(this);
  
-     d->connectionManager = connectionManager;
-     d->protocol = protocol;
-     d->parameters = parameters;
+     d->connectionManager = info.cmName();
+     d->protocol = info.name();
+     d->parameters = info.parameters();
      d->parameterValues = parameterValues;
  
 -    connect(d->ui.advancedButton, SIGNAL(clicked()),
 +    connect(d->ui->advancedButton, SIGNAL(clicked()),
              this, SLOT(onAdvancedClicked()));
-     d->ui->advancedButton->setIcon(KIcon("configure"));
++
+     d->ui.advancedButton->setIcon(KIcon("configure"));
+     d->ui.titleLabel->setText(Dictionary::instance()->string(info.name()));
+     d->ui.iconLabel->setText("");
+     d->ui.iconLabel->setPixmap(KIcon(info.iconName()).pixmap(32));
  
      loadWidgets();
  }

-- 
ktp-accounts-kcm packaging