Attachment #82040 for bug #151163

View | Details | Raw Unified | Return to bug 151163
Collapse All | Expand All




pref("xpinstall.whitelist.add.103", "addons.mozilla.org");

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", "@AB_CD@");
//pref("general.skins.selectedSkin", "classic/1.0");
pref("general.useragent.extra.firefox", "Firefox/@APP_VERSION@");

pref("general.smoothScroll", false);
#ifdef UNIX_BUT_NOT_MAC
pref("general.autoScroll", false);
#else




 * 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 NPL, the GPL or the LGPL.
 *
 * ***** END LICENSE BLOCK ***** */

#include <string.h>
#include "nsPrefService.h"
#include "nsAppDirectoryServiceDefs.h"
#include "nsDirectoryServiceDefs.h"
#include "nsICategoryManager.h"
#include "nsCategoryManagerUtils.h"
#include "nsNetUtil.h"

}


NS_IMETHODIMP nsPrefService::ReadUserPrefs(nsIFile *aFile)
{
  nsresult rv;
  PRBool rv2;

  if (nsnull == aFile) {
    rv = UseDefaultPrefFile();
    UseUserPrefFile();

    rv2 = PREF_HasUserPref("general.skins.selectedSkin");
    if (!rv2) {
        if (getenv("KDE_FULL_SESSION"))
            PREF_SetCharPref("general.skins.selectedSkin", "plastikfox");
        else if (getenv("DESKTOP_SESSION") && !strcmp("gnome", getenv("DESKTOP_SESSION")))
            PREF_SetCharPref("general.skins.selectedSkin", "tango");
        else
            PREF_SetCharPref("general.skins.selectedSkin", "classic/1.0");
    }

    NotifyServiceObservers(NS_PREFSERVICE_READ_TOPIC_ID);

  } else {
    rv = ReadAndOwnUserPrefFile(aFile);
  }
  return rv;

Return to bug 151163

Lines 154-166 pref("xpinstall.whitelist.add", "update. Link Here

(-)browser/app/profile/firefox.js (-1 / +1 lines)
154	pref("xpinstall.whitelist.add.103", "addons.mozilla.org");	154	pref("xpinstall.whitelist.add.103", "addons.mozilla.org");
155		155
156	pref("keyword.enabled", true);	156	pref("keyword.enabled", true);
157	pref("keyword.URL", "http://www.google.com/search?btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8&q=");	157	pref("keyword.URL", "http://www.google.com/search?btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8&q=");
158		158
159	pref("general.useragent.locale", "@AB_CD@");	159	pref("general.useragent.locale", "@AB_CD@");
160	pref("general.skins.selectedSkin", "classic/1.0");	160	//pref("general.skins.selectedSkin", "classic/1.0");
161	pref("general.useragent.extra.firefox", "Firefox/@APP_VERSION@");	161	pref("general.useragent.extra.firefox", "Firefox/@APP_VERSION@");
162		162
163	pref("general.smoothScroll", false);	163	pref("general.smoothScroll", false);
164	#ifdef UNIX_BUT_NOT_MAC	164	#ifdef UNIX_BUT_NOT_MAC
165	pref("general.autoScroll", false);	165	pref("general.autoScroll", false);
166	#else	166	#else

Lines 33-44 Link Here

(-)modules/libpref/src/nsPrefService.cpp (+12 lines)
33	* and other provisions required by the GPL or the LGPL. If you do not delete	33	* and other provisions required by the GPL or the LGPL. If you do not delete
34	* the provisions above, a recipient may use your version of this file under	34	* the provisions above, a recipient may use your version of this file under
35	* the terms of any one of the NPL, the GPL or the LGPL.	35	* the terms of any one of the NPL, the GPL or the LGPL.
36	*	36	*
37	* *** END LICENSE BLOCK *** */	37	* *** END LICENSE BLOCK *** */
38		38
		39	#include <string.h>
39	#include "nsPrefService.h"	40	#include "nsPrefService.h"
40	#include "nsAppDirectoryServiceDefs.h"	41	#include "nsAppDirectoryServiceDefs.h"
41	#include "nsDirectoryServiceDefs.h"	42	#include "nsDirectoryServiceDefs.h"
42	#include "nsICategoryManager.h"	43	#include "nsICategoryManager.h"
43	#include "nsCategoryManagerUtils.h"	44	#include "nsCategoryManagerUtils.h"
44	#include "nsNetUtil.h"	45	#include "nsNetUtil.h"
Lines 204-220 NS_IMETHODIMP nsPrefService::Observe(nsI Link Here
204	}	205	}
205		206
206		207
207	NS_IMETHODIMP nsPrefService::ReadUserPrefs(nsIFile *aFile)	208	NS_IMETHODIMP nsPrefService::ReadUserPrefs(nsIFile *aFile)
208	{	209	{
209	nsresult rv;	210	nsresult rv;
		211	PRBool rv2;
210		212
211	if (nsnull == aFile) {	213	if (nsnull == aFile) {
212	rv = UseDefaultPrefFile();	214	rv = UseDefaultPrefFile();
213	UseUserPrefFile();	215	UseUserPrefFile();
214		216
		217	rv2 = PREF_HasUserPref("general.skins.selectedSkin");
		218	if (!rv2) {
		219	if (getenv("KDE_FULL_SESSION"))
		220	PREF_SetCharPref("general.skins.selectedSkin", "plastikfox");
		221	else if (getenv("DESKTOP_SESSION") && !strcmp("gnome", getenv("DESKTOP_SESSION")))
		222	PREF_SetCharPref("general.skins.selectedSkin", "tango");
		223	else
		224	PREF_SetCharPref("general.skins.selectedSkin", "classic/1.0");
		225	}
		226
215	NotifyServiceObservers(NS_PREFSERVICE_READ_TOPIC_ID);	227	NotifyServiceObservers(NS_PREFSERVICE_READ_TOPIC_ID);
216		228
217	} else {	229	} else {
218	rv = ReadAndOwnUserPrefFile(aFile);	230	rv = ReadAndOwnUserPrefFile(aFile);
219	}	231	}
220	return rv;	232	return rv;