[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=33fb2a0

The following commit has been merged in the master branch:
commit 33fb2a0fc22355c3483169536cff341a31443c43
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Wed Jul 29 12:31:30 2009 +0000

    Comply with a small API correction, and misc tidyup.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm-plugins/; revision=1004144
---
 gabble/gabble-account-ui-plugin.cpp | 4 +++-
 gabble/gabble-account-ui-plugin.h   | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gabble/gabble-account-ui-plugin.cpp b/gabble/gabble-account-ui-plugin.cpp
index 00e864d..a0516bd 100644
--- a/gabble/gabble-account-ui-plugin.cpp
+++ b/gabble/gabble-account-ui-plugin.cpp
@@ -51,7 +51,7 @@ GabbleAccountUiPlugin::~GabbleAccountUiPlugin()
     kDebug();
 }
 
-AbstractAccountUi* GabbleAccountUiPlugin::accountUi(const QString *connectionManager, const QString &protocol)
+AbstractAccountUi* GabbleAccountUiPlugin::accountUi(const QString &connectionManager, const QString &protocol)
 {
     kDebug();
  
@@ -61,9 +61,11 @@ AbstractAccountUi* GabbleAccountUiPlugin::accountUi(const QString *connectionMan
     return 0;
 }
 
+
 //KCMTELEPATHYACCOUNTS_PLUGIN_EXPORT("gabble", "GabbleAccountUiPlugin")
   K_PLUGIN_FACTORY(factory, registerPlugin<GabbleAccountUiPlugin>();) \
   K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_gabble"))
 
+
 #include "gabble-account-ui-plugin.moc"
 
diff --git a/gabble/gabble-account-ui-plugin.h b/gabble/gabble-account-ui-plugin.h
index ecd3d7a..9b343ac 100644
--- a/gabble/gabble-account-ui-plugin.h
+++ b/gabble/gabble-account-ui-plugin.h
@@ -28,15 +28,16 @@
 class GabbleAccountUiPlugin : public AbstractAccountUiPlugin
 {
     Q_OBJECT
-    Q_DISABLE_COPY(GabbleAccountUiPlugin);
 
 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);
 
 private:
+    Q_DISABLE_COPY(GabbleAccountUiPlugin);
+
     class Private;
     Private * const d;
 };

-- 
ktp-accounts-kcm packaging