[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=027e61a

The following commit has been merged in the master branch:
commit 027e61aeb270b78e3193b0a72c6fb07c1571e55f
Author: Florian Reinhard <florian.reinhard at googlemail.com>
Date:   Sat Mar 12 00:44:25 2011 +0100

    Don't use or include GenericAdvancedOptionsWidget where not needed.
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
    REVIEW: 100843
---
 haze/haze-icq-account.cpp   | 5 +----
 haze/haze-yahoo-account.cpp | 6 +-----
 rakia/rakia-account-ui.cpp  | 1 -
 salut/salut-account-ui.cpp  | 1 -
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/haze/haze-icq-account.cpp b/haze/haze-icq-account.cpp
index 51d0cd7..8703d88 100644
--- a/haze/haze-icq-account.cpp
+++ b/haze/haze-icq-account.cpp
@@ -24,7 +24,6 @@
 #include "icq-server-settings-widget.h"
 
 #include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-#include <KCMTelepathyAccounts/GenericAdvancedOptionsWidget>
 
 #include <KDebug>
 
@@ -71,10 +70,8 @@ AbstractAccountParametersWidget *HazeIcqAccountUi::advancedOptionsWidget(
 {
     kDebug();
 
-    GenericAdvancedOptionsWidget *advancedOptionsWidget = new GenericAdvancedOptionsWidget(model, parent);
     AbstractAccountParametersWidget *icqServerSettingsWidget = new IcqServerSettingsWidget(model, parent);
-    advancedOptionsWidget->addTab(icqServerSettingsWidget, "Server");
-    return advancedOptionsWidget;
+    return icqServerSettingsWidget;
 }
 
 
diff --git a/haze/haze-yahoo-account.cpp b/haze/haze-yahoo-account.cpp
index 8841c59..576f8b6 100644
--- a/haze/haze-yahoo-account.cpp
+++ b/haze/haze-yahoo-account.cpp
@@ -22,8 +22,6 @@
 #include "yahoo-server-settings-widget.h"
 
 #include <KDebug>
-#include <KCMTelepathyAccounts/GenericAdvancedOptionsWidget>
-#include <KLocalizedString>
 
 HazeYahooAccount::HazeYahooAccount(QObject* parent)
         : AbstractAccountUi(parent)
@@ -63,8 +61,6 @@ AbstractAccountParametersWidget* HazeYahooAccount::advancedOptionsWidget(
         ParameterEditModel* model,
         QWidget* parent) const
 {
-    GenericAdvancedOptionsWidget *advancedOptionsWidget = new GenericAdvancedOptionsWidget(model, parent);
     AbstractAccountParametersWidget* yahooserversettings = new YahooServerSettingsWidget(model, parent);
-    advancedOptionsWidget->addTab(yahooserversettings, i18n("Advanced"));
-    return advancedOptionsWidget;
+    return yahooserversettings;
 }
diff --git a/rakia/rakia-account-ui.cpp b/rakia/rakia-account-ui.cpp
index dee3819..bfc455e 100644
--- a/rakia/rakia-account-ui.cpp
+++ b/rakia/rakia-account-ui.cpp
@@ -24,7 +24,6 @@
 
 #include <KCMTelepathyAccounts/ParameterEditModel>
 #include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-#include <KCMTelepathyAccounts/GenericAdvancedOptionsWidget>
 
 #include <KDebug>
 
diff --git a/salut/salut-account-ui.cpp b/salut/salut-account-ui.cpp
index 37799f8..abb60ca 100644
--- a/salut/salut-account-ui.cpp
+++ b/salut/salut-account-ui.cpp
@@ -24,7 +24,6 @@
 
 #include <KCMTelepathyAccounts/ParameterEditModel>
 #include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-#include <KCMTelepathyAccounts/GenericAdvancedOptionsWidget>
 
 #include <KDebug>
 

-- 
ktp-accounts-kcm packaging