From 415f7691ccaaa4437d33df4adfe553d54776cb00 Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Thu, 22 Aug 2013 16:22:03 +0300
Subject: [PATCH] Do not create persistent chatrooms when inviting contacts to
 existing one to one chat.

---
 .../communicator/impl/gui/main/chat/ChatPanel.java  |  3 ++-
 .../main/chat/conference/ConferenceChatManager.java | 13 +++++++++----
 .../createforms/CreateChatRoomDialog.java           |  3 ++-
 .../createforms/CreateChatRoomWizard.java           |  3 ++-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
index f0818ef82..7651e7cad 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
@@ -2479,7 +2479,8 @@ public void inviteContacts( ChatTransport inviteChatTransport,
                     = conferenceChatManager.createChatRoom(
                         inviteChatTransport.getProtocolProvider(),
                         chatContacts,
-                        reason);
+                        reason,
+                        false);
 
                 conferenceChatSession
                     = new ConferenceChatSession(this, chatRoomWrapper);
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java
index f02dd3b8f..b5b0fa15e 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java
@@ -720,14 +720,17 @@ public void joinChatRoom(   ChatRoomWrapper chatRoomWrapper,
      * @param protocolProvider the parent protocol provider.
      * @param contacts the contacts invited when creating the chat room.
      * @param reason
+     * @param persistent is the room persistent
      * @return the <tt>ChatRoomWrapper</tt> corresponding to the created room
      */
     public ChatRoomWrapper createChatRoom(
         ProtocolProviderService protocolProvider,
         Collection<String> contacts,
-        String reason)
+        String reason,
+        boolean persistent)
     {
-        return this.createChatRoom(null, protocolProvider, contacts, reason);
+        return this.createChatRoom(
+            null, protocolProvider, contacts, reason, persistent);
     }
 
     /**
@@ -739,16 +742,18 @@ public ChatRoomWrapper createChatRoom(
      * @param protocolProvider the parent protocol provider.
      * @param contacts the contacts invited when creating the chat room.
      * @param reason
+     * @param persistent is the room persistent
      * @return the <tt>ChatRoomWrapper</tt> corresponding to the created room
      */
     public ChatRoomWrapper createChatRoom(
         String roomName,
         ProtocolProviderService protocolProvider,
         Collection<String> contacts,
-        String reason)
+        String reason,
+        boolean persistent)
     {
         return createChatRoom(
-            roomName, protocolProvider, contacts, reason, true, true);
+            roomName, protocolProvider, contacts, reason, true, persistent);
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomDialog.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomDialog.java
index beb66238c..87875883c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomDialog.java
@@ -106,7 +106,8 @@ public void actionPerformed(ActionEvent e)
                 .createChatRoom(chatRoomName,
                                 chatRoomProvider.getProtocolProvider(),
                                 null,
-                                "");
+                                "",
+                                true);
         }
         this.dispose();
     }
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomWizard.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomWizard.java
index 00488b11e..92026346f 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomWizard.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomWizard.java
@@ -66,7 +66,8 @@ public void wizardFinished(WizardEvent e)
                 .createChatRoom(newChatRoom.getChatRoomName(),
                                 newChatRoom.getProtocolProvider(),
                                 null,
-                                "");
+                                "",
+                                true);
         }
     }
 }