Remove obsolete cases.
authorSerge Gautherie <sgautherie.bz@free.fr>
Mon, 02 Nov 2009 23:41:38 +0100
changeset 4291 955b4e7327602ba09d320f6e0d04e73f917131a2
parent 4290 13f9b3618d2f809acce33a7330bb5b8805a70a74
child 4292 436dd822f88bbd58dcbdb6c26b2f8f52f2b8525e
push idunknown
push userunknown
push dateunknown
bugs523820
Remove obsolete cases. Bug 523820 - Remove old MOZILLA_1_9_1_BRANCH ifdefs from comm-central code; (Av1a-SM). r=kairo
suite/app/Makefile.in
suite/browser/browser-prefs.js
suite/build/Makefile.in
suite/common/src/nsSessionStore.js
suite/installer/removed-files.in
suite/installer/unix/packages
suite/installer/windows/packages
suite/shell/src/Makefile.in
suite/shell/src/nsWindowsShellService.cpp
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -150,21 +150,19 @@ NSDISTMODE = copy
 include $(topsrcdir)/config/config.mk
 
 ifdef _MSC_VER
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
 
 ifdef BUILD_STATIC_LIBS
 
-ifndef MOZILLA_1_9_1_BRANCH
 ifeq ($(OS_ARCH),WINNT)
 LIBS += ../shell/src/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
 endif
-endif
 
 include $(topsrcdir)/config/static-config.mk
 
 EXTRA_DEPS	+= \
 	$(STATIC_EXTRA_DEPS) \
 	$(NULL)
 DEFINES		+= $(STATIC_DEFINES)
 CPPSRCS		+= $(STATIC_CPPSRCS)
@@ -321,24 +319,17 @@ libs:: $(PROGRAM)
 	rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app --exclude English.lproj
 	mkdir -p $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
 	rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
 	sed -e "s/\@MOZ_APP_NAME\@/$(MOZ_APP_NAME)/" -e "s/\@MOZ_APP_DISPLAYNAME\@/$(MOZ_APP_DISPLAYNAME)/" -e "s/\@MOZ_APP_VERSION\@/$(MOZ_APP_VERSION)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist
 	sed -e "s/\@MOZ_APP_NAME\@/$(MOZ_APP_NAME)/" -e "s/\@MOZ_APP_DISPLAYNAME\@/$(MOZ_APP_DISPLAYNAME)/" -e "s/\@MOZ_APP_VERSION\@/$(MOZ_APP_VERSION)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj/InfoPlist.strings
 	rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/MacOS
 	rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
 	rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
-ifdef MOZILLA_1_9_1_BRANCH
-	mkdir -p $(DIST)/$(APP_NAME).app/Contents/Plug-Ins
-	rsync -a --copy-unsafe-links $(DIST)/package/PrintPDE.plugin $(DIST)/$(APP_NAME).app/Contents/Plug-Ins
-endif
 	cp -RL $(srcdir)/../branding/icons/mac/*.icns $(DIST)/$(APP_NAME).app/Contents/Resources/
-ifdef MOZILLA_1_9_1_BRANCH
-	cp -RL $(DIST)/package/mozillaSuite.rsrc $(DIST)/$(APP_NAME).app/Contents/Resources/$(PROGRAM).rsrc
-endif
 	printf APPLMOZZ > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
 #       remove CVS dirs from packaged app
 	find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \;
 
 clean clobber::
 	rm -rf $(DIST)/$(APP_NAME).app
 endif
 
--- a/suite/browser/browser-prefs.js
+++ b/suite/browser/browser-prefs.js
@@ -285,19 +285,16 @@ pref("browser.ssl_override_behavior", 2)
 pref("browser.zoom.full", true);
 
 pref("javascript.options.showInConsole",    true);
 
 pref("offline.startup_state",            0);
 pref("offline.send.unsent_messages",            0);
 pref("offline.download.download_messages",  0);
 
-#ifdef MOZILLA_1_9_1_BRANCH
-pref("browser.formfill.enable",             true);
-#endif
 pref("browser.formfill.expire_days",        180);
 
 // -- folders (Mac: these are binary aliases.)
 pref("mail.signature_file",             "");
 pref("mail.directory",                  "");
 pref("news.directory",                  "");
 pref("spellchecker.dictionaries.download.url", "chrome://branding/locale/brand.properties");
 
--- a/suite/build/Makefile.in
+++ b/suite/build/Makefile.in
@@ -97,28 +97,26 @@ EXTRA_DSO_LDOPTS += \
 	$(EXTRA_DSO_LIBS) \
 	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
 	$(LIBXUL_DIST)/../modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
 	$(MOZ_JS_LIBS) \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(MOZ_COMPONENT_LIBS) \
 	$(NULL)
 
-# On trunk we need to link the windows shell service into seamonkey.exe
+# We need to link the windows shell service into seamonkey.exe.
 ifdef BUILD_STATIC_LIBS
-ifndef MOZILLA_1_9_1_BRANCH
 BUILD_STATIC_SHELL = 1
 DEFINES += -DBUILD_STATIC_SHELL=1
 endif
-endif
 
 ifndef BUILD_STATIC_SHELL
 ifeq ($(OS_ARCH),WINNT)
 SHARED_LIBRARY_LIBS += ../shell/src/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
-ifeq (,$(MOZ_ENABLE_LIBXUL)$(MOZILLA_1_9_1_BRANCH))
+ifeq (,$(MOZ_ENABLE_LIBXUL))
 EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/lib/$(LIB_PREFIX)thebes.$(LIB_SUFFIX)
 endif
 endif
 endif
 
 # Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 EXTRA_DSO_LDOPTS += \
--- a/suite/common/src/nsSessionStore.js
+++ b/suite/common/src/nsSessionStore.js
@@ -1183,19 +1183,16 @@ SessionStoreService.prototype = {
    * @param aFullData
    *        always return privacy sensitive data (use with care)
    */
   _serializeSessionStorage:
     function sss_serializeSessionStorage(aTabData, aHistory, aDocShell, aFullData) {
     let storageData = {};
     let hasContent = false;
 
-#ifdef MOZILLA_1_9_1_BRANCH
-    aDocShell.QueryInterface(Components.interfaces.nsIDocShell_MOZILLA_1_9_1_SessionStorage);
-#endif
     for (let i = 0; i < aHistory.count; i++) {
       let uri = aHistory.getEntryAtIndex(i, false).URI;
       // sessionStorage is saved per origin (cf. nsDocShell::GetSessionStorageForURI)
       let domain = uri.spec;
       try {
         if (uri.host)
           domain = uri.prePath;
       }
@@ -2015,19 +2012,16 @@ SessionStoreService.prototype = {
    * restores all sessionStorage "super cookies"
    * @param aStorageData
    *        Storage data to be restored
    * @param aDocShell
    *        A tab's docshell (containing the sessionStorage)
    */
   _deserializeSessionStorage: function sss_deserializeSessionStorage(aStorageData, aDocShell) {
     let ioService = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService);
-#ifdef MOZILLA_1_9_1_BRANCH
-    aDocShell.QueryInterface(Components.interfaces.nsIDocShell_MOZILLA_1_9_1_SessionStorage);
-#endif
     for (let url in aStorageData) {
       let uri = ioService.newURI(url, null, null);
       let storage = aDocShell.getSessionStorageForURI(uri);
       for (let key in aStorageData[url]) {
         try {
           storage.setItem(key, aStorageData[url][key]);
         }
         catch (ex) { Components.utils.reportError(ex); } // throws e.g. for URIs that can't have sessionStorage
--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -35,57 +35,44 @@ chrome/icons/default/JSConsoleWindow.xpm
 chrome/icons/default/main-window.xpm
 chrome/icons/default/main-window16.xpm
 chrome/icons/default/messengerWindow.xpm
 chrome/icons/default/messengerWindow16.xpm
 chrome/icons/default/msgcomposeWindow.xpm
 chrome/icons/default/msgcomposeWindow16.xpm
 chrome/icons/default/venkman-window.xpm
 chrome/icons/default/venkman-window16.xpm
-#ifndef MOZILLA_1_9_1_BRANCH
 #ifndef MOZILLA_1_9_2_BRANCH
 chrome/reporter.jar
 chrome/reporter.manifest
 #endif
-#endif
 chrome/venkman.jar
 #ifdef XP_MACOSX
 updater.app/Contents/MacOS/updater.ini
 #endif
 components/airbag.xpt
 components/@DLL_PREFIX@bookmark@DLL_SUFFIX@
 components/bookmarks.xpt
 components/chatzilla-service.js
 components/crashreporter.xpt
 components/downloadmanager.xpt
-#ifdef MOZILLA_1_9_1_BRANCH
-components/GPSDGeolocationProvider.js
-#endif
 components/@DLL_PREFIX@myspell@DLL_SUFFIX@
 components/nsCloseAllWindows.js
 components/nsDictionary.js
 components/nsDownloadProgressListener.js
-#ifdef MOZILLA_1_9_1_BRANCH
-components/nsFormAutoComplete.js
-#endif
 components/nsInterfaceInfoToIDL.js
 components/nsKillAll.js
 components/nsLDAPPrefsService.js
-#ifdef MOZILLA_1_9_1_BRANCH
-components/nsPlacesAutoComplete.js
-#endif
 components/nsResetPref.js
 components/nsScriptableIO.js
 components/nsSetDefaultBrowser.js
 components/nsSetDefaultMail.js
 components/nsUnsetDefaultMail.js
 components/nsXmlRpcClient.js
-#ifndef MOZILLA_1_9_1_BRANCH
 components/@DLL_PREFIX@oji@DLL_SUFFIX@
-#endif
 components/progressDlg.xpt
 components/search.xpt
 components/sigonviewer.xpt
 components/sidebar.xpt
 components/@DLL_PREFIX@srchsvc@DLL_SUFFIX@
 components/suitetypeaheadfind.xpt
 components/@DLL_PREFIX@suitetypeaheadfind@DLL_SUFFIX@
 components/urlwidgt.xpt
@@ -98,37 +85,33 @@ components/wlltvwrs.dll
 #endif
 components/wallet.xpt
 components/walleteditor.xpt
 components/walletpreview.xpt
 components/@DLL_PREFIX@xmlextras@DLL_SUFFIX@
 #ifdef XP_WIN
 #ifdef MOZILLA_1_9_2_BRANCH
 components/xpinstall.dll
-#elifdef MOZILLA_1_9_1_BRANCH
-components/xpinstall.dll
 #else
 components/xpinstal.dll
 #endif
 #endif
 components/winhooks.xpt
 components/xml-rpc.xpt
 defaults/wallet/VcardSchema.tbl
 defaults/wallet/FieldSchema.tbl
 defaults/wallet/SchemaConcat.tbl
 defaults/wallet/DistinguishedSchema.tbl
 defaults/wallet/SchemaStrings.tbl
 defaults/wallet/PositionalSchema.tbl
 defaults/wallet/StateSchema.tbl
 #ifdef XP_WIN
 gksvggdiplus.dll
 #endif
-#ifdef MOZILLA_1_9_1_BRANCH
-greprefs.js
-#elifdef MOZILLA_1_9_2_BRANCH
+#ifdef MOZILLA_1_9_2_BRANCH
 greprefs.js
 #else
 greprefs/all.js
 greprefs/security-prefs.js
 greprefs/xpinstall.js
 greprefs/
 #endif
 modules/JSON.jsm
@@ -138,43 +121,34 @@ LICENSE
 #ifdef XP_WIN
 #ifdef MOZ_MEMORY
 Microsoft.VC80.CRT.manifest
 msvcm80.dll
 msvcp80.dll
 msvcr80.dll
 #else
 mozcrt19.dll
-#ifdef MOZILLA_1_9_1_BRANCH
-mozcpp19.dll
-#endif
 #endif
 xpicleanup.exe
 regxpcom.exe
-#ifndef MOZILLA_1_9_1_BRANCH
 components/nsPostUpdateWin.js
-#endif
 #else
 xpicleanup
 #endif
-#ifndef MOZILLA_1_9_1_BRANCH
 res/broken-image.gif
 #ifndef MOZILLA_1_9_2_BRANCH
 res/charsetalias.properties
 res/charsetData.properties
 #endif
-#endif
 res/cmessage.txt
-#ifndef MOZILLA_1_9_1_BRANCH
 res/loading-image.gif
 #ifndef MOZILLA_1_9_2_BRANCH
 res/unixcharset.properties
 res/wincharset.properties
 #endif
-#endif
 modules/dbViewWrapper.js
 modules/mailViewManager.js
 modules/quickSearchManager.js
 modules/searchSpec.js
 #ifdef XP_WIN
 extensions/p@m/install.rdf
 extensions/p@m/mozABConduit.dll
 extensions/p@m/PalmSyncInstall.exe
@@ -267,16 +241,14 @@ components/tkautoc.dll
 components/tkitcmps.dll
 components/xpautoc.dll
 components/xpc3250.dll
 components/xppref32.dll
 #endif
 ; MOZ_STATIC_BUILD
 #endif
 #ifdef XP_WIN
-#ifdef MOZILLA_1_9_1_BRANCH
-mozjs.dll
-#elifdef MOZILLA_1_9_2_BRANCH
+#ifdef MOZILLA_1_9_2_BRANCH
 mozjs.dll
 #else
 js3250.dll
 #endif
 #endif
--- a/suite/installer/unix/packages
+++ b/suite/installer/unix/packages
@@ -82,19 +82,16 @@ bin/components/libgkplugin.so
 bin/components/libhtmlpars.so
 bin/components/libi18n.so
 bin/components/libimglib2.so
 bin/components/libintlapp.so
 bin/components/libmork.so
 bin/components/libmozfind.so
 bin/components/libnecko.so
 bin/components/libnsappshell.so
-#ifdef MOZILLA_1_9_1_BRANCH
-bin/components/liboji.so
-#endif
 bin/components/libpermissions.so
 bin/components/libplaces.so
 bin/components/libpref.so
 bin/components/librdf.so
 bin/components/libremoteservice.so
 bin/components/libsatchel.so
 bin/components/libspellchecker.so
 bin/components/libstoragecomps.so
@@ -131,22 +128,20 @@ bin/components/autocomplete.xpt
 bin/components/autoconfig.xpt
 bin/components/caps.xpt
 bin/components/chardet.xpt
 bin/components/chrome.xpt
 bin/components/commandhandler.xpt
 bin/components/commandlines.xpt
 bin/components/composer.xpt
 bin/components/content_base.xpt
-#ifndef MOZILLA_1_9_1_BRANCH
 #ifndef MOZILLA_1_9_2_BRANCH
 bin/components/content_canvas.xpt
 bin/components/content_events.xpt
 #endif
-#endif
 bin/components/content_html.xpt
 bin/components/content_htmldoc.xpt
 bin/components/content_xmldoc.xpt
 bin/components/content_xslt.xpt
 bin/components/content_xtf.xpt
 bin/components/contentprefs.xpt
 bin/components/cookie.xpt
 bin/components/directory.xpt
@@ -159,19 +154,17 @@ bin/components/dom_css.xpt
 bin/components/dom_events.xpt
 bin/components/dom_geolocation.xpt
 bin/components/dom_html.xpt
 bin/components/dom_json.xpt
 bin/components/dom_loadsave.xpt
 bin/components/dom_offline.xpt
 bin/components/dom_range.xpt
 bin/components/dom_sidebar.xpt
-#ifndef MOZILLA_1_9_1_BRANCH
 bin/components/dom_smil.xpt
-#endif
 bin/components/dom_storage.xpt
 bin/components/dom_stylesheets.xpt
 bin/components/dom_svg.xpt
 bin/components/dom_threads.xpt
 bin/components/dom_traversal.xpt
 bin/components/dom_views.xpt
 bin/components/dom_xbl.xpt
 bin/components/dom_xpath.xpt
@@ -197,36 +190,30 @@ bin/components/jsdservice.xpt
 bin/components/layout_base.xpt
 bin/components/layout_printing.xpt
 bin/components/layout_xul.xpt
 bin/components/layout_xul_tree.xpt
 bin/components/locale.xpt
 bin/components/loginmgr.xpt
 bin/components/lwbrk.xpt
 bin/components/mimetype.xpt
-#ifdef MOZILLA_1_9_1_BRANCH
-bin/components/mozbrwsr.xpt
-#endif
 bin/components/mozfind.xpt
 bin/components/necko.xpt
 bin/components/necko_about.xpt
 bin/components/necko_cache.xpt
 bin/components/necko_cookie.xpt
 bin/components/necko_dns.xpt
 bin/components/necko_file.xpt
 bin/components/necko_ftp.xpt
 bin/components/necko_http.xpt
 bin/components/necko_res.xpt
 bin/components/necko_socket.xpt
 bin/components/necko_strconv.xpt
 bin/components/necko_viewsource.xpt
 bin/components/necko_wifi.xpt
-#ifdef MOZILLA_1_9_1_BRANCH
-bin/components/oji.xpt
-#endif
 bin/components/parentalcontrols.xpt
 bin/components/places.xpt
 bin/components/plugin.xpt
 bin/components/pref.xpt
 bin/components/prefetch.xpt
 bin/components/profile.xpt
 #ifdef MOZILLA_1_9_2_BRANCH
 bin/components/proxyObjInst.xpt
@@ -274,19 +261,17 @@ bin/components/xulapp.xpt
 bin/components/xuldoc.xpt
 bin/components/xultmpl.xpt
 bin/components/zipwriter.xpt
 
 ; JavaScript components
 bin/components/FeedConverter.js
 bin/components/FeedProcessor.js
 bin/components/FeedWriter.js
-#ifndef MOZILLA_1_9_1_BRANCH
 bin/components/GPSDGeolocationProvider.js
-#endif
 bin/components/jsconsole-clhandler.js
 bin/components/NetworkGeolocationProvider.js
 bin/components/nsAboutAbout.js
 bin/components/nsAboutCertError.js
 bin/components/nsAboutFeeds.js
 bin/components/nsAboutRights.js
 bin/components/nsAboutSessionRestore.js
 bin/components/nsAddonRepository.js
@@ -294,28 +279,24 @@ bin/components/nsBadCertHandler.js
 bin/components/nsBlocklistService.js
 bin/components/nsBrowserContentHandler.js
 bin/components/nsComposerCmdLineHandler.js
 bin/components/nsContentDispatchChooser.js
 bin/components/nsContentPrefService.js
 bin/components/nsDefaultCLH.js
 bin/components/nsExtensionManager.js
 bin/components/nsFilePicker.js
-#ifndef MOZILLA_1_9_1_BRANCH
 bin/components/nsFormAutoComplete.js
-#endif
 bin/components/nsHandlerService.js
 bin/components/nsHelperAppDlg.js
 bin/components/nsLivemarkService.js
 bin/components/nsLoginInfo.js
 bin/components/nsLoginManager.js
 bin/components/nsLoginManagerPrompter.js
-#ifndef MOZILLA_1_9_1_BRANCH
 bin/components/nsPlacesAutoComplete.js
-#endif
 bin/components/nsPlacesDBFlush.js
 bin/components/nsProgressDialog.js
 bin/components/nsProxyAutoConfig.js
 bin/components/nsSessionStartup.js
 bin/components/nsSessionStore.js
 bin/components/nsSidebar.js
 bin/components/nsSuiteDownloadManagerUI.js
 bin/components/nsSuiteGlue.js
@@ -392,58 +373,45 @@ bin/extensions/modern@themes.mozilla.org
 bin/extensions/modern@themes.mozilla.org/icon.png
 bin/extensions/modern@themes.mozilla.org/install.rdf
 bin/extensions/modern@themes.mozilla.org/preview.png
 
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
 bin/defaults/autoconfig/*
 bin/defaults/pref/*
-#ifdef MOZILLA_1_9_1_BRANCH
-bin/greprefs/*
-#elifdef MOZILLA_1_9_2_BRANCH
+#ifdef MOZILLA_1_9_2_BRANCH
 bin/greprefs/*
 #else
 bin/greprefs.js
 #endif
 
 ; [Layout Engine Resources]
 ; Style Sheets, Graphics and other Resources used by the layout engine.
 bin/res/arrow.gif
 bin/res/arrowd.gif
-#ifdef MOZILLA_1_9_1_BRANCH
-bin/res/broken-image.gif
-#else
 bin/res/broken-image.png
-#endif
-#ifdef MOZILLA_1_9_1_BRANCH
-bin/res/charsetalias.properties
-bin/res/charsetData.properties
-#elifdef MOZILLA_1_9_2_BRANCH
+#ifdef MOZILLA_1_9_2_BRANCH
 bin/res/charsetalias.properties
 bin/res/charsetData.properties
 #endif
 bin/res/contenteditable.css
 bin/res/designmode.css
 bin/res/dtd/*
 bin/res/EditorOverride.css
 bin/res/entityTables/*
 bin/res/fonts/*
 bin/res/forms.css
 bin/res/grabber.gif
 bin/res/hiddenWindow.html
 bin/res/html.css
 bin/res/html/*
 bin/res/langGroups.properties
 bin/res/language.properties
-#ifdef MOZILLA_1_9_1_BRANCH
-bin/res/loading-image.gif
-#else
 bin/res/loading-image.png
-#endif
 bin/res/mathml.css
 bin/res/quirk.css
 bin/res/svg.css
 bin/res/table-add-column-after-active.gif
 bin/res/table-add-column-after-hover.gif
 bin/res/table-add-column-after.gif
 bin/res/table-add-column-before-active.gif
 bin/res/table-add-column-before-hover.gif
@@ -456,19 +424,17 @@ bin/res/table-add-row-before-hover.gif
 bin/res/table-add-row-before.gif
 bin/res/table-remove-column-active.gif
 bin/res/table-remove-column-hover.gif
 bin/res/table-remove-column.gif
 bin/res/table-remove-row-active.gif
 bin/res/table-remove-row-hover.gif
 bin/res/table-remove-row.gif
 bin/res/ua.css
-#ifdef MOZILLA_1_9_1_BRANCH
-bin/res/unixcharset.properties
-#elifdef MOZILLA_1_9_2_BRANCH
+#ifdef MOZILLA_1_9_2_BRANCH
 bin/res/unixcharset.properties
 #endif
 bin/res/viewsource.css
 
 ; Personal Security Manager
 #ifndef MOZ_STATIC_BUILD
 bin/components/libpipboot.so
 bin/components/libpipnss.so
@@ -611,18 +577,13 @@ bin/extensions/inspector@mozilla.org/pla
 bin/extensions/inspector@mozilla.org/components/inspector-cmdline.js
 bin/extensions/inspector@mozilla.org/defaults/preferences/inspector.js
 
 #ifdef MOZILLA_1_9_2_BRANCH
 [reporter]
 bin/chrome/reporter.jar
 bin/chrome/reporter.manifest
 #endif
-#ifdef MOZILLA_1_9_1_BRANCH
-[reporter]
-bin/chrome/reporter.jar
-bin/chrome/reporter.manifest
-#endif
 
 [debugqa]
 bin/extensions/debugQA@mozilla.org/install.rdf
 bin/extensions/debugQA@mozilla.org/chrome.manifest
 bin/extensions/debugQA@mozilla.org/chrome/debugqa.jar
--- a/suite/installer/windows/packages
+++ b/suite/installer/windows/packages
@@ -25,19 +25,17 @@ bin\defaults\profile\chrome\*
 bin\dictionaries\*
 bin\searchplugins\*
 bin\uninstall\helper.exe
 bin\update.locale
 bin\updater.ini
 
 [xpcom]
 bin\components\jar50.dll
-#ifdef MOZILLA_1_9_1_BRANCH
-bin\js3250.dll
-#elifdef MOZILLA_1_9_2_BRANCH
+#ifdef MOZILLA_1_9_2_BRANCH
 bin\js3250.dll
 #else
 bin\mozjs.dll
 #endif
 #ifndef MOZ_STATIC_BUILD
 bin\mozz.dll
 #endif
 bin\nspr4.dll
@@ -49,20 +47,18 @@ bin\xpcom_core.dll
 bin\xul.dll
 #endif
 #ifndef MOZ_MEMORY
 bin\Microsoft.VC80.CRT.manifest
 bin\msvcm80.dll
 bin\msvcp80.dll
 bin\msvcr80.dll
 #else
+bin\mozcpp19.dll
 bin\mozcrt19.dll
-#ifndef MOZILLA_1_9_1_BRANCH
-bin\mozcpp19.dll
-#endif
 #endif
 
 [browser]
 ; files listed in xpcom (missing in this section) will be installed as part of the browser
 bin\README.txt,bin\readme.txt
 bin\license.txt
 bin\@MOZ_APP_NAME@.exe
 bin\application.ini
@@ -98,19 +94,16 @@ bin\components\gkplugin.dll
 bin\components\gkwidget.dll
 bin\components\i18n.dll
 bin\components\imgicon.dll
 bin\components\imglib2.dll
 bin\components\intlapp.dll
 bin\components\mork.dll
 bin\components\mozfind.dll
 bin\components\necko.dll
-#ifdef MOZILLA_1_9_1_BRANCH
-bin\components\oji.dll
-#endif
 bin\components\perms.dll
 bin\components\places.dll
 bin\components\rdf.dll
 bin\components\satchel.dll
 bin\components\spellchk.dll
 bin\components\strgcmps.dll
 bin\components\tkautoc.dll
 bin\components\tkitcmps.dll
@@ -123,19 +116,17 @@ bin\components\windowds.dll
 bin\components\xpautoc.dll
 bin\components\xpc3250.dll
 bin\components\xppref32.dll
 bin\components\zipwriter.dll
 ; ! MOZ_STATIC_BUILD
 #endif
 bin\components\jsd3250.dll
 bin\components\suite.dll
-#ifdef MOZILLA_1_9_1_BRANCH
-bin\components\xpinstal.dll
-#elifdef MOZILLA_1_9_2_BRANCH
+#ifdef MOZILLA_1_9_2_BRANCH
 bin\components\xpinstal.dll
 #else
 bin\components\xpinstall.dll
 #endif
 
 ; component xpts
 bin\components\accessibility.xpt
 bin\components\accessibility-msaa.xpt
@@ -146,33 +137,29 @@ bin\components\autocomplete.xpt
 bin\components\autoconfig.xpt
 bin\components\caps.xpt
 bin\components\chardet.xpt
 bin\components\chrome.xpt
 bin\components\commandhandler.xpt
 bin\components\commandlines.xpt
 bin\components\composer.xpt
 bin\components\content_base.xpt
-#ifndef MOZILLA_1_9_1_BRANCH
 #ifndef MOZILLA_1_9_2_BRANCH
 bin\components\content_canvas.xpt
 bin\components\content_events.xpt
 #endif
-#endif
 bin\components\content_html.xpt
 bin\components\content_htmldoc.xpt
 bin\components\content_xmldoc.xpt
 bin\components\content_xslt.xpt
 bin\components\content_xtf.xpt
 bin\components\contentprefs.xpt
 bin\components\cookie.xpt
 bin\components\directory.xpt
-#ifdef MOZILLA_1_9_1_BRANCH
-bin\components\docshell_base.xpt
-#elifdef MOZILLA_1_9_2_BRANCH
+#ifdef MOZILLA_1_9_2_BRANCH
 bin\components\docshell_base.xpt
 #else
 bin\components\docshell.xpt
 #endif
 bin\components\dom.xpt
 bin\components\dom_base.xpt
 bin\components\dom_canvas.xpt
 bin\components\dom_core.xpt
@@ -180,19 +167,17 @@ bin\components\dom_css.xpt
 bin\components\dom_events.xpt
 bin\components\dom_geolocation.xpt
 bin\components\dom_html.xpt
 bin\components\dom_json.xpt
 bin\components\dom_loadsave.xpt
 bin\components\dom_offline.xpt
 bin\components\dom_range.xpt
 bin\components\dom_sidebar.xpt
-#ifndef MOZILLA_1_9_1_BRANCH
 bin\components\dom_smil.xpt
-#endif
 bin\components\dom_storage.xpt
 bin\components\dom_stylesheets.xpt
 bin\components\dom_svg.xpt
 bin\components\dom_threads.xpt
 bin\components\dom_traversal.xpt
 bin\components\dom_views.xpt
 bin\components\dom_xbl.xpt
 bin\components\dom_xpath.xpt
@@ -217,36 +202,30 @@ bin\components\jsdservice.xpt
 bin\components\layout_base.xpt
 bin\components\layout_printing.xpt
 bin\components\layout_xul.xpt
 bin\components\layout_xul_tree.xpt
 bin\components\locale.xpt
 bin\components\loginmgr.xpt
 bin\components\lwbrk.xpt
 bin\components\mimetype.xpt
-#ifdef MOZILLA_1_9_1_BRANCH
-bin\components\mozbrwsr.xpt
-#endif
 bin\components\mozfind.xpt
 bin\components\necko.xpt
 bin\components\necko_about.xpt
 bin\components\necko_cache.xpt
 bin\components\necko_cookie.xpt
 bin\components\necko_dns.xpt
 bin\components\necko_file.xpt
 bin\components\necko_ftp.xpt
 bin\components\necko_http.xpt
 bin\components\necko_res.xpt
 bin\components\necko_socket.xpt
 bin\components\necko_strconv.xpt
 bin\components\necko_viewsource.xpt
 bin\components\necko_wifi.xpt
-#ifdef MOZILLA_1_9_1_BRANCH
-bin\components\oji.xpt
-#endif
 bin\components\parentalcontrols.xpt
 bin\components\places.xpt
 bin\components\plugin.xpt
 bin\components\pref.xpt
 bin\components\prefetch.xpt
 bin\components\profile.xpt
 bin\components\proxyObject.xpt
 bin\components\rdf.xpt
@@ -276,38 +255,34 @@ bin\components\widget.xpt
 bin\components\windowds.xpt
 bin\components\windowwatcher.xpt
 bin\components\xpautocomplete.xpt
 bin\components\xpcom_base.xpt
 bin\components\xpcom_components.xpt
 bin\components\xpcom_ds.xpt
 bin\components\xpcom_io.xpt
 bin\components\xpcom_system.xpt
-#ifdef MOZILLA_1_9_1_BRANCH
-bin\components\xpcom_thread.xpt
-#elifdef MOZILLA_1_9_2_BRANCH
+#ifdef MOZILLA_1_9_2_BRANCH
 bin\components\xpcom_thread.xpt
 #else
 bin\components\xpcom_threads.xpt
 #endif
 bin\components\xpcom_xpti.xpt
 bin\components\xpconnect.xpt
 bin\components\xpinstall.xpt
 bin\components\xulapp.xpt
 bin\components\xuldoc.xpt
 bin\components\xultmpl.xpt
 bin\components\zipwriter.xpt
 
 ; JavaScript components
 bin\components\FeedConverter.js
 bin\components\FeedProcessor.js
 bin\components\FeedWriter.js
-#ifndef MOZILLA_1_9_1_BRANCH
 bin\components\GPSDGeolocationProvider.js
-#endif
 bin\components\jsconsole-clhandler.js
 bin\components\NetworkGeolocationProvider.js
 bin\components\nsAboutAbout.js
 bin\components\nsAboutCertError.js
 bin\components\nsAboutFeeds.js
 bin\components\nsAboutRights.js
 bin\components\nsAboutSessionRestore.js
 bin\components\nsAddonRepository.js
@@ -320,32 +295,25 @@ bin\components\nsAxSecurityPolicy.js
 bin\components\nsBadCertHandler.js
 bin\components\nsBlocklistService.js
 bin\components\nsBrowserContentHandler.js
 bin\components\nsComposerCmdLineHandler.js
 bin\components\nsContentDispatchChooser.js
 bin\components\nsContentPrefService.js
 bin\components\nsDefaultCLH.js
 bin\components\nsExtensionManager.js
-#ifndef MOZILLA_1_9_1_BRANCH
 bin\components\nsFormAutoComplete.js
-#endif
 bin\components\nsHandlerService.js
 bin\components\nsHelperAppDlg.js
 bin\components\nsLivemarkService.js
 bin\components\nsLoginInfo.js
 bin\components\nsLoginManager.js
 bin\components\nsLoginManagerPrompter.js
-#ifndef MOZILLA_1_9_1_BRANCH
 bin\components\nsPlacesAutoComplete.js
-#endif
 bin\components\nsPlacesDBFlush.js
-#ifdef MOZILLA_1_9_1_BRANCH
-bin\components\nsPostUpdateWin.js
-#endif
 bin\components\nsProgressDialog.js
 bin\components\nsProxyAutoConfig.js
 bin\components\nsSessionStartup.js
 bin\components\nsSessionStore.js
 bin\components\nsSetDefault.js
 bin\components\nsSidebar.js
 bin\components\nsSuiteDownloadManagerUI.js
 bin\components\nsSuiteGlue.js
@@ -403,58 +371,45 @@ bin\extensions\modern@themes.mozilla.org
 bin\extensions\modern@themes.mozilla.org\icon.png
 bin\extensions\modern@themes.mozilla.org\install.rdf
 bin\extensions\modern@themes.mozilla.org\preview.png
 
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
 bin\defaults\autoconfig\*
 bin\defaults\pref\*
-#ifdef MOZILLA_1_9_1_BRANCH
-bin\greprefs\*
-#elifdef MOZILLA_1_9_2_BRANCH
+#ifdef MOZILLA_1_9_2_BRANCH
 bin\greprefs\*
 #else
 bin\greprefs.js
 #endif
 
 ; [Layout Engine Resources]
 ; Style Sheets, Graphics and other Resources used by the layout engine.
 bin\res\arrow.gif
 bin\res\arrowd.gif
-#ifdef MOZILLA_1_9_1_BRANCH
-bin\res\broken-image.gif
-#else
 bin\res\broken-image.png
-#endif
-#ifdef MOZILLA_1_9_1_BRANCH
-bin\res\charsetalias.properties
-bin\res\charsetData.properties
-#elifdef MOZILLA_1_9_2_BRANCH
+#ifdef MOZILLA_1_9_2_BRANCH
 bin\res\charsetalias.properties
 bin\res\charsetData.properties
 #endif
 bin\res\contenteditable.css
 bin\res\designmode.css
 bin\res\dtd\*
 bin\res\EditorOverride.css
 bin\res\entityTables\*
 bin\res\fonts\*
 bin\res\forms.css
 bin\res\grabber.gif
 bin\res\hiddenWindow.html
 bin\res\html.css
 bin\res\html\*
 bin\res\langGroups.properties
 bin\res\language.properties
-#ifdef MOZILLA_1_9_1_BRANCH
-bin\res\loading-image.gif
-#else
 bin\res\loading-image.png
-#endif
 bin\res\mathml.css
 bin\res\quirk.css
 bin\res\svg.css
 bin\res\table-add-column-after-active.gif
 bin\res\table-add-column-after-hover.gif
 bin\res\table-add-column-after.gif
 bin\res\table-add-column-before-active.gif
 bin\res\table-add-column-before-hover.gif
@@ -468,19 +423,17 @@ bin\res\table-add-row-before.gif
 bin\res\table-remove-column-active.gif
 bin\res\table-remove-column-hover.gif
 bin\res\table-remove-column.gif
 bin\res\table-remove-row-active.gif
 bin\res\table-remove-row-hover.gif
 bin\res\table-remove-row.gif
 bin\res\ua.css
 bin\res\viewsource.css
-#ifdef MOZILLA_1_9_1_BRANCH
-bin\res\wincharset.properties
-#elifdef MOZILLA_1_9_2_BRANCH
+#ifdef MOZILLA_1_9_2_BRANCH
 bin\res\wincharset.properties
 #endif
 
 ; Personal Security Manager
 #ifndef MOZ_STATIC_BUILD
 bin\components\pipboot.dll
 bin\components\pipnss.dll
 bin\components\pippki.dll
@@ -607,18 +560,13 @@ bin\extensions\inspector@mozilla.org\pla
 bin\extensions\inspector@mozilla.org\components\inspector-cmdline.js
 bin\extensions\inspector@mozilla.org\defaults\preferences\inspector.js
 
 #ifdef MOZILLA_1_9_2_BRANCH
 [reporter]
 bin\chrome\reporter.jar
 bin\chrome\reporter.manifest
 #endif
-#ifdef MOZILLA_1_9_1_BRANCH
-[reporter]
-bin\chrome\reporter.jar
-bin\chrome\reporter.manifest
-#endif
 
 [debugqa]
 bin\extensions\debugQA@mozilla.org\install.rdf
 bin\extensions\debugQA@mozilla.org\chrome.manifest
 bin\extensions\debugQA@mozilla.org\chrome\debugqa.jar
--- a/suite/shell/src/Makefile.in
+++ b/suite/shell/src/Makefile.in
@@ -26,33 +26,31 @@ REQUIRES = \
 
 ifeq ($(OS_ARCH),WINNT)
 CPPSRCS = nsWindowsShellService.cpp
 OS_LIBS         += $(call EXPAND_LIBNAME,ole32 version uuid shell32)
 
 EXTRA_COMPONENTS = nsSetDefault.js
 endif
 
-# On trunk we need to link the windows shell service into seamonkey.exe
-# We need to do this before we include config.mk and thus app-config.mk
+# We need to link the windows shell service into seamonkey.exe.
+# DEFINES needs to be set before config.mk is included,
+# because app-config.mk is loaded after config.mk reads DEFINES.
 ifdef BUILD_STATIC_LIBS
-ifndef MOZILLA_1_9_1_BRANCH
 BUILD_STATIC_SHELL = 1
 DEFINES += -DBUILD_STATIC_SHELL=1
 endif
-endif
 
 ifdef CPPSRCS
 LIBRARY_NAME = shellservice_s
 ifdef BUILD_STATIC_SHELL
 MOZILLA_INTERNAL_API = 1
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 MODULE_NAME = nsSuiteShellModule
 endif
 endif
 
 ifdef MOZ_MAIL_NEWS
 DEFINES += -DMOZ_MAIL_NEWS
 endif
 
 include $(topsrcdir)/config/rules.mk
-
--- a/suite/shell/src/nsWindowsShellService.cpp
+++ b/suite/shell/src/nsWindowsShellService.cpp
@@ -37,19 +37,16 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifdef MOZILLA_1_9_1_BRANCH
-#include "gfxIImageFrame.h"
-#endif
 #include "imgIContainer.h"
 #include "imgIRequest.h"
 #include "nsIDOMHTMLImageElement.h"
 #include "nsIImageLoadingContent.h"
 #include "nsIPrefService.h"
 #include "nsIPrefLocalizedString.h"
 #include "nsWindowsShellService.h"
 #include "nsIProcess.h"
@@ -576,57 +573,34 @@ nsWindowsShellService::SetShouldBeDefaul
   nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
   NS_ENSURE_SUCCESS(rv, rv);
   return prefs->SetIntPref("shell.checkDefaultApps", aApps);
 }
 
 static nsresult
 WriteBitmap(nsIFile* aFile, imgIContainer* aImage)
 {
-#ifdef MOZILLA_1_9_1_BRANCH
-  PRInt32 width, height;
-  nsCOMPtr<gfxIImageFrame> image;
-  nsresult rv = aImage->GetCurrentFrame(getter_AddRefs(image));
-  if (!image)
-    return rv;
-
-  image->GetWidth(&width);
-  image->GetHeight(&height);
-
-  PRUint8* bits;
-  PRUint32 length;
-  image->LockImageData();
-  image->GetImageData(&bits, &length);
-  if (!bits) {
-    image->UnlockImageData();
-    return NS_ERROR_FAILURE;
-  }
-
-  PRUint32 bpr;
-  image->GetImageBytesPerRow(&bpr);
-#else
   nsRefPtr<gfxImageSurface> image;
 #ifdef MOZILLA_1_9_2_BRANCH
   nsresult rv = aImage->CopyCurrentFrame(getter_AddRefs(image));
 #else
   nsresult rv = aImage->CopyFrame(imgIContainer::FRAME_CURRENT,
                                   imgIContainer::FLAG_SYNC_DECODE,
                                   getter_AddRefs(image));
 #endif
   NS_ENSURE_SUCCESS(rv, rv);
 
   PRInt32 width = image->Width();
   PRInt32 height = image->Height();
 
   PRUint8* bits = image->Data();
   PRUint32 length = image->GetDataSize();
   PRUint32 bpr = PRUint32(image->Stride());
-#endif // else MOZILLA_1_9_1_BRANCH
 
-  PRInt32 bitCount = bpr/width;
+  PRInt32 bitCount = bpr / width;
 
   // initialize these bitmap structs which we will later
   // serialize directly to the head of the bitmap file
   BITMAPINFOHEADER bmi;
   bmi.biSize = sizeof(BITMAPINFOHEADER);
   bmi.biWidth = width;
   bmi.biHeight = height;
   bmi.biPlanes = 1;
@@ -672,19 +646,16 @@ WriteBitmap(nsIFile* aFile, imgIContaine
           }
         } while (i != 0);
       }
     }
 
     stream->Close();
   }
 
-#ifdef MOZILLA_1_9_1_BRANCH
-  image->UnlockImageData();
-#endif
   return rv;
 }
 
 NS_IMETHODIMP
 nsWindowsShellService::SetDesktopBackground(nsIDOMElement* aElement,
                                             PRInt32 aPosition)
 {
   nsresult rv;