[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=b3a7165

The following commit has been merged in the master branch:
commit b3a7165dd324589aa94b7bec87670e35e4a0a0d3
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Wed Sep 28 20:15:21 2011 +0200

    Fix compile issues
---
 CMakeLists.txt    | 1 +
 error-handler.cpp | 8 ++++----
 error-handler.h   | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c96af6..143afef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,6 +39,7 @@ kde4_add_plugin (kded_telepathy_module
 target_link_libraries (kded_telepathy_module
                        ${KDE4_KDECORE_LIBS}
                        ${TELEPATHY_QT4_LIBRARIES}
+                       ${KDE4_KDEUI_LIBS}
                        kidletime
 
 )
diff --git a/error-handler.cpp b/error-handler.cpp
index f8e2d42..ada02cc 100644
--- a/error-handler.cpp
+++ b/error-handler.cpp
@@ -43,7 +43,7 @@ ErrorHandler::~ErrorHandler()
 
 }
 
-void ErrorHandler::handleError(const Tp::ConnectionStatus status)
+void ErrorHandler::handleErrors(const Tp::ConnectionStatus status)
 {
     Tp::AccountPtr account(qobject_cast< Tp::Account* >(sender()));
 
@@ -69,14 +69,14 @@ void ErrorHandler::handleError(const Tp::ConnectionStatus status)
     }
 }
 
-void ErrorHandler::showMessageToUser(const QString& text, const ErrorHandler::SystemMessageType type)
+void ErrorHandler::showMessageToUser(const QString &text, const ErrorHandler::SystemMessageType type)
 {
     //The pointer is automatically deleted when the event is closed
     KNotification *notification;
     if (type == ErrorHandler::SystemMessageError) {
-        notification = new KNotification("telepathyError", this);
+        notification = new KNotification(QLatin1String("telepathyError"), KNotification::Persistent);
     } else {
-        notification = new KNotification("telepathyInfo", this);
+        notification = new KNotification(QLatin1String("telepathyInfo"), KNotification::CloseOnTimeout);
     }
 
     KAboutData aboutData("ktelepathy",0,KLocalizedString(),0);
diff --git a/error-handler.h b/error-handler.h
index 3aeeeb4..95a4cc5 100644
--- a/error-handler.h
+++ b/error-handler.h
@@ -49,7 +49,7 @@ public:
 
 private Q_SLOTS:
     void handleErrors(const Tp::ConnectionStatus status);
-    void showMessageToUser(const QString& text, const ErrorHandler::SystemMessageType type);
+    void showMessageToUser(const QString &text, const ErrorHandler::SystemMessageType type);
     void handleNewAccount(const Tp::AccountPtr &account);
 
 private:

-- 
ktp-kded-integration-module packaging