Brought sunbird code up to date with firefox code

2004-04-07 18:55:08 +00:00 · 2004-04-07 18:55:08 +00:00 · 4f82e783d2
--- a/calendar/resources/content/aboutDialog.xul
+++ b/calendar/resources/content/aboutDialog.xul
@ -71,12 +71,6 @@
      <spacer flex="1"/>
      <textbox id="userAgent" multiline="true" readonly="true" cols="60"/>
      <spacer flex="1"/>
-      /* XXXBlake This is a workaround.  I find that if I try to use href and I open
-                  About as a modal dialog, a new browser window opens when I click the link
-                  but the page doesn't load in it. */
-      <html:a onclick="window.openDialog('chrome://browser/content', 'Mozilla Sunbird', 'chrome,all,dialog=no', '&copyrightLink;');"
-              href=""
-              style="display: block; color: blue; text-decoration: underline;">&copyright;</html:a>
      <spacer flex="1"/>
    </vbox>
    <separator class="groove"/>
--- a/calendar/sunbird/Makefile.in
+++ b/calendar/sunbird/Makefile.in
@ -56,6 +56,7 @@ sunbirddirs::
 	mkdir -p ./MozillaSunbird/chrome/overlayinfo/messenger/content/
 	mkdir -p ./MozillaSunbird/chrome/overlayinfo/browser/content/
 	mkdir -p ./MozillaSunbird/components/
+	mkdir -p ./MozillaSunbird/greprefs
 	mkdir -p ./MozillaSunbird/defaults/pref
 	mkdir -p ./MozillaSunbird/defaults/profile/chrome
 	mkdir -p ./MozillaSunbird/defaults/profile/US/chrome
@ -102,11 +103,9 @@ endif
 	cp $(topsrcdir)/dist/bin/chrome/overlayinfo/navigator/content/overlays.rdf ./MozillaSunbird/chrome/overlayinfo/navigator/content
 	cp $(topsrcdir)/dist/bin/chrome/overlayinfo/browser/content/overlays.rdf ./MozillaSunbird/chrome/overlayinfo/browser/content
 	cp $(topsrcdir)/dist/bin/chrome/overlayinfo/messenger/content/overlays.rdf ./MozillaSunbird/chrome/overlayinfo/messenger/content
-	cp $(topsrcdir)/dist/bin/defaults/pref/security-prefs.js ./MozillaSunbird/defaults/pref
+	cp $(topsrcdir)/dist/bin/greprefs/security-prefs.js ./MozillaSunbird/greprefs/pref
 	cp $(topsrcdir)/dist/bin/defaults/pref/all.js ./MozillaSunbird/defaults/pref
-	cp $(topsrcdir)/dist/bin/defaults/pref/mailnews.js ./MozillaSunbird/defaults/pref
-	cp $(topsrcdir)/dist/bin/defaults/pref/editor.js ./MozillaSunbird/defaults/pref
-	cp $(topsrcdir)/dist/bin/defaults/pref/xpinstall.js ./MozillaSunbird/defaults/pref
+	cp $(topsrcdir)/dist/bin/greprefs/xpinstall.js ./MozillaSunbird/greprefs
 	cp $(topsrcdir)/dist/bin/defaults/profile/chrome/userContent-example.css ./MozillaSunbird/defaults/profile/chrome
 	cp $(topsrcdir)/dist/bin/defaults/profile/chrome/userChrome-example.css ./MozillaSunbird/defaults/profile/chrome
 	cp $(topsrcdir)/dist/bin/defaults/profile/US/chrome/userContent-example.css ./MozillaSunbird/defaults/profile/US/chrome
@ -295,7 +294,6 @@ sunbirdunix::
 	cp $(topsrcdir)/dist/bin/components/nsFilePicker.js ./MozillaSunbird/components
 	cp $(topsrcdir)/dist/bin/mozilla-xremote-client ./MozillaSunbird/
 	cp $(topsrcdir)/dist/bin/run-mozilla.sh ./MozillaSunbird/
-	cp $(topsrcdir)/dist/bin/defaults/pref/unix.js ./MozillaSunbird/defaults/pref
 	cp $(topsrcdir)/dist/bin/res/unixcharset.properties ./MozillaSunbird/res
 	cp $(topsrcdir)/dist/bin/res/sample.unixpsfonts.properties ./MozillaSunbird/res

--- a/calendar/sunbird/app/Makefile.in
+++ b/calendar/sunbird/app/Makefile.in
@ -46,7 +46,7 @@ include $(DEPTH)/config/autoconf.mk

 #Remove for sunbird DIRS		= profile

-PREF_FILES = $(srcdir)/profile/all.js
+PREF_JS_EXPORTS = $(srcdir)/profile/sunbird.js

 ifeq ($(USE_SHORT_LIBNAME), 1)
 PROGRAM = MozillaSunbird$(BIN_SUFFIX)
@ -67,6 +67,10 @@ ifdef BUILD_STATIC_LIBS
 STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
 endif

+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+TK_LIBS := -framework Cocoa $(TK_LIBS)
+endif
+
 LIBS = \
 	$(STATIC_COMPONENTS_LINKER_PATH) \
 	$(EXTRA_DSO_LIBS) \
@ -120,17 +124,16 @@ endif
 ifdef BUILD_STATIC_LIBS
 RCFLAGS += -DMOZ_STATIC_BUILD
 endif
+ifdef DEBUG
+RCFLAGS += -DDEBUG
+endif
 endif

 ifeq ($(OS_ARCH),OS2)
 RESFILE=splashos2.res
 ifdef BUILD_STATIC_LIBS
 EXE_DEF_FILE = browser.def
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-OS_LIBS += libuls.lib libconv.lib
-else
-OS_LIBS += -llibuni -luconv
-endif
+RCFLAGS += -d MOZ_STATIC_BUILD -i $(DIST)/include/widget
 endif
 endif

@ -149,6 +152,10 @@ LIBS	+= -framework QuickTime -framework IOKit
 endif
 endif

+ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
+LIBS += -lphexlib
+endif
+
 ifeq ($(OS_ARCH),WINNT)
 #
 # Control the default heap size.
@ -181,15 +188,16 @@ $(EXE_DEF_FILE):
 	@echo 	WinRemoveProperty		= PMMERGE.5451 >>$(EXE_DEF_FILE)
 	@echo 	WinSetProperty			= PMMERGE.5452 >>$(EXE_DEF_FILE)

-LDFLAGS += /NOE
+LDFLAGS += -Zlinker /NOE
 endif
 endif

 ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
 MozillaSunbird:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
 	cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \
+                -e "s|%MOZ_USER_DIR%|.sunbird|" \
 		-e "s|%MREDIR%|$(mredir)|" \
-		-e "s|mozilla-bin|$(PROGRAM)|g" > $@
+		-e "s|%MOZILLA-BIN%|$(PROGRAM)|g" > $@
 	chmod +x $@

 libs:: MozillaSunbird
@ -199,27 +207,21 @@ install:: MozillaSunbird
 	$(SYSINSTALL) $< $(DESTDIR)$(bindir)

 GARBAGE += MozillaSunbird
-GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js)
+GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, sunbird.js)

 endif

 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-libs::
-	$(INSTALL) $(srcdir)/default.xpm $(DIST)/bin/chrome/icons
+libs:: default.xpm
+	$(INSTALL) $^ $(DIST)/bin/chrome/icons/default

-install::
-	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/default.xpm $(DESTDIR)$(mozappdir)/icons
+install:: default.xpm
+	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/icons
 endif

-export:: $(PREF_FILES)
-	@for i in $(PREF_FILES); do rm -f $(DIST)/bin/defaults/pref/`basename $$i`; $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $$i > $(DIST)/bin/defaults/pref/`basename $$i`; done
-
 export:: brand.dtd.in
 	$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $^ > brand.dtd

-install:: $(PREF_FILES)
-	@for i in $(PREF_FILES); do rm -f $(DESTDIR)$(mozappdir)/defaults/pref/`basename $$i`; $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $$i > $(DESTDIR)$(mozappdir)/defaults/pref/`basename $$i`; done
-
 libs::
 	touch $(DIST)/bin/.autoreg

@ -234,7 +236,7 @@ libs:: $(PROGRAM)
 	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
-	cp -RL $(srcdir)/macbuild/mach.icns $(DIST)/$(APP_NAME).app/Contents/Resources/mach.icns
+	cp -RL $(srcdir)/macbuild/sunbird.icns $(DIST)/$(APP_NAME).app/Contents/Resources/mach.icns
 	echo -n APPLMOZB > $(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 {} \;
@ -242,3 +244,9 @@ libs:: $(PROGRAM)
 clean clobber::
 	rm -rf $(DIST)/$(APP_NAME).app
 endif
+
+README_FILE = $(topsrcdir)/README.txt
+
+libs::
+	$(INSTALL) $(README_FILE) $(DIST)/bin
+	$(INSTALL) $(topsrcdir)/LICENSE	$(DIST)/bin
--- a/calendar/sunbird/app/brand.dtd.in
+++ b/calendar/sunbird/app/brand.dtd.in
@ -1,9 +1,9 @@
-<!ENTITY  lang.version          "1.5a">
+<!ENTITY  lang.version          "1.7a">
 <!ENTITY  brandShortName        "Mozilla Sunbird">
 <!ENTITY  brandFullName         "Mozilla Sunbird">
 <!ENTITY  version               
 #expand __APP_VERSION__
 >
-<!ENTITY  vendorShortName       "Mozilla Sunbird">
+<!ENTITY  vendorShortName       "Mozilla">

 <!ENTITY  releaseURL            "http://www.mozilla.org/projects/calendar">
--- a/calendar/sunbird/app/brand.properties
+++ b/calendar/sunbird/app/brand.properties
@ -1,3 +1,3 @@
 brandShortName=Mozilla Sunbird
 brandFullName=Mozilla Sunbird
-vendorShortName=Mozilla Sunbird
+vendorShortName=Mozilla
--- a/calendar/sunbird/app/default.xpm
+++ b/calendar/sunbird/app/default.xpm
@ -0,0 +1,128 @@
+/* XPM */
+static char * default_xpm[] = {
+"48 48 77 1",
+" 	c None",
+".	c #FEFEFE",
+"+	c #FFFF00",
+"@	c #000000",
+"#	c #F96611",
+"$	c #BABA00",
+"%	c #EFEFEF",
+"&	c #D9D900",
+"*	c #F0F000",
+"=	c #303030",
+"-	c #101010",
+";	c #404040",
+">	c #100101",
+",	c #3F0403",
+"'	c #2F0302",
+")	c #9F9F9F",
+"!	c #DFDFDF",
+"~	c #7F7F7F",
+"{	c #606060",
+"]	c #C8C7C6",
+"^	c #8F8F8F",
+"/	c #BFBFBF",
+"(	c #1F0202",
+"_	c #5D2606",
+":	c #202020",
+"<	c #505050",
+"[	c #D7D6D4",
+"}	c #331A0B",
+"|	c #93775A",
+"1	c #9A7C5C",
+"2	c #FEFDFD",
+"3	c #AFAFAF",
+"4	c #4E0504",
+"5	c #707070",
+"6	c #7D3309",
+"7	c #8C6061",
+"8	c #BB4D0D",
+"9	c #926D5D",
+"0	c #331F0F",
+"a	c #E96010",
+"b	c #C7BAB1",
+"c	c #C69CB5",
+"d	c #5E0605",
+"e	c #56491D",
+"f	c #2F2014",
+"g	c #C7C6C5",
+"h	c #9C400B",
+"i	c #100601",
+"j	c #CAC0B5",
+"k	c #3E1A04",
+"l	c #C9C4BD",
+"m	c #AB460C",
+"n	c #DA590F",
+"o	c #484227",
+"p	c #794018",
+"q	c #CA530E",
+"r	c #5C501D",
+"s	c #2F1303",
+"t	c #4E2005",
+"u	c #CDCDC8",
+"v	c #F0EFF2",
+"w	c #D3D2CE",
+"x	c #CFCFCF",
+"y	c #341D0D",
+"z	c #6D6022",
+"A	c #1F0D02",
+"B	c #724B1B",
+"C	c #4C4421",
+"D	c #231408",
+"E	c #874E66",
+"F	c #B1A14F",
+"G	c #4F471F",
+"H	c #665B24",
+"I	c #6D2D07",
+"J	c #6E0705",
+"K	c #7E0806",
+"L	c #FFFFFF",
+"                                                ",
+"                                                ",
+"                                                ",
+"                     %@=5!                      ",
+"                      x:@i{!                    ",
+"                       %=_6@~                   ",
+"                        !-8qs;%                 ",
+"                         ^A#a_=%                ",
+"                   3;%    :q##_=%               ",
+"                 %{@<     56###t<               ",
+"     !~         %=@-%     ^_###aA3      !{      ",
+"     {-        %=d4~      3k####8-%     /@~     ",
+"    !@>!       {'*@%      ~6#####k~     )>-%    ",
+"    5d4^      3>*&;  !<%  <h#####8-%    {$${    ",
+"    -*$=     %-&+&;  %@{ %@n######k)    -**-%   ",
+"   3(++>/  @@@@@@@@@@@@@@@@@@@@@##h=   )'++4^   ",
+"   5J++$;  @+++++++++++++++++++@##a@! %:&++&=   ",
+"   =&++*(^ @+++++++++++++++++++@###t) {,++++>!  ",
+"  %@++++&-x@@@@@@@@@@@@@@@@@@@@@###6{)>*++++,)  ",
+"  /'+++++&-@...@...@...@...@...@###8->*+++++$~  ",
+"  /,++++++&@...@...@...@...@...@###n@*++++++$<  ",
+"  ~,+++++++@...@...@...@...@...@####@+++++++&;  ",
+"  3,+++++++@@@@@@@@@@@@@@@@@@@@@####@+++++++$5  ",
+"  /'+++++++@...@...@...@...@...@####@+++++++$^  ",
+":) @*++++++@...@...@...@...@...@###n>++++++*>!):",
+"=@<;$++++*+@...@...@...@...@.vj@G@ooez+++++$:<@=",
+")'d@@$+++4$@@@@@@@@@@@@@@@@@@@C|b[g[b1rB++$@@$')",
+"%-&*$$+++,>@...@...@...@...@D|w...]...u|0+$$*&-%",
+" ~,++++++,s@...@...@...@..lH1.]......].21y+++,~ ",
+" %-&+++++,m@...@...@...@.v1|............270+$-% ",
+"  ^(*++++,m@@@@@@@@@@@@@@@@w]..]........]lo*(^  ",
+"  %;d++++@6@...@...@...@.F|...]@].........7@=%  ",
+" !@=@$+++@_@...@...@...@.1b....]@]........c',@% ",
+"  =,'>+++@_@...@...@...@.9[.....]@].......[f(=  ",
+"  )(++++++(@@@@@@@@@@@@@@9g].....]@......]gf:)  ",
+"   :$+++++@_##IK+++++++++@[.......@.......[>/   ",
+"   />&++++&>m#h,+++++++++eb.......@.......c~    ",
+"    5'*++++$i8a@&++++++++z1.].....@.....].7f    ",
+"     {'*++++$@6_4+++++++++ru......@......jf     ",
+"      {'*++++&'i@$++++++++B|2.....@.....2E}     ",
+"       ~>$+++++$'@$++++++++012]...|...]29}      ",
+"        /=($*+++++++++++++++09l...]...j7}       ",
+"          );>4$&++++++&&&&+++pe9c[g[c7e0        ",
+"            !^<=@@@@@@-;;;;;;;;py}}}}p          ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                "};
--- a/calendar/sunbird/app/macbuild/mach.icns
+++ b/calendar/sunbird/app/macbuild/mach.icns
--- a/calendar/sunbird/app/macbuild/sunbird.icns
+++ b/calendar/sunbird/app/macbuild/sunbird.icns
--- a/calendar/sunbird/app/mozilla.in
+++ b/calendar/sunbird/app/mozilla.in
@ -16,7 +16,7 @@
 # Reserved.
 #

-## $Id: mozilla.in,v 1.3 2004-02-11 15:11:51 mostafah%oeone.com Exp $
+## $Id: mozilla.in,v 1.4 2004-04-07 18:55:07 mostafah%oeone.com Exp $
 ## 
 ## Usage:
 ##
@ -29,6 +29,46 @@
 ## the mozilla-bin binary to work.
 ##

+moz_pis_startstop_scripts()
+{
+  MOZ_USER_DIR="%MOZ_USER_DIR%"
+  # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts"
+  # These variables and there meaning are specified in
+  # mozilla/xpfe/bootstrap/init.d/README
+  MOZ_PIS_API=2
+  MOZ_PIS_MOZBINDIR="${dist_bin}"
+  MOZ_PIS_SESSION_PID="$$"
+  MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
+  export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
+  
+  case "${1}" in
+    "start")
+      for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do
+        if [ -x "${curr_pis}" ] ; then
+          case "${curr_pis}" in
+            *.sh) .  "${curr_pis}"         ;;
+            *)       "${curr_pis}" "start" ;;
+          esac
+        fi
+      done
+      ;;
+    "stop")
+      for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do
+        if [ -x "${curr_pis}" ] ; then
+          case "${curr_pis}" in
+            *.sh) . "${curr_pis}"        ;;
+            *)      "${curr_pis}" "stop" ;;
+          esac
+        fi
+      done
+      ;;
+    *)
+      echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts."
+      exit 1
+      ;;
+  esac
+}
+
 #uncomment for debugging
 #set -x

@ -77,7 +117,7 @@ fi
 script_args=""
 moreargs=""
 debugging=0
-MOZILLA_BIN="mozilla-bin"
+MOZILLA_BIN="%MOZILLA-BIN%"

 if [ "$OSTYPE" = "beos" ]; then
  mimeset -F $MOZILLA_BIN
@ -87,7 +127,7 @@ while [ $# -gt 0 ]
 do
  case "$1" in
    -p | -pure)
-      MOZILLA_BIN="mozilla-bin.pure"
+      MOZILLA_BIN="%MOZILLA-BIN%.pure"
      shift
      ;;
    -g | --debug)
@ -108,8 +148,19 @@ done

 export MRE_HOME
 eval "set -- $moreargs"
+
+## Start addon scripts
+moz_pis_startstop_scripts "start"
+
 if [ $debugging = 1 ]
 then
  echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
 fi
-exec "$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
+"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
+exitcode=$?
+
+## Stop addon scripts
+moz_pis_startstop_scripts "stop"
+
+exit $exitcode
+# EOF.
--- a/calendar/sunbird/app/profile/all.js
+++ b/calendar/sunbird/app/profile/all.js
--- a/calendar/sunbird/app/profile/sunbird.js
+++ b/calendar/sunbird/app/profile/sunbird.js
@ -0,0 +1,195 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * 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 ***** */
+
+// SYNTAX HINTS:  dashes are delimiters.  Use underscores instead.
+//  The first character after a period must be alphabetic.
+
+// pref("startup.homepage_override_url","chrome://browser-region/locale/region.properties");
+pref("browser.chromeURL","chrome://browser/content/");
+pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindow.xul");
+pref("xpinstall.dialog.confirm", "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul");
+pref("xpinstall.dialog.progress", "chrome://mozapps/content/downloads/downloads.xul");
+pref("xpinstall.dialog.progress.type", "Download:Manager");
+
+pref("keyword.enabled", true);
+pref("keyword.URL", "http://www.google.com/search?btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8&q=");
+
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
+pref("general.useragent.contentlocale", "chrome://browser-region/locale/region.properties");
+pref("general.useragent.vendor", "Mozilla Sunbird");
+pref("general.useragent.vendorSub",
+#expand __APP_VERSION__
+);
+
+pref("general.smoothScroll", false);
+#ifdef XP_UNIX
+pref("general.autoScroll", false);
+#else
+pref("general.autoScroll", true);
+#endif
+
+
+// 0 = blank, 1 = home (browser.startup.homepage), 2 = last
+// XXXBlake Remove this stupid pref
+pref("browser.startup.page",                1);
+pref("browser.startup.homepage",	        "chrome://browser-region/locale/region.properties");
+// "browser.startup.homepage_override" was for 4.x
+pref("browser.startup.homepage_override.1", false);
+
+pref("browser.cache.disk.capacity",         50000);
+pref("browser.enable_automatic_image_resizing", true);
+pref("browser.urlbar.matchOnlyTyped", false);
+pref("browser.chrome.site_icons", true);
+pref("browser.chrome.favicons", true);
+pref("browser.turbo.enabled", false);
+pref("browser.formfill.enable", true);
+
+pref("browser.download.useDownloadDir", true);
+pref("browser.download.folderList", 0);
+pref("browser.download.manager.showAlertOnComplete", true);
+pref("browser.download.manager.showAlertInterval", 2000);
+pref("browser.download.manager.retention", 2);
+pref("browser.download.manager.showWhenStarting", true);
+pref("browser.download.manager.useWindow", true);
+pref("browser.download.manager.closeWhenDone", true);
+pref("browser.download.manager.openDelay", 0);
+pref("browser.download.manager.focusWhenStarting", false);
+pref("browser.download.manager.flashCount", 2);
+
+// pointer to the default engine name
+pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
+// pointer to the Web Search url (content area context menu)
+pref("browser.search.defaulturl", "chrome://browser-region/locale/region.properties");
+
+// basic search popup constraint: minimum sherlock plugin version displayed
+// (note: must be a string representation of a float or it'll default to 0.0)
+pref("browser.search.basic.min_ver", "0.0");
+
+pref("browser.history.grouping", "day");
+pref("browser.sessionhistory.max_entries", 50);
+ 
+// Tab browser preferences.
+pref("browser.tabs.loadInBackground", true);
+pref("browser.tabs.loadFolderAndReplace", true);
+pref("browser.tabs.opentabfor.middleclick", true);
+pref("browser.tabs.opentabfor.urlbar", true);
+
+// Smart Browsing prefs
+pref("browser.related.enabled", true);
+pref("browser.related.autoload", 1);  // 0 = Always, 1 = After first use, 2 = Never
+pref("browser.related.provider", "http://www-rl.netscape.com/wtgn?");
+pref("browser.related.disabledForDomains", "");
+pref("browser.goBrowsing.enabled", true);
+
+// Default bookmark sorting
+pref("browser.bookmarks.sort.direction", "descending");
+pref("browser.bookmarks.sort.resource", "rdf:http://home.netscape.com/NC-rdf#Name");
+
+// Scripts & Windows prefs
+pref("dom.disable_open_during_load",        true);
+pref("javascript.options.showInConsole",    false);
+
+// popups.policy 1=allow,2=reject
+pref("privacy.popups.policy",               1);
+pref("privacy.popups.usecustom",            true);
+pref("privacy.popups.firstTime",            true);
+
+pref("network.protocols.useSystemDefaults", false); // set to true if user links should use system default handlers
+pref("network.cookie.cookieBehavior",       0); // cookies enabled
+pref("network.cookie.enableForCurrentSessionOnly", false);
+
+// l12n and i18n
+pref("intl.accept_languages", "chrome://global/locale/intl.properties");
+// collationOption is only set on linux for japanese. see bug 18338 and 62015
+// we need to check if this pref is still useful.
+pref("intl.collationOption",  "chrome://global-platform/locale/intl.properties");
+pref("intl.charsetmenu.browser.static", "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more1",  "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more2",  "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more3",  "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more4",  "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more5",  "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.unicode",  "chrome://global/locale/intl.properties");
+pref("intl.charset.detector", "chrome://global/locale/intl.properties");
+pref("intl.charset.default",  "chrome://global-platform/locale/intl.properties");
+pref("font.language.group", "chrome://global/locale/intl.properties");
+pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
+
+// 0=lines, 1=pages, 2=history , 3=text size
+pref("mousewheel.withcontrolkey.action",3);
+pref("mousewheel.withshiftkey.action",2);
+pref("mousewheel.withaltkey.action",0);
+
+pref("profile.allow_automigration", false);   // setting to false bypasses automigration in the profile code
+
+// Customizable toolbar stuff
+pref("custtoolbar.personal_toolbar_folder", "");
+pref("browser.throbber.url","chrome://browser-region/locale/region.properties");
+
+// pref to control the alert notification 
+pref("alerts.slideIncrement", 1);
+pref("alerts.slideIncrementTime", 10);
+pref("alerts.totalOpenTime", 4000);
+pref("alerts.height", 50);
+
+// update notifications prefs
+pref("update_notifications.enabled", true);
+pref("update_notifications.provider.0.frequency", 7); // number of days
+pref("update_notifications.provider.0.datasource", "chrome://browser-region/locale/region.properties");
+
+pref("browser.xul.error_pages.enabled", false);
+
+pref("signon.rememberSignons",              true);
+pref("signon.expireMasterPassword",         false);
+pref("signon.SignonFileName", "signons.txt");
+
+pref("network.protocol-handler.external.mailto", true); // for mail
+pref("network.protocol-handler.external.news" , true); // for news 
+
+// By default, all protocol handlers are exposed.  This means that
+// the browser will respond to openURL commands for all URL types.
+// It will also try to open link clicks inside the browser before
+// failing over to the system handlers.
+pref("network.protocol-handler.expose-all", true);
+pref("network.protocol-handler.expose.mailto", false);
+
+// Default security warning dialogs to show once.
+pref("security.warn_entering_secure.show_once", true);
+pref("security.warn_entering_weak.show_once", true);
+pref("security.warn_leaving_secure.show_once", true);
+pref("security.warn_viewing_mixed.show_once", true);
+pref("security.warn_submit_insecure.show_once", true);
--- a/calendar/sunbird/app/splash.rc
+++ b/calendar/sunbird/app/splash.rc
@ -41,34 +41,18 @@

 1 24 "MozillaSunbird.exe.manifest"

-// Program icon.
-IDI_APPLICATION ICON
-	"mozilla.ico"
-
-// Splash screen dialog.
-IDD_SPLASH DIALOGEX
-	DISCARDABLE
-	0,0,0,0
-	STYLE DS_SETFOREGROUND | DS_CENTER | WS_POPUP
-    EXSTYLE WS_EX_TOOLWINDOW
-	FONT 8, "MS Sans Serif"
-	BEGIN
-		CONTROL
-            		IDB_SPLASH,
-			IDB_SPLASH,
-			"Static",
-			SS_BITMAP,
-			0,0,0,0
-	END
-
-// Splash screen bitmap.
-// IDB_SPLASH BITMAP
-// 	"splash.bmp"
+IDI_APPICON ICON "sunbird.ico"
+IDI_APPLICATION ICON "sunbird.ico"

 STRINGTABLE DISCARDABLE
 BEGIN
+#ifdef DEBUG
+    ID_DDE_APPLICATION_NAME,            "Mozilla Sunbird Debug"
+    IDS_STARTMENU_APPNAME,              "Mozilla Sunbird Debug"
+#else
    ID_DDE_APPLICATION_NAME,            "Mozilla Sunbird"
    IDS_STARTMENU_APPNAME,              "Mozilla Sunbird"
+#endif
 END

 #ifdef MOZ_STATIC_BUILD
--- a/calendar/sunbird/app/splashos2.rc
+++ b/calendar/sunbird/app/splashos2.rc
@ -48,3 +48,31 @@ STRINGTABLE DISCARDABLE
 BEGIN
    ID_DDE_APPLICATION_NAME,            "Mozilla Sunbird"
 END
+
+#ifdef MOZ_STATIC_BUILD
+#include "wdgtos2rc.h"
+
+POINTER IDC_SELECTANCHOR   "..\\..\\widget\\src\\os2\\res\\\select.ptr"
+POINTER IDC_ARROWNORTH     "..\\..\\widget\\src\\os2\\res\\arrow_north.ptr"
+POINTER IDC_ARROWNORTHPLUS "..\\..\\widget\\src\\os2\\res\\arrow_north_plus.ptr"
+POINTER IDC_ARROWSOUTH     "..\\..\\widget\\src\\os2\\res\\arrow_south.ptr"
+POINTER IDC_ARROWSOUTHPLUS "..\\..\\widget\\src\\os2\\res\\arrow_south_plus.ptr"
+POINTER IDC_ARROWWEST      "..\\..\\widget\\src\\os2\\res\\arrow_west.ptr"
+POINTER IDC_ARROWWESTPLUS  "..\\..\\widget\\src\\os2\\res\\arrow_west_plus.ptr"
+POINTER IDC_ARROWEAST      "..\\..\\widget\\src\\os2\\res\\arrow_east.ptr"
+POINTER IDC_ARROWEASTPLUS  "..\\..\\widget\\src\\os2\\res\\arrow_east_plus.ptr"
+POINTER IDC_GRAB           "..\\..\\widget\\src\\os2\\res\\grab.ptr"
+POINTER IDC_GRABBING       "..\\..\\widget\\src\\os2\\res\\grabbing.ptr"
+POINTER IDC_CELL           "..\\..\\widget\\src\\os2\\res\\cell.ptr"
+POINTER IDC_COPY           "..\\..\\widget\\src\\os2\\res\\copy.ptr"
+POINTER IDC_ALIAS          "..\\..\\widget\\src\\os2\\res\\aliasb.ptr"
+POINTER IDC_ZOOMIN         "..\\..\\widget\\src\\os2\\res\\zoom_in.ptr"
+POINTER IDC_ZOOMOUT        "..\\..\\widget\\src\\os2\\res\\zoom_out.ptr"
+
+POINTER IDC_ARROWWAIT      "..\\..\\widget\\src\\os2\\res\\arrow_wait.ptr"
+POINTER IDC_CROSS          "..\\..\\widget\\src\\os2\\res\\crosshair.ptr"
+POINTER IDC_HELP           "..\\..\\widget\\src\\os2\\res\\help.ptr"
+
+ICON    IDC_DNDURL         "..\\..\\widget\\src\\os2\\res\\dndurl.ico"
+ICON    IDC_DNDTEXT        "..\\..\\widget\\src\\os2\\res\\dndtext.ico"
+#endif
--- a/calendar/sunbird/app/sunbird.ico
+++ b/calendar/sunbird/app/sunbird.ico
--- a/calendar/sunbird/base/Makefile.in
+++ b/calendar/sunbird/base/Makefile.in
@ -26,6 +26,8 @@ VPATH   = @srcdir@

 include $(DEPTH)/config/autoconf.mk

+#removed skin section for sunbird
+
 include $(topsrcdir)/config/config.mk

 include $(topsrcdir)/config/rules.mk