sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Look for gecko-prefs.js and mime.types in the correct location.

Browse Source
This commit is contained in:
Tomeu Vizoso 2007-04-19 12:12:57 -03:00
parent d223579f22
commit 4ca48ffd09
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
browser/sugar-browser.cpp
View File

@ -65,6 +65,8 @@
#include <nsICommandManager.h> #include <nsICommandManager.h>
#include <nsIClipboardDragDropHooks.h> #include <nsIClipboardDragDropHooks.h>
#define SUGAR_PATH "SUGAR_PATH"
enum { enum {
PROP_0, PROP_0,
PROP_PROGRESS, PROP_PROGRESS,
@ -161,9 +163,11 @@ sugar_browser_startup(const char *profile_path, const char *profile_name)
NS_ENSURE_TRUE(prefService, FALSE); NS_ENSURE_TRUE(prefService, FALSE);
/* Read our predefined default prefs */ /* Read our predefined default prefs */
nsCString pathToPrefs(g_getenv(SUGAR_PATH));
pathToPrefs.Append("/data/gecko-prefs.js");
nsCOMPtr<nsILocalFile> file; nsCOMPtr<nsILocalFile> file;
NS_NewNativeLocalFile(nsCString(SHARE_DIR"/gecko-prefs.js"), NS_NewNativeLocalFile(pathToPrefs, PR_TRUE, getter_AddRefs(file));
PR_TRUE, getter_AddRefs(file));
NS_ENSURE_TRUE(file, FALSE); NS_ENSURE_TRUE(file, FALSE);
rv = prefService->ReadUserPrefs (file); rv = prefService->ReadUserPrefs (file);
@ -176,7 +180,10 @@ sugar_browser_startup(const char *profile_path, const char *profile_name)
prefService->GetBranch ("", getter_AddRefs(pref)); prefService->GetBranch ("", getter_AddRefs(pref));
NS_ENSURE_TRUE(pref, FALSE); NS_ENSURE_TRUE(pref, FALSE);
pref->SetCharPref ("helpers.private_mime_types_file", SHARE_DIR"/mime.types"); nsCString pathToMimeTypes(g_getenv(SUGAR_PATH));
pathToMimeTypes.Append("/data/mime.types");
pref->SetCharPref ("helpers.private_mime_types_file", pathToMimeTypes.get());
rv = prefService->ReadUserPrefs (nsnull); rv = prefService->ReadUserPrefs (nsnull);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {