[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=9c13050

The following commit has been merged in the master branch:
commit 9c130508f64c2ffe798e85e18b3418cac82227f4
Merge: 45aefee03f39f34ea6269c243042d005576c768d 62967536fb8259d1d5660b0cec44142f35bcbb40
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Mar 30 19:04:12 2015 +0200

    Merge branch 'Applications/15.04'
    
    Conflicts:
    	context-menu.cpp

 context-menu.cpp | 70 +++++++++++++++++++++++++++-----------------------------
 1 file changed, 34 insertions(+), 36 deletions(-)

diff --cc context-menu.cpp
index 1f1ecb3,e863cca..952b73a
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@@ -249,41 -247,42 +247,41 @@@ QMenu* ContextMenu::contactContextMenu(
  
      menu->addSeparator();
  
- 
-     if (contact->manager()->canRequestPresenceSubscription()) {
-         if (contact->subscriptionState() != Tp::Contact::PresenceStateYes) {
-             action = menu->addAction(i18n("Re-request Contact Authorization"));
-             connect(action, SIGNAL(triggered(bool)), SLOT(onRerequestAuthorization()));
+     if (!contact.isNull()) {
+         if (contact->manager()->canRequestPresenceSubscription()) {
+             if (contact->subscriptionState() != Tp::Contact::PresenceStateYes) {
+                 action = menu->addAction(i18n("Re-request Contact Authorization"));
+                 connect(action, SIGNAL(triggered(bool)), SLOT(onRerequestAuthorization()));
+             }
          }
-     }
-     if (contact->manager()->canAuthorizePresencePublication()) {
-         if (contact->publishState() != Tp::Contact::PresenceStateYes) {
-             action = menu->addAction(i18n("Resend Contact Authorization"));
-             connect(action, SIGNAL(triggered(bool)), SLOT(onResendAuthorization()));
+         if (contact->manager()->canAuthorizePresencePublication()) {
+             if (contact->publishState() != Tp::Contact::PresenceStateYes) {
+                 action = menu->addAction(i18n("Resend Contact Authorization"));
+                 connect(action, SIGNAL(triggered(bool)), SLOT(onResendAuthorization()));
+             }
          }
-     }
  
-     action = menu->addSeparator(); //prevent two seperators in a row
- 
-     if (contact->isBlocked()) {
-         action = menu->addAction(i18n("Unblock Contact"));
-         connect(action, SIGNAL(triggered(bool)), SLOT(onUnblockContactTriggered()));
-         action->setEnabled(contact->manager()->canBlockContacts());
-     } else {
-         action = menu->addAction(i18n("Block Contact"));
-         connect(action, SIGNAL(triggered(bool)), SLOT(onBlockContactTriggered()));
-         action->setEnabled(contact->manager()->canBlockContacts());
-     }
+         action = menu->addSeparator(); //prevent two seperators in a row
  
-     // remove contact action, must be QAction because that's what menu->addAction returns
+         if (contact->isBlocked()) {
+             action = menu->addAction(i18n("Unblock Contact"));
+             connect(action, SIGNAL(triggered(bool)), SLOT(onUnblockContactTriggered()));
+             action->setEnabled(contact->manager()->canBlockContacts());
+         } else {
+             action = menu->addAction(i18n("Block Contact"));
+             connect(action, SIGNAL(triggered(bool)), SLOT(onBlockContactTriggered()));
+             action->setEnabled(contact->manager()->canBlockContacts());
+         }
  
-     //TODO find an "if canRemove"
-     QAction *removeAction = menu->addAction(QIcon::fromTheme("list-remove-user"), i18n("Remove Contact..."));
-     connect(removeAction, SIGNAL(triggered(bool)), this, SLOT(onDeleteContactTriggered()));
+         // remove contact action, must be QAction because that's what menu->addAction returns
 -
+         //TODO find an "if canRemove"
 -        QAction *removeAction = menu->addAction(QIcon::fromTheme("list-remove-user"), i18n("Remove Contact"));
++        QAction *removeAction = menu->addAction(QIcon::fromTheme("list-remove-user"), i18n("Remove Contact..."));
+         connect(removeAction, SIGNAL(triggered(bool)), this, SLOT(onDeleteContactTriggered()));
  
-     menu->addSeparator();
+         menu->addSeparator();
+     }
  
 -    action = menu->addAction(i18n("Show Info..."));
 +    action = menu->addAction(i18n("Show Contact Information..."));
      action->setIcon(QIcon::fromTheme(""));
      connect(action, SIGNAL(triggered()), SLOT(onShowInfoTriggered()));
  

-- 
ktp-contact-list packaging