зеркало из https://github.com/mozilla/pjs.git
Bug 282858 - Some extensions don't wory after upgrading to 2/19 build (dir provider was looking in the wrong place for extension default pref files) r=darin
This commit is contained in:
Родитель
b9f88b57ee
Коммит
3e9f840f5e
|
@ -446,13 +446,13 @@ nsXREDirProvider::GetFiles(const char* aProperty, nsISimpleEnumerator** aResult)
|
||||||
nsCOMPtr<nsIFile> file;
|
nsCOMPtr<nsIFile> file;
|
||||||
mXULAppDir->Clone(getter_AddRefs(file));
|
mXULAppDir->Clone(getter_AddRefs(file));
|
||||||
file->AppendNative(NS_LITERAL_CSTRING("defaults"));
|
file->AppendNative(NS_LITERAL_CSTRING("defaults"));
|
||||||
file->AppendNative(NS_LITERAL_CSTRING("pref"));
|
file->AppendNative(NS_LITERAL_CSTRING("preferences"));
|
||||||
PRBool exists;
|
PRBool exists;
|
||||||
if (NS_SUCCEEDED(file->Exists(&exists)) && exists)
|
if (NS_SUCCEEDED(file->Exists(&exists)) && exists)
|
||||||
directories.AppendObject(file);
|
directories.AppendObject(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *const kAppendPrefDir[] = { "defaults", "pref", nsnull };
|
static const char *const kAppendPrefDir[] = { "defaults", "preferences", nsnull };
|
||||||
|
|
||||||
nsCOMPtr<nsIFile> appFile;
|
nsCOMPtr<nsIFile> appFile;
|
||||||
mAppDir->Clone(getter_AddRefs(appFile));
|
mAppDir->Clone(getter_AddRefs(appFile));
|
||||||
|
|
|
@ -85,7 +85,7 @@ libs:: $(ICONS)
|
||||||
$(INSTALL) $^ $(DIST)/bin/apps/$(APPNAME)/chrome/icons/default
|
$(INSTALL) $^ $(DIST)/bin/apps/$(APPNAME)/chrome/icons/default
|
||||||
|
|
||||||
libs:: $(PREFS)
|
libs:: $(PREFS)
|
||||||
$(INSTALL) $^ $(DIST)/bin/apps/$(APPNAME)/defaults/pref
|
$(INSTALL) $^ $(DIST)/bin/apps/$(APPNAME)/defaults/preferences
|
||||||
|
|
||||||
libs:: $(APPNAME).xulapp
|
libs:: $(APPNAME).xulapp
|
||||||
$(EXIT_ON_ERROR) \
|
$(EXIT_ON_ERROR) \
|
||||||
|
|
Загрузка…
Ссылка в новой задаче