From 32a18dfc6da97801673dd0bf7424350489694ca0 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Tue, 22 May 2007 20:57:48 +0000 Subject: Load default prefs --- (limited to 'src') diff --git a/src/HulahopDirectoryProvider.cpp b/src/HulahopDirectoryProvider.cpp index 7d5d404..1162dbb 100644 --- a/src/HulahopDirectoryProvider.cpp +++ b/src/HulahopDirectoryProvider.cpp @@ -51,7 +51,7 @@ HulahopDirectoryProvider::GetFile(const char *aKey, NS_ADDREF(*aResult = mProfilePath); return NS_OK; } - + if (!strcmp(aKey, NS_XPCOM_COMPONENT_REGISTRY_FILE) && mProfilePath) { nsCOMPtr file; rv = mProfilePath->Clone(getter_AddRefs(file)); @@ -59,11 +59,20 @@ HulahopDirectoryProvider::GetFile(const char *aKey, rv = file->AppendNative(nsCString("compreg.dat")); NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); - + NS_ADDREF(*aResult = file); return NS_OK; } - + + if (!strcmp(aKey, NS_APP_PREF_DEFAULTS_50_DIR)) { + nsCOMPtr dataDir; + NS_NewNativeLocalFile(nsCString(DATA_DIR), + PR_TRUE, getter_AddRefs(dataDir)); + + NS_ADDREF(*aResult = dataDir); + return NS_OK; + } + return NS_ERROR_FAILURE; } diff --git a/src/Makefile.am b/src/Makefile.am index a601c9d..fd3f647 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,8 @@ INCLUDES = \ -I$(MOZILLA_INCLUDE_ROOT)/webbrwsr \ -I$(MOZILLA_INCLUDE_ROOT)/widget \ -I$(MOZILLA_INCLUDE_ROOT)/xpcom \ - -DMOZILLA_HOME=\"$(MOZILLA_HOME)\" + -DMOZILLA_HOME=\"$(MOZILLA_HOME)\" \ + -DDATA_DIR=\"$(pkgdatadir)\" noinst_LTLIBRARIES = libhulahop.la -- cgit v0.9.1