From fd504a7711d7a0e9c2b593a287579f3b290ef87c Mon Sep 17 00:00:00 2001
From: "bsmedberg%covad.net" <bsmedberg%covad.net>
Date: Thu, 22 Jul 2004 15:14:02 +0000
Subject: [PATCH] Bug 247427 - appreg and pluginreg are in ~/.mozilla instead
 of ~/.mozilla/firefox

---
 toolkit/xre/nsXREDirProvider.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
index 2c61fcfd0ca9..df623030b69f 100644
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -78,6 +78,14 @@
 #include <os2.h>
 #endif
 
+#if defined(XP_MACOSX)
+#define APP_REGISTRY_NAME "Application Registry"
+#elif defined(XP_WIN) || defined(XP_OS2)
+#define APP_REGISTRY_NAME "registry.dat"
+#else
+#define APP_REGISTRY_NAME "appreg"
+#endif
+
 nsXREDirProvider* gDirServiceProvider = nsnull;
 
 nsXREDirProvider::nsXREDirProvider() :
@@ -238,6 +246,13 @@ nsXREDirProvider::GetFile(const char* aProperty, PRBool* aPersistent,
         rv = file->AppendNative(nsDependentCString("pref"));
     }
   }
+  else if (!strcmp(aProperty, NS_APP_APPLICATION_REGISTRY_DIR)) {
+    rv = GetUserAppDataDirectory((nsILocalFile**)(nsIFile**) getter_AddRefs(file));
+  }
+  else if (!strcmp(aProperty, NS_APP_APPLICATION_REGISTRY_FILE)) {
+    rv = GetUserAppDataDirectory((nsILocalFile**)(nsIFile**) getter_AddRefs(file));
+    rv |= file->AppendNative(NS_LITERAL_CSTRING(APP_REGISTRY_NAME));
+  }
   else if (!strcmp(aProperty, NS_APP_USER_PROFILES_ROOT_DIR)) {
     rv = GetUserAppDataDirectory((nsILocalFile**)(nsIFile**) getter_AddRefs(file));