[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=49687e5

The following commit has been merged in the master branch:
commit 49687e5b9f8988e67315d5233c834cd8656b4883
Merge: 270eadad0146de6bb2543b12040aff8e79d1895a 34a4127aa2cc662099bcf2972bc27adc6c8331e3
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Jan 9 16:44:14 2011 +0000

    Merge branch 'ui_fixes'
    
    Conflicts:
    	src/edit-account-dialog.cpp

 src/KCMTelepathyAccounts/account-edit-widget.cpp | 14 ++++----
 src/KCMTelepathyAccounts/account-edit-widget.h   |  4 +--
 src/KCMTelepathyAccounts/account-edit-widget.ui  | 43 ++++++++++++++++++++++--
 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, 56 insertions(+), 28 deletions(-)

diff --cc src/edit-account-dialog.cpp
index d92b270,b787dac..45ec840
--- a/src/edit-account-dialog.cpp
+++ b/src/edit-account-dialog.cpp
@@@ -20,6 -20,6 +20,7 @@@
  
  #include "edit-account-dialog.h"
  
++#include "KCMTelepathyAccounts/dictionary.h"
  #include "KCMTelepathyAccounts/abstract-account-parameters-widget.h"
  #include "KCMTelepathyAccounts/abstract-account-ui.h"
  #include "KCMTelepathyAccounts/account-edit-widget.h"

-- 
ktp-accounts-kcm packaging