Bug 955536 - Add a pref to put conversations with contacts on hold by…

… default. r=aleth
mozilla · Oct 31, 2014 · e395189 · e395189
1 parent be2a12d
commit e395189
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/chat/chat-prefs.js b/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");

diff --git a/chat/components/src/imConversations.js b/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();