[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ktp-text-ui/filters] /: Merge branch 'kde-telepathy-0.5'
From:       Daniele E. Domenichelli <daniele.domenichelli () gmail ! com>
Date:       2012-11-01 0:00:06
Message-ID: 20121101000006.5E4BEA60C8 () git ! kde ! org
[Download RAW message or body]

Git commit 4ff62a568a85b3753732cca2a11acd8c55fd4f61 by Daniele E. Domenichelli.
Committed on 01/11/2012 at 00:46.
Pushed by ddomenichelli into branch 'filters'.

Merge branch 'kde-telepathy-0.5'

M  +5    -0    CMakeLists.txt
M  +1    -0    filters/emoticons/ktptextui_message_filter_emoticons.desktop
M  +1    -0    filters/formatting/ktptextui_message_filter_formatting.desktop
M  +1    -0    filters/images/ktptextui_message_filter_images.desktop
M  +1    -0    filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop
M  +4    -0    lib/ktptxtui_message_filter.desktop

http://commits.kde.org/telepathy-text-ui/4ff62a568a85b3753732cca2a11acd8c55fd4f61

diff --cc CMakeLists.txt
index 1d1d72b,ab7c85c..0f6ede4
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -35,9 -38,11 +37,12 @@@ if(TELEPATHY_LOGGER_QT4_FOUND
      include_directories(
          ${TELEPATHY_LOGGER_QT4_INCLUDE_DIRS}
      )
 +    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TELEPATHY_LOGGER_QT4_DEFINITIONS}" )
  endif()
  
+ configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ 
  add_subdirectory(lib)
  add_subdirectory(app)
  add_subdirectory(config)
diff --cc lib/ktptxtui_message_filter.desktop
index c7d0453,ff8b967..9984625
--- a/lib/ktptxtui_message_filter.desktop
+++ b/lib/ktptxtui_message_filter.desktop
@@@ -27,5 -23,8 +27,9 @@@ Comment[sr@latin]=Filter poruka za Tele
  Comment[sv]=Telepathy meddelandefilter för textbaserat användargränssnitt
  Comment[uk]=Фільтр повідомлень текстового інтерфейсу Telepathy
  Comment[x-test]=xxTelepathy Text-Ui Message Filterxx
 +Comment[zh_CN]=Telepathy 文本界面消息过滤器
  Comment[zh_TW]=Telepathy 文字介面訊息過濾器
+ 
+ # The ktp-text-ui plugin framework version for which the plugin is written
+ [PropertyDef::X-KTp-PluginInfo-Version]
+ Type=int

[prev in list] [next in list] [prev in thread] [next in thread]