[SCM] ktp-contact-applet packaging branch, upstream, updated. upstream/0.8.80-10-gd9e83f0

[Maximiliano Curia]

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

The following commit has been merged in the upstream branch:
commit 6b7664dd5326c8c27f80453328bf003494523a5b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jan 29 11:22:24 2016 +0100

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca6785f..1828e70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ 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 "12")
-set (KDE_APPLICATIONS_VERSION_MICRO "0")
+set (KDE_APPLICATIONS_VERSION_MICRO "1")
 
 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/ListContactDelegate.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml
index 82012c2..6347285 100644
--- a/contactlist/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml
+++ b/contactlist/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml
@@ -25,7 +25,6 @@ import org.kde.kquickcontrolsaddons 2.0 as ExtraComponents
 PlasmaComponents.ListItem {
     id: delegate
     enabled: true
-    property bool isCurrent: delegate.ListView.view.currentIndex==index
 
     ExtraComponents.QPixmapItem {
         id: avatarLabel
@@ -46,11 +45,6 @@ PlasmaComponents.ListItem {
         text: model.display
         elide: Text.ElideRight
 
-        //consider this a workaround, because the breeze's listitem doesn't
-        //display very clearly what's the current item
-        styleColor: theme.viewFocusColor
-        style: delegate.isCurrent ? Text.Raised : Text.Normal
-
         anchors {
             left: avatarLabel.right
             right: presenceLabel.left
diff --git a/person/org.kde.person/metadata.desktop.cmake b/person/org.kde.person/metadata.desktop.cmake
index 3579a55..1bc6f71 100644
--- a/person/org.kde.person/metadata.desktop.cmake
+++ b/person/org.kde.person/metadata.desktop.cmake
@@ -18,7 +18,7 @@ Name[ko]=사람
 Name[lt]=Asmuo
 Name[nl]=Persoon
 Name[nn]=Person
-Name[pl]=Osoba
+Name[pl]=Ludzie
 Name[pt]=Pessoa
 Name[pt_BR]=Pessoa
 Name[ro]=Persoană
@@ -52,7 +52,7 @@ Comment[it]=Rende una persona facilmente accessibile
 Comment[ko]=특정 사람과 빠르게 대화합니다
 Comment[nl]=Maakt een persoon gemakkelijk toegankelijk
 Comment[nn]=Gjer ein person lett tilgjengeleg
-Comment[pl]=Czyni osobę łatwo dostępną
+Comment[pl]=Czyni ludzi łatwo dostępnymi
 Comment[pt]=Torna uma pessoa facilmente acessível
 Comment[pt_BR]=Torna uma pessoa facilmente acessível
 Comment[ro]=Face o persoană să fie accesibilă ușor

-- 
ktp-contact-applet packaging