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

The following commit has been merged in the master branch:
commit c021ca0bddbbd32286a8eb89a907b5a5d35053a8
Author: Thomas Richard <thomas9999 at gmail.com>
Date:   Sun Jan 16 10:13:07 2011 +0100

    Change the plugins to support serviceNames
---
 butterfly/butterfly-account-ui-plugin.cpp | 4 +++-
 butterfly/butterfly-account-ui-plugin.h   | 2 +-
 gabble/gabble-account-ui-plugin.cpp       | 4 +++-
 gabble/gabble-account-ui-plugin.h         | 2 +-
 haze/haze-account-ui-plugin.cpp           | 4 +++-
 haze/haze-account-ui-plugin.h             | 2 +-
 idle/idle-account-ui-plugin.cpp           | 4 +++-
 idle/idle-account-ui-plugin.h             | 3 +--
 8 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/butterfly/butterfly-account-ui-plugin.cpp b/butterfly/butterfly-account-ui-plugin.cpp
index 83c665d..9d097cb 100644
--- a/butterfly/butterfly-account-ui-plugin.cpp
+++ b/butterfly/butterfly-account-ui-plugin.cpp
@@ -55,8 +55,10 @@ ButterflyAccountUiPlugin::~ButterflyAccountUiPlugin()
     kDebug();
 }
 
-AbstractAccountUi* ButterflyAccountUiPlugin::accountUi(const QString &connectionManager, const QString &protocol)
+AbstractAccountUi* ButterflyAccountUiPlugin::accountUi(const QString &connectionManager, const QString &protocol, const QString &serviceName)
 {
+    Q_UNUSED(serviceName);
+
     kDebug();
     
     // We only support butterfly/xmpp combination.
diff --git a/butterfly/butterfly-account-ui-plugin.h b/butterfly/butterfly-account-ui-plugin.h
index d379cd6..8c027d5 100644
--- a/butterfly/butterfly-account-ui-plugin.h
+++ b/butterfly/butterfly-account-ui-plugin.h
@@ -33,7 +33,7 @@ public:
     ButterflyAccountUiPlugin(QObject *parent, const QVariantList &);
     virtual ~ButterflyAccountUiPlugin();
 
-    virtual AbstractAccountUi* accountUi(const QString &connectionManager, const QString &protocol);
+    virtual AbstractAccountUi* accountUi(const QString &connectionManager, const QString &protocol, const QString &serviceName);
 
 private:
     Q_DISABLE_COPY(ButterflyAccountUiPlugin);
diff --git a/gabble/gabble-account-ui-plugin.cpp b/gabble/gabble-account-ui-plugin.cpp
index 8e497f1..ae9f79a 100644
--- a/gabble/gabble-account-ui-plugin.cpp
+++ b/gabble/gabble-account-ui-plugin.cpp
@@ -53,8 +53,10 @@ GabbleAccountUiPlugin::~GabbleAccountUiPlugin()
     kDebug();
 }
 
-AbstractAccountUi* GabbleAccountUiPlugin::accountUi(const QString &connectionManager, const QString &protocol)
+AbstractAccountUi* GabbleAccountUiPlugin::accountUi(const QString &connectionManager, const QString &protocol, const QString &serviceName)
 {
+    Q_UNUSED(serviceName);
+
     kDebug();
 
     // We only support gabble/jabber combination.
diff --git a/gabble/gabble-account-ui-plugin.h b/gabble/gabble-account-ui-plugin.h
index 9b343ac..76de025 100644
--- a/gabble/gabble-account-ui-plugin.h
+++ b/gabble/gabble-account-ui-plugin.h
@@ -33,7 +33,7 @@ public:
     GabbleAccountUiPlugin(QObject *parent, const QVariantList &);
     virtual ~GabbleAccountUiPlugin();
 
-    virtual AbstractAccountUi* accountUi(const QString &connectionManager, const QString &protocol);
+    virtual AbstractAccountUi* accountUi(const QString &connectionManager, const QString &protocol, const QString &serviceName);
 
 private:
     Q_DISABLE_COPY(GabbleAccountUiPlugin);
diff --git a/haze/haze-account-ui-plugin.cpp b/haze/haze-account-ui-plugin.cpp
index db4b209..e684150 100644
--- a/haze/haze-account-ui-plugin.cpp
+++ b/haze/haze-account-ui-plugin.cpp
@@ -53,8 +53,10 @@ HazeAccountUiPlugin::~HazeAccountUiPlugin()
     kDebug();
 }
 
-AbstractAccountUi* HazeAccountUiPlugin::accountUi(const QString &connectionManager, const QString &protocol)
+AbstractAccountUi* HazeAccountUiPlugin::accountUi(const QString &connectionManager, const QString &protocol, const QString &serviceName)
 {
+    Q_UNUSED(serviceName);
+
     kDebug();
 
     // We only support haze/icq combination.so far
diff --git a/haze/haze-account-ui-plugin.h b/haze/haze-account-ui-plugin.h
index b208d7a..28d7b43 100644
--- a/haze/haze-account-ui-plugin.h
+++ b/haze/haze-account-ui-plugin.h
@@ -33,7 +33,7 @@ public:
     HazeAccountUiPlugin(QObject *parent, const QVariantList &);
     virtual ~HazeAccountUiPlugin();
 
-    virtual AbstractAccountUi* accountUi(const QString &connectionManager, const QString &protocol);
+    virtual AbstractAccountUi* accountUi(const QString &connectionManager, const QString &protocol, const QString &serviceName);
 
 private:
     Q_DISABLE_COPY(HazeAccountUiPlugin);
diff --git a/idle/idle-account-ui-plugin.cpp b/idle/idle-account-ui-plugin.cpp
index 801f83b..af7c184 100644
--- a/idle/idle-account-ui-plugin.cpp
+++ b/idle/idle-account-ui-plugin.cpp
@@ -55,8 +55,10 @@ IdleAccountUiPlugin::~IdleAccountUiPlugin()
     kDebug();
 }
 
-AbstractAccountUi* IdleAccountUiPlugin::accountUi(const QString &connectionManager, const QString &protocol)
+AbstractAccountUi* IdleAccountUiPlugin::accountUi(const QString &connectionManager, const QString &protocol, const QString &serviceName)
 {
+    Q_UNUSED(serviceName);
+
     kDebug();
 
     if ((connectionManager == "idle") && (protocol == "irc")) {
diff --git a/idle/idle-account-ui-plugin.h b/idle/idle-account-ui-plugin.h
index c099007..98eaf4e 100644
--- a/idle/idle-account-ui-plugin.h
+++ b/idle/idle-account-ui-plugin.h
@@ -33,8 +33,7 @@ public:
     IdleAccountUiPlugin(QObject *parent, const QVariantList &);
     virtual ~IdleAccountUiPlugin();
 
-    virtual AbstractAccountUi* accountUi(const QString &connectionManager,
-                                         const QString &protocol);
+    virtual AbstractAccountUi* accountUi(const QString &connectionManager, const QString &protocol, const QString &serviceName);
 
 private:
     Q_DISABLE_COPY(IdleAccountUiPlugin);

-- 
ktp-accounts-kcm packaging