[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=4c33bf9

The following commit has been merged in the master branch:
commit 4c33bf98718a251d10166a0fe271beaeaeaefe3e
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Sat Mar 31 16:29:10 2012 +0200

    Make block-contact a menu action and do not display it in default toolbar
---
 app/chatwindow.rc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/chatwindow.rc b/app/chatwindow.rc
index 54cf882..6f4fba3 100644
--- a/app/chatwindow.rc
+++ b/app/chatwindow.rc
@@ -16,6 +16,8 @@
    <Action name="video-call"/>
    <Action name="send-file"/>
    <Action name="share-desktop"/>
+   <Separator />
+   <Action name="block-contact"/>
   </Menu>
   <Menu name="settings"/>
   <Menu name="help"/>
@@ -25,7 +27,6 @@
   <text>Main Toolbar</text>
   <Action name="invite-to-chat"/>
   <Separator />
-  <Action name="block-contact"/>
   <Action name="audio-call"/>
   <Action name="video-call"/>
   <Action name="send-file"/>

-- 
ktp-text-ui packaging