From 95de7f628fde4be02570a662ff1cd77df4ff2a12 Mon Sep 17 00:00:00 2001 From: Sebastien Vincent Date: Wed, 14 Dec 2011 15:28:24 +0000 Subject: [PATCH] Fixes case where no protocol providers offer telephony support. --- .../main/contactlist/ContactListTreeCellRenderer.java | 10 ++++++++-- .../main/contactlist/MetaContactRightButtonMenu.java | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java index 8d63ada91..786ed93c6 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java @@ -780,9 +780,15 @@ private void initButtonsPanel(UIContact uiContact) // for SourceContact in history that do not support telephony, we // show the button but disabled + List providers + = GuiActivator.getOpSetRegisteredProviders( + OperationSetBasicTelephony.class, + null, + null); + if (telephonyContact != null || - uiContact.getDescriptor() instanceof SourceContact || - hasPhone) + uiContact.getDescriptor() instanceof SourceContact || + (hasPhone && providers.size() > 0)) { constraints.anchor = GridBagConstraints.WEST; constraints.fill = GridBagConstraints.NONE; diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java index a249ba156..379c6c1dd 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java @@ -532,7 +532,8 @@ private void init() sendSmsItem.setName("sendSms"); } - if (callContactMenu.getItemCount() > 1 || hasPhones) + if (callContactMenu.getItemCount() > 1 || + (hasPhones && callContactMenu.getItemCount() > 0)) { this.add(callContactMenu); }