Bug 955536 - Add a pref to put conversations with contacts on hold by default. r=aleth

chat/chat-prefs.js

@@ -36,6 +36,10 @@ pref("messenger.conversations.autoAcceptChatInvitations", 1);
 // by the UI or if they can be put on hold instead.
 pref("messenger.conversations.alwaysClose", false);
 
+// Put conversations with contacts on hold by default (i.e. match the default
+// behavior for MUCs) as long as .alwaysClose is not true.
+pref("messenger.conversations.holdByDefault", false);
+
 pref("messenger.conversations.selections.magicCopyEnabled", true);
 pref("messenger.conversations.selections.ellipsis", "chrome://chat/locale/conversations.properties");
 pref("messenger.conversations.selections.systemMessagesTemplate", "chrome://chat/locale/conversations.properties");

chat/components/src/imConversations.js

@@ -206,7 +206,8 @@ UIConversation.prototype = {
 
     if (!Services.prefs.getBoolPref("messenger.conversations.alwaysClose") &&
         (this.isChat && !this.left ||
-         !this.isChat && this.unreadIncomingMessageCount != 0))
+         !this.isChat && (this.unreadIncomingMessageCount != 0 ||
+                          Services.prefs.getBoolPref("messenger.conversations.holdByDefault"))))
       return false;
 
     this.close();