This bug is to merge the patches from bug 156698, bug 156695, and bug 156701 (branch bugs) to the trunk.

patch from bug 156698 that needs to be merged with the trunk.

Comment on attachment 91860 [details] [diff] [review] patch v1.0 this patch already has r= and sr=. I'll be attaching updated patches that works with the trunk.

Do I need to bring across the patches for the uninstaller from the branch bug? Also, I don't see any default_info.ini here. That file needs to be different for mozilla than it is for ns. I notice, in particular, that mozilla doesn't install an icon on the desktop for mail/news. It might be that mozilla should setup the SHOWICON registry setting to display the mail/news icon on the desktop anyway. If users specifically check the new XP checkbox for mail that says "Show Icon" they probably should get the icon on the desktop. That means modifying mail.jst also. (David, I know you tried to bring this issue up a few days back but it is just now coming together in my thinking.)

curt, yeah, if you have time. I'm gonna try to get another big patch that works for mozilla. If you can't, it's okay. I know what to do. Just let me know.

Comment on attachment 91937 [details] [diff] [review] patch to mozila/xpinstall/packager/windows For the following, for mail.jst only: >+ subkey = "Software\\Clients\\Mail\\$ProductNameNoVersion$\\InstallInfo"; >+ valname = "IconsVisible"; >+ winreg.setValueNumber(subkey, valname, 1); I think we want IconsVisible to be set to 0, not 1, since we aren't installing the mail icon. Further, I believe we do want to add the line that creates the mail shortcut in the defaults\shortcut folder. That way, if the user does use the operating system to say "Show Icons" for mail a shortcut will show up on the desktop. Just because we didn't install a shortcut doesn't mean that one should not be created if the user asks for it.

There's only one image used by mozilla, the teal lizard thingy. So I should go ahead and use that icon and change the description of the shortcut to be "Mail" the same way it is in the start menu?

Comment on attachment 92029 [details] default_info.ini for ns moved to bugscape: http://bugscape.mcom.com/show_bug.cgi?id=17945

Comment on attachment 91938 [details] [diff] [review] patch to ns/xpinstall/packager/windows moved to bugscape: http://bugscape.mcom.com/show_bug.cgi?id=17945

Okay, Sean convinced me not to mess with what we are currently doing with shortcuts. Instead I've opened bug #158409 to decide what the right long term solution for supporting the "Show Icons" option should be.

This patch is a combination of all the previous patches attached to this bug. There's a difference between this Big patch (for the TRUNK) as compared to the one landed on the BRANCH, is that: * moved all the registry code for browser.xpi and mail.xpi from config.it to their corresponding .jst files. * updated the mozilla tree's browser.jst, mail.jst, and config.it. BRANCH did not have this change. The changes are similar, if not exactly the same, as what has done for the ns tree's .jst and .it files.

forgot to take into account the first part in comment #8. IconsVisible for mail.js will now be initially set to 0.

Comment on attachment 92282 [details] [diff] [review] patch v2.1 r= dprice for the changes in the .jst and .it files

Comment on attachment 92282 [details] [diff] [review] patch v2.1 sr=dveditz

Comment on attachment 92282 [details] [diff] [review] patch v2.1 a=asa (on behalf of drivers) for checkin to 1.1

patch checked in to TRUNK.

Tested with trunk build 2002091304- sorry was not aware of this bug before yesterday If you answer yes to 'default browser'? - Mozilla is entered in area of screen topleft on Start Menu (as is mail when you say yes to default mail. However, when you go to 'set program defaults'- any selection (microsoft, non-microsoft or custom- it does not show Mozilla as one of the browsers. Leaving the selection 'use my default browser' will add appropriate registry keys for mozilla. It appears that only in this screen is Mozilla not showing as a separater browser for selecting as default reopening bug

*** Bug 168569 has been marked as a duplicate of this bug. ***

what's the status on this one? What's missing?

Sean, Are you still working on this ?

Marking as FIXED based on Comment 21