Make sure that windows in xulapp have icon

processone · May 13, 2011 · 24cfbfb · 24cfbfb
1 parent a462673
commit 24cfbfb
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 2 deletions.
diff --git a/chrome/icons/default/default16.png b/chrome/icons/default/default16.png
diff --git a/chrome/icons/default/default32.png b/chrome/icons/default/default32.png
diff --git a/chrome/icons/default/default48.png b/chrome/icons/default/default48.png
diff --git a/chrome/icons/default/main.png b/chrome/icons/default/main.png
diff --git a/chrome/icons/default/updater.png b/chrome/icons/default/updater.png
diff --git a/chrome/oneteam/content/preferences.xul b/chrome/oneteam/content/preferences.xul
@@ -7,7 +7,7 @@
 
 <?xul-overlay href="chrome://oneteam/content/overlays/macMenuOverlay.xul"?>
 
-<prefwindow id="preferences"
+<prefwindow id="oneteam"
             windowtype="ot:preferences"
             title="_('Preferences')"
             onload="onLoad()"

diff --git a/chrome/icons/default/oneteam.icns → oneteam.icns b/chrome/icons/default/oneteam.icns → oneteam.icns
diff --git a/chrome/icons/default/oneteam.ico → oneteam.ico b/chrome/icons/default/oneteam.ico → oneteam.ico
diff --git a/tools/perl5lib/OneTeam/Builder/Filter/Saver/Dmg.pm b/tools/perl5lib/OneTeam/Builder/Filter/Saver/Dmg.pm
@@ -46,7 +46,7 @@ sub _prepare_files {
     $plist =~ s/\@\@buildid\@\@/$self->{buildid}->()/eig;
     print_to_file(catfile($content, 'Info.plist'), $plist);
 
-    copy(catfile(qw(chrome icons default oneteam.icns)),
+    copy(catfile(qw(oneteam.icns)),
          catfile($tmppfxdir, 'oneteam.icns'));
 
     dircopy($self->{xulrunner_path},