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

The following commit has been merged in the master branch:
commit ad787f7710e41766f16c9f0404582787b6f7b974
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Jun 15 19:08:04 2012 +0100

    Revert "Disable advanced options widget in Haze-Skype"
    
    This reverts commit 2f97ee22d2e26de5a1ea956688194c3f731aadc9.
    
    CCBUG: 299159
---
 plugins/haze/haze-skype-account-ui.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/haze/haze-skype-account-ui.cpp b/plugins/haze/haze-skype-account-ui.cpp
index 2048a73..076fc5b 100644
--- a/plugins/haze/haze-skype-account-ui.cpp
+++ b/plugins/haze/haze-skype-account-ui.cpp
@@ -51,7 +51,7 @@ AbstractAccountParametersWidget *HazeSkypeAccountUi::mainOptionsWidget(
 
 bool HazeSkypeAccountUi::hasAdvancedOptionsWidget() const
 {
-    return false;
+    return true;
 }
 
 AbstractAccountParametersWidget *HazeSkypeAccountUi::advancedOptionsWidget(

-- 
ktp-accounts-kcm packaging