[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=4186fb0

The following commit has been merged in the master branch:
commit 4186fb0283b5e7b2f12365c8f804297a6d2cc04b
Author: Aleix Pol <aleixpol at kde.org>
Date:   Mon Aug 13 15:32:50 2012 +0200

    Let the plasmoid appear properly if instanciated from plasma
    
    And without being shown in the Taskbar and Pager
    
    REVIEW: 105997
    BUG: 302440
---
 ...y-text-observer.h => hide-window-component.cpp} | 37 ++++++--------------
 ...thy-text-observer.h => hide-window-component.h} | 39 +++++++++-------------
 2 files changed, 25 insertions(+), 51 deletions(-)

diff --git a/KTp/Declarative/telepathy-text-observer.h b/KTp/Declarative/hide-window-component.cpp
similarity index 53%
copy from KTp/Declarative/telepathy-text-observer.h
copy to KTp/Declarative/hide-window-component.cpp
index 241febb..2cf2796 100644
--- a/KTp/Declarative/telepathy-text-observer.h
+++ b/KTp/Declarative/hide-window-component.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2011  Lasath Fernando <kde at lasath.org>
+    Copyright (C) 2012 Aleix Pol Gonzalez <aleixpol at blue-systems.com>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -16,32 +16,15 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#include "hidewindowcomponent.h"
+#include <kwindowsystem.h>
+#include <QDebug>
 
-#ifndef TELEPATHY_TEXT_OBSERVER_H
-#define TELEPATHY_TEXT_OBSERVER_H
+HideWindowComponent::HideWindowComponent(QObject* parent)
+    : QObject(parent)
+{}
 
-#include "ktpchat_export.h"
-
-#include "conversations-model.h"
-
-#include <TelepathyQt/AbstractClientHandler>
-
-
-class KDE_TELEPATHY_CHAT_EXPORT TelepathyTextObserver : public QObject
+void HideWindowComponent::hideWindowFromTaskbar(qulonglong winId)
 {
-Q_OBJECT
-
-Q_PROPERTY(QObject* conversations READ conversationModel CONSTANT)
-
-public:
-    TelepathyTextObserver(QObject* parent=0);
-    ~TelepathyTextObserver();
-
-    QAbstractListModel* conversationModel();
-
-private:
-    Tp::SharedPtr<ConversationsModel> m_handler;
-    Tp::ClientRegistrarPtr m_registrar;
-};
-
-#endif // CONVERSATION_WATCHER_H
+    KWindowSystem::setState(winId, NET::SkipTaskbar | NET::SkipPager);
+}
diff --git a/KTp/Declarative/telepathy-text-observer.h b/KTp/Declarative/hide-window-component.h
similarity index 54%
copy from KTp/Declarative/telepathy-text-observer.h
copy to KTp/Declarative/hide-window-component.h
index 241febb..b408022 100644
--- a/KTp/Declarative/telepathy-text-observer.h
+++ b/KTp/Declarative/hide-window-component.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2011  Lasath Fernando <kde at lasath.org>
+    Copyright (C) 2012 Aleix Pol Gonzalez <aleixpol at blue-systems.com>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -16,32 +16,23 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifndef HIDEWINDOWCOMPONENT_H
+#define HIDEWINDOWCOMPONENT_H
 
-#ifndef TELEPATHY_TEXT_OBSERVER_H
-#define TELEPATHY_TEXT_OBSERVER_H
+#include <QObject>
 
-#include "ktpchat_export.h"
+/**
+ * Plasma is not exposing such a feature to make its dialogs hidden from the taskbar,
+ * that's why we added that weird object
+ */
 
-#include "conversations-model.h"
-
-#include <TelepathyQt/AbstractClientHandler>
-
-
-class KDE_TELEPATHY_CHAT_EXPORT TelepathyTextObserver : public QObject
+class HideWindowComponent : public QObject
 {
-Q_OBJECT
-
-Q_PROPERTY(QObject* conversations READ conversationModel CONSTANT)
-
-public:
-    TelepathyTextObserver(QObject* parent=0);
-    ~TelepathyTextObserver();
-
-    QAbstractListModel* conversationModel();
-
-private:
-    Tp::SharedPtr<ConversationsModel> m_handler;
-    Tp::ClientRegistrarPtr m_registrar;
+    Q_OBJECT
+    public:
+        explicit HideWindowComponent(QObject* parent = 0);
+        
+        Q_SCRIPTABLE void hideWindowFromTaskbar(qulonglong winId);
 };
 
-#endif // CONVERSATION_WATCHER_H
+#endif // HIDEWINDOWCOMPONENT_H

-- 
ktp-common-internals packaging