[SCM] ktp-contact-applet packaging branch, upstream, updated. upstream/0.8.80-8-g5a8232e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=5a8232e

The following commit has been merged in the upstream branch:
commit 5a8232e05d4406e333553d55f10c68e81d2931c2
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Dec 16 16:18:30 2015 +0100

    Imported Upstream version 15.12.0
---
 CMakeLists.txt                                                  | 4 ++--
 contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml | 2 +-
 person/org.kde.person/metadata.desktop.cmake                    | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0c9b82..ca6785f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,8 +4,8 @@ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 
 # KDE Application Version, managed by release script
 set (KDE_APPLICATIONS_VERSION_MAJOR "15")
-set (KDE_APPLICATIONS_VERSION_MINOR "08")
-set (KDE_APPLICATIONS_VERSION_MICRO "3")
+set (KDE_APPLICATIONS_VERSION_MINOR "12")
+set (KDE_APPLICATIONS_VERSION_MICRO "0")
 
 set(KTP_DESKTOP_APPLETS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
 
diff --git a/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml
index 70f6c51..fd2aca4 100644
--- a/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml
+++ b/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml
@@ -120,7 +120,7 @@ Item {
             model: KTp.ContactsModel {
                 id: contactsModel
                 accountManager: telepathyManager.accountManager
-                presenceTypeFilterFlags: KTp.ContactsModel.HideAllOffline
+                presenceTypeFilterFlags: (filterLineEdit.text == "") ? KTp.ContactsModel.HideAllOffline : KTp.ContactsModel.DoNotFilterByPresence
                 globalFilterString: filterLineEdit.text
                 sortRoleString: "presenceType"
             }
diff --git a/person/org.kde.person/metadata.desktop.cmake b/person/org.kde.person/metadata.desktop.cmake
index e713d85..3579a55 100644
--- a/person/org.kde.person/metadata.desktop.cmake
+++ b/person/org.kde.person/metadata.desktop.cmake
@@ -15,6 +15,7 @@ Name[fr]=Personne
 Name[gl]=Persoa
 Name[it]=Persona
 Name[ko]=사람
+Name[lt]=Asmuo
 Name[nl]=Persoon
 Name[nn]=Person
 Name[pl]=Osoba

-- 
ktp-contact-applet packaging