[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=14c8b3c

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

    Register provided protocol/cm combos in the gabble plugin.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm-plugins/; revision=1004143
---
 CMakeLists.txt                      | 2 ++
 gabble/gabble-account-ui-plugin.cpp | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6e17b0..3a7a7b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,5 @@
+project (telepathy-accounts-kcm-plugins)
+
 # Add the modules we ship to the module path
 SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
 
diff --git a/gabble/gabble-account-ui-plugin.cpp b/gabble/gabble-account-ui-plugin.cpp
index d5695d6..00e864d 100644
--- a/gabble/gabble-account-ui-plugin.cpp
+++ b/gabble/gabble-account-ui-plugin.cpp
@@ -41,6 +41,9 @@ GabbleAccountUiPlugin::GabbleAccountUiPlugin(QObject *parent, const QVariantList
    d(new Private)
 {
     kDebug();
+
+    // Register supported cm/protocol combinations
+    registerProvidedProtocol("gabble", "jabber");
 }
 
 GabbleAccountUiPlugin::~GabbleAccountUiPlugin()

-- 
ktp-accounts-kcm packaging