The Navigation preference pane has long presented itself to users as General, but it's still named Navigation in the source hierarchy and in the app bundle's PreferencePanes folder. We should rename it General in those locations, too.

Also note bug 356204.

Owner's class changed to OrgMozillaCaminoPreferenceGeneral

Most of the work here is in a move, I'm not showing the move in the diff since it's kind of pointless. Here's the story: Corresponding CVS ops for: mv PreferencePanes/Navigation PreferencePanes/General mv PreferencePanes/General/Navigation.* PreferencePanes/General/General.* rm -r PreferencePanes/English.lproj/Navigation.nib put General.nib from attachment 293179 [details] in PreferencePanes/English.lproj mv Info-NavigationPrefPane.plist Info-GeneralPrefPane.plist Then: sed -e s/Chimera/Camino/ -e s/Navigation/General/ -e s/navigation/general/ in PreferencePanes/General/General.{h,mm} and Info-GeneralPrefPane.plist Apply patch

Note that this will fix bug 356204 for the General preference pane.

Comment on attachment 293182 [details] [diff] [review] Diff for the files that aren't moving (trunk) r=me

CVS operations relative to mozilla/camino: cvs remove \ PreferencePanes/Navigation/Navigation.h \ PreferencePanes/Navigation/Navigation.mm \ PreferencePanes/Navigation/Navigation.tiff \ PreferencePanes/Navigation/English.lproj/Localizable.strings.in \ PreferencePanes/Navigation/English.lproj/Navigation.nib/classes.nib \ PreferencePanes/Navigation/English.lproj/Navigation.nib/info.nib \ PreferencePanes/Navigation/English.lproj/Navigation.nib/keyedobjects.nib \ Info-NavigationPrefPane.plist cvs add \ PreferencePanes/General \ PreferencePanes/General/English.lproj \ PreferencePanes/General/English.lproj/General.nib cvs add \ PreferencePanes/General/General.h \ PreferencePanes/General/General.mm \ PreferencePanes/General/General.tiff \ PreferencePanes/General/English.lproj/Localizable.strings.in \ PreferencePanes/General/English.lproj/General.nib/classes.nib \ PreferencePanes/General/English.lproj/General.nib/info.nib \ PreferencePanes/General/English.lproj/General.nib/keyedobjects.nib \ Info-GeneralPrefPane.plist

The cvs adds for binary files were done with -kb, of course. Checked in on the trunk and MOZILLA_1_8_BRANCH for 1.6b1. If you're doing depend builds, do this in your objdir: rm -rf camino/build/Camino.build/*/NavigationPrefPane.build camino/build/*/Camino.app/Contents/PreferencePanes/Navigation.prefPane It's not harmful if you don't do this, you'll just wind up with a second General preference pane (the old one, named Navigation) at the end of the list.

Whoops, make that (relative to your objdir): rm -r \ camino/build/Camino.build/*/NavigationPrefPane.build \ camino/build/*/Camino.app/Contents/PreferencePanes/Navigation.prefPane \ dist/Camino.app/Contents/PreferencePanes/Navigation.prefPane