commit 6df21ea934cc166a7d30d996c063db3792c093b2 Author: Sukhbir Singh sukhbir@torproject.org Date: Wed Nov 18 17:36:50 2015 -0500

Update Tor Messenger logo in Tor Launcher --- ChangeLog | 1 + projects/tor-launcher/build | 1 + projects/tor-launcher/config | 1 + projects/tor-launcher/default48.png | Bin 0 -> 1178 bytes projects/tor-launcher/logo.patch | 13 +++++++++++++ 5 files changed, 16 insertions(+)

diff --git a/ChangeLog b/ChangeLog index e265878..058bde8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ Tor Messenger 0.1.0b4 -- * Use the FIREFOX_42_0_RELEASE tag on mozilla-release * Use the THUNDERBIRD_42_0b2_RELEASE tag on comm-release * Bug 16489: Prevent automatic logins at startup + * Update Tor Messenger logo in Tor Launcher * Mac * Bug 16476: Themes preference is positioned incorrectly * Bug 17456: Hang in preferences menu diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index 50b73fd..8735d33 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -10,6 +10,7 @@ cp ../torbirdy.png src/chrome/skin/tbb-logo.png [% END -%] [% IF c("var/tor-messenger") -%] cp ../messenger.png src/chrome/skin/tbb-logo.png +cp ../default48.png src/chrome/skin/default48.png [% END -%] patch -p1 < ../logo.patch make package diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index a48b4e8..25c26b5 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -8,6 +8,7 @@ filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" input_files: - filename: torbirdy.png - filename: messenger.png + - filename: default48.png - filename: logo.patch - filename: controlport.patch content: '[% INCLUDE controlport.patch.tmpl -%]' diff --git a/projects/tor-launcher/default48.png b/projects/tor-launcher/default48.png new file mode 100644 index 0000000..8381428 Binary files /dev/null and b/projects/tor-launcher/default48.png differ diff --git a/projects/tor-launcher/logo.patch b/projects/tor-launcher/logo.patch index 156c0a7..00b273b 100644 --- a/projects/tor-launcher/logo.patch +++ b/projects/tor-launcher/logo.patch @@ -13,3 +13,16 @@ index 646baa6..66a89a3 100644 margin-right: 20px; }

+diff --git a/src/chrome/skin/progress.css b/src/chrome/skin/progress.css +index d718452..5706f4d 100644 +--- a/src/chrome/skin/progress.css ++++ b/src/chrome/skin/progress.css +@@ -23,7 +23,7 @@ dialog { + #tbb-icon { + list-style-image: url("chrome://torlauncher/skin/default48.png"); + width: 48px; +- height: 48px; ++ height: 36px; + } + + #progressDesc {