[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=df97c11

The following commit has been merged in the master branch:
commit df97c11ea31ddcd962ac43c5a60e42c5573d6558
Author: Francesco Nwokeka <francesco.nwokeka at gmail.com>
Date:   Tue Dec 13 13:21:43 2011 +0100

    Reorganized context menu actions
    
    moved the status actions outside the sub menu and move into a submenu the "launch contactlist" and
    "accounts kcm" actions
---
 presence/src/presence-applet.cpp | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/presence/src/presence-applet.cpp b/presence/src/presence-applet.cpp
index 3fe9aec..1a92e25 100644
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@ -106,8 +106,7 @@ void TelepathyPresenceApplet::setupAccountManager()
 
 void TelepathyPresenceApplet::setupContextMenuActions()
 {
-    // presence actions
-    KActionMenu *presenceMenu = new KActionMenu(i18n("Set presence"), this);
+    KActionMenu *moreMenu = new KActionMenu(i18n("More"), this);
 
     KAction *goOnlineAction = new KAction(KIcon("user-online"), i18n("Online"), this);
     KAction *goBusyAction = new KAction(KIcon("user-busy"), i18n("Busy"), this);
@@ -131,19 +130,19 @@ void TelepathyPresenceApplet::setupContextMenuActions()
     connect(showAccountManagerAction, SIGNAL(triggered()), this, SLOT(startAccountManager()));
     connect(showContactListAction, SIGNAL(triggered()), this, SLOT(startContactList()));
 
-    presenceMenu->addAction(goOnlineAction);
-    presenceMenu->addAction(goBusyAction);
-    presenceMenu->addAction(goAwayAction);
-    presenceMenu->addAction(goExtendedAwayAction);
-    presenceMenu->addAction(goHiddenAction);
-    presenceMenu->addAction(goOfflineAction);
-    presenceMenu->addSeparator();
-
-    m_contextActions.append(presenceMenu);
-    m_contextActions.append(presenceMenu->addSeparator());
-    m_contextActions.append(showAccountManagerAction);
-    m_contextActions.append(showContactListAction);
-    m_contextActions.append(presenceMenu->addSeparator());
+    m_contextActions.append(goOnlineAction);
+    m_contextActions.append(goBusyAction);
+    m_contextActions.append(goAwayAction);
+    m_contextActions.append(goExtendedAwayAction);
+    m_contextActions.append(goHiddenAction);
+    m_contextActions.append(goOfflineAction);
+    m_contextActions.append(moreMenu->addSeparator());
+
+    moreMenu->addAction(showAccountManagerAction);
+    moreMenu->addAction(showContactListAction);
+    m_contextActions.append(moreMenu);
+
+    m_contextActions.append(moreMenu->addSeparator());
 }
 
 void TelepathyPresenceApplet::onAccountManagerReady(Tp::PendingOperation* op)

-- 
ktp-contact-applet packaging