commit fde79846b12b26249b4d325872943638e6cc7e00 Author: Sukhbir Singh sukhbir@torproject.org Date: Fri Jul 22 11:31:38 2016 -0400

Add browserMountPoints.inc for aboutDialog.xul on OS X --- projects/instantbird/browserMountPoints.inc | 12 ++++++++++++ projects/instantbird/build | 1 + projects/instantbird/config | 2 ++ 3 files changed, 15 insertions(+)

diff --git a/projects/instantbird/browserMountPoints.inc b/projects/instantbird/browserMountPoints.inc new file mode 100644 index 0000000..e4315b0 --- /dev/null +++ b/projects/instantbird/browserMountPoints.inc @@ -0,0 +1,12 @@ +<stringbundleset id="stringbundleset"/> + +<commandset id="mainCommandSet"/> +<commandset id="baseMenuCommandSet"/> +<commandset id="placesCommands"/> + +<broadcasterset id="mainBroadcasterSet"/> + +<keyset id="mainKeyset"/> +<keyset id="baseMenuKeyset"/> + +<menubar id="main-menubar"/> \ No newline at end of file diff --git a/projects/instantbird/build b/projects/instantbird/build index 29f6124..2701591 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -54,6 +54,7 @@ done

[% IF c("var/osx") -%] cp $rootdir/cert_override.txt im/app/profile +cp $rootdir/browserMountPoints.inc im/content/ [% END -%]

cp $rootdir/xmppRegister* im/content/ diff --git a/projects/instantbird/config b/projects/instantbird/config index fe98a83..2e53a6a 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -134,6 +134,8 @@ input_files: - filename: trac-16475.mozpatch - filename: OSX-package-as-tar.bz2.mozpatch enable: '[% c("var/osx") %]' + - filename: browserMountPoints.inc + enable: '[% c("var/osx") %]' - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig - name: python