[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=7886d43

The following commit has been merged in the master branch:
commit 7886d4374d4aa16240a6beb1adeebbdec3d62b11
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Oct 31 16:04:17 2012 +0100

    Add property X-KTp-PluginInfo-Version to plugins
    
    This property holds the ktp-text-ui plugin framework version for which
    the plugin is written, and allow us to switch the branch easily,
    without caring of removing uncompatible plugins.
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
    REVIEW: 107154
---
 CMakeLists.txt                                                        | 3 ++-
 filters/emoticons/ktptextui_message_filter_emoticons.desktop          | 1 +
 filters/formatting/ktptextui_message_filter_formatting.desktop        | 1 +
 filters/images/ktptextui_message_filter_images.desktop                | 1 +
 .../searchexpansion/ktptextui_message_filter_searchexpansion.desktop  | 1 +
 lib/ktptxtui_message_filter.desktop                                   | 4 ++++
 lib/plugin-config-manager.cpp                                         | 4 +++-
 version.h.in                                                          | 1 +
 8 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5871db4..ab7c85c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
 project(ktp-text-ui)
 
 set(KTP_TEXT_UI_VERSION "0.5.1")
+set(KTP_TEXT_UI_PLUGIN_FRAMEWORK_VERSION "1")
 set(IS_KTP_INTERNAL_MODULE TRUE)
 
 # Include our extra FindFoo.cmake files.
@@ -39,7 +40,7 @@ if(TELEPATHY_LOGGER_QT4_FOUND)
     )
 endif()
 
-configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 add_subdirectory(lib)
diff --git a/filters/emoticons/ktptextui_message_filter_emoticons.desktop b/filters/emoticons/ktptextui_message_filter_emoticons.desktop
index da7618e..dfb5024 100644
--- a/filters/emoticons/ktptextui_message_filter_emoticons.desktop
+++ b/filters/emoticons/ktptextui_message_filter_emoticons.desktop
@@ -63,3 +63,4 @@ X-KDE-PluginInfo-Version=0.4
 X-KDE-PluginInfo-Website=http://community.kde.org/Real-Time_Communication_and_Collaboration
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true
+X-KTp-PluginInfo-Version=1
diff --git a/filters/formatting/ktptextui_message_filter_formatting.desktop b/filters/formatting/ktptextui_message_filter_formatting.desktop
index 5030b3c..b322fd0 100644
--- a/filters/formatting/ktptextui_message_filter_formatting.desktop
+++ b/filters/formatting/ktptextui_message_filter_formatting.desktop
@@ -55,3 +55,4 @@ X-KDE-PluginInfo-Version=0.4
 X-KDE-PluginInfo-Website=http://community.kde.org/Real-Time_Communication_and_Collaboration
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=false
+X-KTp-PluginInfo-Version=1
diff --git a/filters/images/ktptextui_message_filter_images.desktop b/filters/images/ktptextui_message_filter_images.desktop
index cd27ac6..4fa1ab9 100644
--- a/filters/images/ktptextui_message_filter_images.desktop
+++ b/filters/images/ktptextui_message_filter_images.desktop
@@ -60,3 +60,4 @@ X-KDE-PluginInfo-Version=0.4
 X-KDE-PluginInfo-Website=http://community.kde.org/Real-Time_Communication_and_Collaboration
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true
+X-KTp-PluginInfo-Version=1
diff --git a/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop b/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop
index 755bb3d..1a1550d 100644
--- a/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop
+++ b/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop
@@ -39,3 +39,4 @@ X-KDE-PluginInfo-Version=0.4
 X-KDE-PluginInfo-Website=http://community.kde.org/Real-Time_Communication_and_Collaboration
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=false
+X-KTp-PluginInfo-Version=1
diff --git a/lib/ktptxtui_message_filter.desktop b/lib/ktptxtui_message_filter.desktop
index e0d0b31..ff8b967 100644
--- a/lib/ktptxtui_message_filter.desktop
+++ b/lib/ktptxtui_message_filter.desktop
@@ -24,3 +24,7 @@ Comment[sv]=Telepathy meddelandefilter för textbaserat användargränssnitt
 Comment[uk]=Фільтр повідомлень текстового інтерфейсу Telepathy
 Comment[x-test]=xxTelepathy Text-Ui Message Filterxx
 Comment[zh_TW]=Telepathy 文字介面訊息過濾器
+
+# The ktp-text-ui plugin framework version for which the plugin is written
+[PropertyDef::X-KTp-PluginInfo-Version]
+Type=int
diff --git a/lib/plugin-config-manager.cpp b/lib/plugin-config-manager.cpp
index b1a4d5b..601d74b 100644
--- a/lib/plugin-config-manager.cpp
+++ b/lib/plugin-config-manager.cpp
@@ -17,6 +17,7 @@
 */
 
 #include "plugin-config-manager.h"
+#include "version.h"
 
 #include <QMutex>
 #include <QSet>
@@ -53,7 +54,8 @@ PluginConfigManager::PluginConfigManager() :
 }
 
 KService::List offers() {
-    return KServiceTypeTrader::self()->query(QLatin1String("KTpTextUi/MessageFilter"));
+    return KServiceTypeTrader::self()->query(QLatin1String("KTpTextUi/MessageFilter"),
+                                             QLatin1String("[X-KTp-PluginInfo-Version] == " KTP_TEXT_UI_PLUGIN_FRAMEWORK_VERSION));
 }
 
 void PluginConfigManager::generateCache()
diff --git a/version.h.in b/version.h.in
index a4e11bf..914f26e 100644
--- a/version.h.in
+++ b/version.h.in
@@ -1 +1,2 @@
 #define KTP_TEXT_UI_VERSION "@KTP_TEXT_UI_VERSION@"
+#define KTP_TEXT_UI_PLUGIN_FRAMEWORK_VERSION "@KTP_TEXT_UI_PLUGIN_FRAMEWORK_VERSION@"

-- 
ktp-text-ui packaging