[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=61770f5

The following commit has been merged in the master branch:
commit 61770f5f2ff13824d6e327f3b7f1cc61cc6ef5c1
Author: Patrick von Reth <vonreth at kde.org>
Date:   Fri Jul 26 01:14:26 2013 +0200

    disabled one constructor on windows
---
 KTp/telepathy-handler-application.cpp | 2 ++
 KTp/telepathy-handler-application.h   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/KTp/telepathy-handler-application.cpp b/KTp/telepathy-handler-application.cpp
index 8056dd1..2b5d608 100644
--- a/KTp/telepathy-handler-application.cpp
+++ b/KTp/telepathy-handler-application.cpp
@@ -164,6 +164,7 @@ TelepathyHandlerApplication::TelepathyHandlerApplication(bool GUIenabled,
     d->init(initialTimeout, timeout);
 }
 
+#ifndef Q_OS_WIN
 TelepathyHandlerApplication::TelepathyHandlerApplication(Display *display,
                                                          Qt::HANDLE visual,
                                                          Qt::HANDLE colormap,
@@ -174,6 +175,7 @@ TelepathyHandlerApplication::TelepathyHandlerApplication(Display *display,
 {
     d->init(initialTimeout, timeout);
 }
+#endif
 
 TelepathyHandlerApplication::~TelepathyHandlerApplication()
 {
diff --git a/KTp/telepathy-handler-application.h b/KTp/telepathy-handler-application.h
index 4f8a059..fbdb523 100644
--- a/KTp/telepathy-handler-application.h
+++ b/KTp/telepathy-handler-application.h
@@ -51,11 +51,13 @@ public:
                                          int initialTimeout = 15000,
                                          int timeout = 2000);
 
+#ifndef Q_OS_WIN
     explicit TelepathyHandlerApplication(Display *display,
                                          Qt::HANDLE visual = 0,
                                          Qt::HANDLE colormap = 0,
                                          int initialTimeout = 15000,
                                          int timeout = 2000);
+#endif
 
     virtual ~TelepathyHandlerApplication();
 

-- 
ktp-common-internals packaging