From bee005ce7a5ee405f07c5b31a7f21aaedabd1787 Mon Sep 17 00:00:00 2001 From: Yana Stamcheva Date: Fri, 2 Dec 2011 13:25:12 +0000 Subject: [PATCH] Fixes incorrect appearing of sms icon in group chat interface. --- .../communicator/impl/gui/main/chat/ChatWritePanel.java | 4 +++- .../chat/conference/AdHocConferenceChatTransport.java | 8 +------- .../gui/main/chat/conference/ConferenceChatTransport.java | 8 +------- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java index 9e963fc5a..c5432fe86 100755 --- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java @@ -248,7 +248,9 @@ private void initSmsLabel(final JPanel centerPanel) .getImage("service.gui.icons.SEND_SMS_SELECTED"); smsLabel = new JLabel(smsIcon); - smsLabel.setVisible(true); + + // We hide the sms label until we know if the chat supports sms. + smsLabel.setVisible(false); smsMenuItem = new JCheckBoxMenuItem(GuiActivator.getResources() .getI18NString("service.gui.VIA_SMS")); diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/AdHocConferenceChatTransport.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/AdHocConferenceChatTransport.java index 0bc7d8d8d..195ea788c 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/AdHocConferenceChatTransport.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/AdHocConferenceChatTransport.java @@ -104,13 +104,7 @@ public boolean allowsInstantMessage() */ public boolean allowsSmsMessage() { - Object smsOpSet = adHocChatRoom.getParentProvider() - .getOperationSet(OperationSetSmsMessaging.class); - - if (smsOpSet != null) - return true; - else - return false; + return false; } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatTransport.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatTransport.java index 8bb9e0bb8..d4f196a45 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatTransport.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatTransport.java @@ -103,13 +103,7 @@ public boolean allowsInstantMessage() */ public boolean allowsSmsMessage() { - Object smsOpSet = chatRoom.getParentProvider() - .getOperationSet(OperationSetSmsMessaging.class); - - if (smsOpSet != null) - return true; - else - return false; + return false; } /**