[tor-commits] [tor-messenger-build/master] Remove the "Records" groupbox from the preferences window

[sukhbir at torproject.org]

commit c0e14578b8d3f93ca235d54dfc7fda005beac63e
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Fri Jul 10 11:42:32 2015 -0400

    Remove the "Records" groupbox from the preferences window
    
    We don't want users enabling the logging of conversations by mistake so
    we remove the "Records" groupbox from the preferences window. Advanced
    users can still enable this through the config editor.
---
 projects/instantbird/config                    |    1 +
 projects/instantbird/log-preferences-xul.patch |   30 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index ed091f9..f984538 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -88,6 +88,7 @@ input_files:
   - filename: version.patch
   - filename: search-context-menu.patch
   - filename: search-preferences-xul.patch
+  - filename: log-preferences-xul.patch
   - filename: branding/blistWindow.png
   - filename: branding/blistWindow16.png
   - filename: branding/blistWindow48.png
diff --git a/projects/instantbird/log-preferences-xul.patch b/projects/instantbird/log-preferences-xul.patch
new file mode 100644
index 0000000..2c8f6a2
--- /dev/null
+++ b/projects/instantbird/log-preferences-xul.patch
@@ -0,0 +1,30 @@
+diff --git a/im/content/preferences/privacy.xul b/im/content/preferences/privacy.xul
+--- a/im/content/preferences/privacy.xul
++++ b/im/content/preferences/privacy.xul
+@@ -66,26 +66,6 @@
+                 preference="purple.conversations.im.send_typing"/>
+     </groupbox>
+ 
+-    <!-- Logs -->
+-    <groupbox id="logsGroup">
+-      <caption label="&logsGroup.label;"/>
+-      <checkbox id="logConversations" label="&logConversations.label;"
+-                accesskey="&logConversations.accesskey;"
+-                preference="purple.logging.log_ims"
+-                onsynctopreference="document.getElementById('purple.logging.log_chats').value = this.checked;"/>
+-      <checkbox id="logSystem" label="&logSystem.label;"
+-                accesskey="&logSystem.accesskey;"
+-                preference="purple.logging.log_system"/>
+-      <separator class="thin"/>
+-      <hbox align="center">
+-        <description control="openLogFolder"
+-                     flex="1">&logShowFolder.description;</description>
+-        <button id="openLogFolder" label="&logShowFolderButton.label;"
+-                accesskey="&logShowFolderButton.accesskey;"
+-                oncommand="gPrivacyPane.openLogFolder();"/>
+-      </hbox>
+-    </groupbox>
+-
+     <!-- Passwords -->
+     <groupbox id="passwordsGroup" orient="vertical">
+       <caption label="&passwords.label;"/>