[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=a068694

The following commit has been merged in the master branch:
commit a068694806a24b0c5b0775a3eb341c67cf285ee7
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Wed Jul 13 17:49:32 2011 +0200

    Use isPresencePlasmoidPresent() for the method name (was isPlasmoidPresent()).
---
 main-widget.cpp | 4 ++--
 main-widget.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index dcc42b8..e182936 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -1298,7 +1298,7 @@ void MainWidget::closeEvent(QCloseEvent* e)
 
     if (checkForPlasmoid) {
 
-        if (!isPlasmoidPresent()) {
+        if (!isPresencePlasmoidPresent()) {
             KDialog *noPlasmoidDialog = new KDialog(this);
 
             QWidget *dialogMainWidget = new QWidget(noPlasmoidDialog);
@@ -1347,7 +1347,7 @@ void MainWidget::closeEvent(QCloseEvent* e)
     KMainWindow::closeEvent(e);
 }
 
-bool MainWidget::isPlasmoidPresent()
+bool MainWidget::isPresencePlasmoidPresent()
 {
     QDBusInterface plasmoidOnDbus("org.kde.Telepathy.PresenceEngineActive", "/PresenceEngineActive");
 
diff --git a/main-widget.h b/main-widget.h
index dbe2f17..87d0811 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -51,7 +51,7 @@ public:
     MainWidget(QWidget *parent = 0);
     ~MainWidget();
 
-    bool isPlasmoidPresent();
+    bool isPresencePlasmoidPresent();
 
     enum SystemMessageType {
         /*

-- 
ktp-contact-list packaging