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

The following commit has been merged in the master branch:
commit c44fd786ac8e8eda6dfb21dd32c98618a20d8dff
Merge: f0ebd4879a5b4b2248a741572434e3abc24a3188 7215465e20669550ede5406a1fc00e1099e20a5d
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Dec 29 14:46:45 2011 +0100

    Merge branch 'cleanup'
    
    Reviewed-by: Martin Klapetek <martin.klapetek at gmail.com>

 CMakeLists.txt                                     |  5 +-
 plugins/butterfly/butterfly-account-ui-plugin.cpp  |  8 +-
 plugins/butterfly/butterfly-account-ui.cpp         | 12 +--
 plugins/butterfly/main-options-widget.cpp          | 11 +--
 plugins/gabble/gabble-account-ui-plugin.cpp        |  8 +-
 plugins/gabble/gabble-account-ui.cpp               | 51 +++++-------
 plugins/gabble/main-options-widget-facebook.cpp    | 19 ++---
 plugins/gabble/main-options-widget-googletalk.cpp  | 11 +--
 plugins/gabble/main-options-widget.cpp             | 13 +--
 plugins/gabble/proxy-settings-widget.cpp           | 23 ++----
 plugins/gabble/server-settings-widget.cpp          | 25 +++---
 plugins/haze/aim-main-options-widget.cpp           |  9 +--
 plugins/haze/aim-server-settings-widget.cpp        | 20 ++---
 plugins/haze/haze-account-ui-plugin.cpp            | 18 ++---
 plugins/haze/haze-aim-account.cpp                  | 27 ++-----
 plugins/haze/haze-icq-account.cpp                  | 26 ++----
 plugins/haze/haze-msn-account.cpp                  |  4 +-
 plugins/haze/haze-myspaceim-account-ui.cpp         | 17 +---
 plugins/haze/haze-skype-account-ui.cpp             | 22 ++---
 plugins/haze/haze-yahoo-account.cpp                | 23 +++---
 plugins/haze/icq-main-options-widget.cpp           | 11 +--
 plugins/haze/icq-server-settings-widget.cpp        | 19 ++---
 plugins/haze/msn-main-options-widget.cpp           |  6 +-
 .../haze/myspaceim-advanced-settings-widget.cpp    | 10 +--
 plugins/haze/myspaceim-main-options-widget.cpp     | 11 +--
 plugins/haze/skype-advanced-settings-widget.cpp    | 16 ++--
 plugins/haze/skype-main-options-widget.cpp         | 13 +--
 plugins/haze/yahoo-main-options-widget.cpp         | 12 +--
 plugins/haze/yahoo-server-settings-widget.cpp      | 20 ++---
 plugins/idle/advanced-options-widget.cpp           | 17 ++--
 plugins/idle/idle-account-ui-plugin.cpp            |  8 +-
 plugins/idle/idle-account-ui.cpp                   | 28 +++----
 plugins/idle/main-options-widget.cpp               | 12 +--
 plugins/rakia/rakia-account-ui-plugin.cpp          | 14 ++--
 plugins/rakia/rakia-account-ui.cpp                 | 50 +++++-------
 plugins/rakia/rakia-advanced-options-widget.cpp    | 32 ++++----
 plugins/rakia/rakia-advanced-options-widget.h      |  2 +-
 plugins/rakia/rakia-main-options-widget.cpp        | 11 +--
 plugins/salut/salut-account-ui-plugin.cpp          |  8 +-
 plugins/salut/salut-account-ui.cpp                 | 22 ++---
 plugins/salut/salut-advanced-options-widget.cpp    | 10 +--
 plugins/salut/salut-main-options-widget.cpp        | 11 +--
 plugins/sunshine/sunshine-account-ui-plugin.cpp    |  7 +-
 plugins/sunshine/sunshine-account-ui.cpp           | 26 ++----
 .../sunshine/sunshine-advanced-options-widget.cpp  | 14 ++--
 plugins/sunshine/sunshine-main-options-widget.cpp  |  8 +-
 .../abstract-account-parameters-widget.cpp         | 26 +++---
 .../abstract-account-ui-plugin.cpp                 |  9 +--
 src/KCMTelepathyAccounts/abstract-account-ui.cpp   |  8 +-
 src/KCMTelepathyAccounts/account-edit-widget.cpp   | 33 +++-----
 src/KCMTelepathyAccounts/account-edit-widget.ui    |  8 +-
 src/KCMTelepathyAccounts/dictionary.cpp            | 93 ++++++++++------------
 src/KCMTelepathyAccounts/feedback-widget.cpp       |  3 +-
 src/KCMTelepathyAccounts/feedback-widget.h         |  9 +--
 .../generic-advanced-options-widget.cpp            | 13 +--
 .../parameter-edit-delegate.cpp                    |  9 +--
 src/KCMTelepathyAccounts/parameter-edit-model.cpp  | 42 +++++-----
 src/KCMTelepathyAccounts/parameter-edit-model.h    |  5 --
 src/KCMTelepathyAccounts/parameter-edit-widget.cpp |  8 --
 src/KCMTelepathyAccounts/parameter-edit-widget.h   |  2 +
 src/KCMTelepathyAccounts/parameter-item.cpp        |  2 -
 src/KCMTelepathyAccounts/plugin-manager.cpp        | 16 +---
 src/KCMTelepathyAccounts/profile-item.cpp          |  6 +-
 src/KCMTelepathyAccounts/profile-list-model.cpp    | 31 +++-----
 src/KCMTelepathyAccounts/profile-list-model.h      |  2 +-
 src/KCMTelepathyAccounts/profile-select-widget.cpp | 14 +---
 .../simple-profile-select-widget.cpp               | 11 ---
 src/KCMTelepathyAccounts/validated-line-edit.cpp   | 43 +++++-----
 src/account-identity-dialog.cpp                    |  3 -
 src/account-identity-dialog.h                      |  4 +-
 src/account-item.cpp                               | 29 +++----
 src/accounts-list-delegate.cpp                     |  4 +-
 src/accounts-list-delegate.h                       |  4 +-
 src/accounts-list-model.cpp                        | 43 ++++------
 src/add-account-assistant.cpp                      | 46 +++--------
 src/avatar-button.cpp                              |  8 +-
 src/edit-account-dialog.cpp                        | 20 +----
 src/fetch-avatar-job.cpp                           |  2 +-
 src/kcm-telepathy-accounts.cpp                     | 39 +++------
 src/salut-details-dialog.cpp                       |  8 +-
 src/salut-enabler.cpp                              | 71 +++++++++--------
 src/salut-message-widget.cpp                       | 12 +--
 82 files changed, 484 insertions(+), 952 deletions(-)

-- 
ktp-accounts-kcm packaging