Bug 324397 - 'Allow cookies for the original site only' preference, should be selected by default. relanding now that bug 404399 is fixed. r=mconnor,

a=mconnor/schrep

browser/app/profile/firefox.js

@@ -345,7 +345,7 @@ pref("privacy.sanitize.promptOnSanitize", true);
 
 pref("network.proxy.share_proxy_settings",  false); // use the same proxy settings for all protocols
 
-pref("network.cookie.cookieBehavior",       0); // cookies enabled
+pref("network.cookie.cookieBehavior",       1); // 0-Accept, 1-dontAcceptForeign, 2-dontUse
 pref("network.cookie.enableForCurrentSessionOnly", false);
 
 // l12n and i18n

browser/components/preferences/privacy.js

@@ -164,7 +164,6 @@ var gPrivacyPane = {
    *     1   means allow cookies from the "originating" server only; see
    *         netwerk/cookie/src/nsCookieService.cpp for a hairier definition
    *     2   means disable all cookies
-   *     3   means use P3P policy to decide, which is probably broken
    * network.cookie.lifetimePolicy
    * - determines how long cookies are stored:
    *     0   means keep cookies until they expire
@@ -198,7 +197,7 @@ var gPrivacyPane = {
   writeAcceptCookies: function ()
   {
     var checkbox = document.getElementById("acceptCookies");
-    return checkbox.checked ? 0 : 2;
+    return checkbox.checked ? 1 : 2;
   },
 
   /**