Adds property to control modes in chat write panel.

src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java

@@ -97,6 +97,17 @@ public class ChatWritePanel
 
     private boolean smsMode = false;
 
+    /**
+     * Mode where we do not mix sending im and sms in one chat window.
+     */
+    private boolean disableMergedSmsMode = false;
+
+    /**
+     * Property to control merge sms mode.
+     */
+    private static final String MERGE_SMS_MODE_DISABLED_PROP
+        = "net.java.sip.communicator.impl.gui.MERGE_SMS_MODE_DISABLED";
+
     /**
      * A timer used to reset the transport resource to the bare ID if there was
      * no activity from this resource since a bunch of time.
@@ -145,6 +156,9 @@ public ChatWritePanel(ChatPanel panel)
         ConfigurationService configService =
             GuiActivator.getConfigurationService();
 
+        disableMergedSmsMode = configService.getBoolean(
+            MERGE_SMS_MODE_DISABLED_PROP, disableMergedSmsMode);
+
         String messageCommandProperty =
             "service.gui.SEND_MESSAGE_COMMAND";
         String messageCommand = configService.getString(messageCommandProperty);
@@ -458,6 +472,9 @@ public void changeSendCommand(boolean isEnter)
      */
     public void setSmsSelected(boolean selected)
     {
+        if(disableMergedSmsMode && isIMAllowed())
+            return;
+
         if((selected && !smsButton.isSelected())
             || (!selected && smsButton.isSelected()))
         {
@@ -1294,6 +1311,9 @@ public void run()
      */
     public void setSmsLabelVisible(boolean isVisible)
     {
+        if(disableMergedSmsMode && isIMAllowed())
+            return;
+
         // Re-init sms count properties.
         smsCharCount = 160;
         smsNumberCount = 1;

src/net/java/sip/communicator/impl/gui/utils/SMSManager.java

@@ -254,17 +254,15 @@ private static void sendSMSInternal(
             logger.error("Failed to send SMS.", ex);
 
             chatPanel.addMessage(
-                phoneNumber,
+                phoneNumber == null ? chatTransport.getName() : phoneNumber,
                 new Date(),
                 Chat.OUTGOING_MESSAGE,
                 message,
                 "text/plain");
 
             chatPanel.addErrorMessage(
-                phoneNumber,
-                GuiActivator.getResources()
-                    .getI18NString("service.gui.MSG_DELIVERY_ERROR",
-                        new String[]{ex.getMessage()}));
+                phoneNumber == null ? chatTransport.getName() : phoneNumber,
+                ex.getMessage());
         }
 
         chatPanel.refreshWriteArea();