[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=20f4d26

The following commit has been merged in the master branch:
commit 20f4d263e468f14c575dd44848db66bb6cd082e9
Merge: 290c1e3fa3086500023d558bbee43ba89ea62484 a3b8014d45a542107fa666344ae12d1c229eca2d
Author: Daniele E. Domenichelli <ddomenichelli at kde.org>
Date:   Tue Feb 26 14:04:40 2013 +0100

    Merge branch 'displayname'
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
    REVIEW: 103628
    FEATURE: 284930
    FIXED-IN: 0.6
    DIGEST

 plugins/butterfly/main-options-widget.cpp          |  5 ++
 plugins/butterfly/main-options-widget.h            |  1 +
 plugins/gabble/main-options-widget-facebook.cpp    | 10 ++++
 plugins/gabble/main-options-widget-facebook.h      |  1 +
 plugins/gabble/main-options-widget-googletalk.cpp  |  5 ++
 plugins/gabble/main-options-widget-googletalk.h    |  1 +
 plugins/gabble/main-options-widget-kde-talk.cpp    |  5 ++
 plugins/gabble/main-options-widget-kde-talk.h      |  1 +
 plugins/gabble/main-options-widget-msn.cpp         |  8 ++-
 plugins/gabble/main-options-widget-msn.h           |  1 +
 plugins/gabble/main-options-widget.cpp             |  5 ++
 plugins/gabble/main-options-widget.h               |  1 +
 plugins/haze/aim-main-options-widget.cpp           |  5 ++
 plugins/haze/aim-main-options-widget.h             |  2 +
 plugins/haze/icq-main-options-widget.cpp           |  5 ++
 plugins/haze/icq-main-options-widget.h             |  2 +
 plugins/haze/msn-main-options-widget.cpp           |  5 ++
 plugins/haze/msn-main-options-widget.h             |  1 +
 plugins/haze/myspaceim-main-options-widget.cpp     |  5 ++
 plugins/haze/myspaceim-main-options-widget.h       |  2 +
 plugins/haze/skype-main-options-widget.cpp         |  5 ++
 plugins/haze/skype-main-options-widget.h           |  2 +
 plugins/haze/yahoo-main-options-widget.cpp         |  5 ++
 plugins/haze/yahoo-main-options-widget.h           |  1 +
 plugins/idle/main-options-widget.cpp               | 15 ++++++
 plugins/idle/main-options-widget.h                 |  1 +
 plugins/rakia/rakia-main-options-widget.cpp        |  5 ++
 plugins/rakia/rakia-main-options-widget.h          |  1 +
 plugins/salut/salut-main-options-widget.cpp        | 41 ++++++++++++++-
 plugins/salut/salut-main-options-widget.h          |  1 +
 plugins/sunshine/sunshine-main-options-widget.cpp  |  5 ++
 plugins/sunshine/sunshine-main-options-widget.h    |  1 +
 .../abstract-account-parameters-widget.cpp         |  8 ++-
 .../abstract-account-parameters-widget.h           |  7 ++-
 src/KCMTelepathyAccounts/account-edit-widget.cpp   | 47 +++++++++++++++++
 src/KCMTelepathyAccounts/account-edit-widget.h     |  7 +++
 src/KCMTelepathyAccounts/parameter-edit-widget.cpp | 10 ++++
 src/KCMTelepathyAccounts/parameter-edit-widget.h   |  1 +
 src/add-account-assistant.cpp                      | 14 ++---
 src/edit-account-dialog.cpp                        | 31 +++++------
 src/edit-account-dialog.h                          |  3 +-
 src/salut-details-dialog.cpp                       |  3 +-
 src/salut-details-dialog.h                         |  2 +-
 src/salut-enabler.cpp                              | 61 +++++++++++-----------
 src/salut-enabler.h                                |  2 +-
 45 files changed, 282 insertions(+), 68 deletions(-)

-- 
ktp-accounts-kcm packaging