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

The following commit has been merged in the master branch:
commit b32d9430505aa92117509b2cfeb6c6f38681fa22
Merge: ef8f205ffeb5748d4bf38a99d608cba50f928928 9c81b9fd0cdde10db20b5314dbc67ddfbe3062b1
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Thu Dec 15 18:04:44 2011 +0100

    Merge branch 'fix-krazy'
    
    REVIEW:103418

 plugins/butterfly/butterfly-account-ui-plugin.cpp  |  2 +-
 plugins/butterfly/butterfly-account-ui-plugin.h    |  2 +-
 plugins/butterfly/butterfly-account-ui.cpp         |  2 +-
 plugins/butterfly/butterfly-account-ui.h           |  2 +-
 plugins/butterfly/main-options-widget.cpp          |  2 +-
 plugins/butterfly/main-options-widget.h            |  2 +-
 plugins/gabble/gabble-account-ui-plugin.cpp        |  2 +-
 plugins/gabble/gabble-account-ui-plugin.h          |  2 +-
 plugins/gabble/gabble-account-ui.cpp               |  2 +-
 plugins/gabble/gabble-account-ui.h                 |  2 +-
 plugins/gabble/main-options-widget.cpp             |  2 +-
 plugins/gabble/main-options-widget.h               |  2 +-
 plugins/gabble/proxy-settings-widget.cpp           |  2 +-
 plugins/gabble/proxy-settings-widget.h             |  2 +-
 plugins/gabble/server-settings-widget.cpp          |  2 +-
 plugins/gabble/server-settings-widget.h            |  2 +-
 plugins/gabble/server-settings-widget.ui           |  2 +-
 plugins/haze/aim-main-options-widget.h             |  2 +-
 plugins/haze/haze-msn-account.h                    |  2 +-
 plugins/haze/yahoo-main-options-widget.h           |  2 +-
 plugins/rakia/rakia-account-ui.cpp                 |  2 +-
 plugins/rakia/rakia-advanced-options-widget.ui     |  6 +++---
 plugins/sunshine/sunshine-account-ui.cpp           |  2 +-
 .../sunshine/sunshine-advanced-options-widget.ui   |  2 +-
 .../abstract-account-parameters-widget.cpp         |  4 ++--
 .../abstract-account-parameters-widget.h           |  4 ++--
 .../abstract-account-ui-plugin.cpp                 |  2 +-
 .../abstract-account-ui-plugin.h                   |  2 +-
 src/KCMTelepathyAccounts/abstract-account-ui.cpp   |  4 ++--
 src/KCMTelepathyAccounts/abstract-account-ui.h     |  2 +-
 src/KCMTelepathyAccounts/account-edit-widget.cpp   | 18 +++++++++-------
 src/KCMTelepathyAccounts/account-edit-widget.h     |  2 +-
 src/KCMTelepathyAccounts/dictionary.cpp            |  2 +-
 src/KCMTelepathyAccounts/dictionary.h              |  2 +-
 .../parameter-edit-delegate.cpp                    |  8 ++++----
 src/KCMTelepathyAccounts/parameter-edit-delegate.h |  2 +-
 src/KCMTelepathyAccounts/parameter-edit-model.cpp  |  4 ++--
 src/KCMTelepathyAccounts/parameter-edit-model.h    |  4 ++--
 src/KCMTelepathyAccounts/parameter-edit-widget.cpp |  6 +++---
 src/KCMTelepathyAccounts/parameter-edit-widget.h   |  2 +-
 src/KCMTelepathyAccounts/parameter-item.cpp        |  2 +-
 src/KCMTelepathyAccounts/parameter-item.h          |  2 +-
 src/KCMTelepathyAccounts/plugin-macros.h           | 20 ++++++++++++++++++
 src/KCMTelepathyAccounts/plugin-manager.cpp        |  2 +-
 src/KCMTelepathyAccounts/plugin-manager.h          |  2 +-
 src/KCMTelepathyAccounts/profile-item.cpp          |  2 +-
 src/KCMTelepathyAccounts/profile-item.h            |  2 +-
 src/KCMTelepathyAccounts/profile-list-model.cpp    |  2 +-
 src/KCMTelepathyAccounts/profile-list-model.h      |  2 +-
 src/KCMTelepathyAccounts/profile-select-widget.cpp |  6 +++---
 src/KCMTelepathyAccounts/profile-select-widget.h   |  2 +-
 src/KCMTelepathyAccounts/unsigned-integer-edit.cpp |  2 +-
 src/KCMTelepathyAccounts/unsigned-integer-edit.h   |  7 ++++---
 src/account-item.cpp                               | 10 ++++-----
 src/account-item.h                                 |  2 +-
 src/accounts-list-model.cpp                        |  2 +-
 src/accounts-list-model.h                          |  2 +-
 src/add-account-assistant.cpp                      |  2 +-
 src/add-account-assistant.h                        |  2 +-
 src/edit-account-dialog.cpp                        |  2 +-
 src/edit-account-dialog.h                          |  2 +-
 src/kcm-telepathy-accounts.cpp                     | 24 +++++++++++-----------
 src/kcm-telepathy-accounts.h                       |  2 +-
 src/salut-details-dialog.cpp                       |  2 +-
 src/salut-details-dialog.h                         |  2 +-
 src/salut-enabler.cpp                              |  4 ++--
 src/salut-enabler.h                                |  2 +-
 src/salut-message-widget.cpp                       |  2 +-
 68 files changed, 130 insertions(+), 105 deletions(-)

-- 
ktp-accounts-kcm packaging