[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 4690eb2d407b37a41201e4bf7c4c99c5f3220189
Merge: 76280f437d3d388a301f926880501d36cde5473b c9e76b75a2f0f4822b7ca8be2b6a5fba89c9f261
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue May 14 14:42:54 2013 +0200

    Merge branch 'kde-telepathy-0.6'
    
    Conflicts:
    	chat/org.kde.ktp-chat/contents/ui/main.qml

 chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml           | 1 -
 chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml | 2 +-
 chat/org.kde.ktp-chat/contents/ui/main.qml                 | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --cc chat/org.kde.ktp-chat/contents/ui/main.qml
index 1451aaa,cea702b..b6fdfd6
--- a/chat/org.kde.ktp-chat/contents/ui/main.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/main.qml
@@@ -123,7 -111,9 +123,10 @@@ Grid 
              height: base.itemHeight
              popupSide: base.popupSide
          }
 -        model: handler.conversations
 +        model: conversationsModel
+         onCountChanged: if(base.currentIndex>=conversationsView.count) {
+             base.currentIndex = -1;
+         }
      }
  }
 +

-- 
ktp-contact-applet packaging