Add methods for setting prefs. Also register as an XPCOM termination and shutdown listener, so that we can clean up, and save the prefs, before XPCOM shuts down. This allows us to save prefs that are set at runtime without an explicit file save (needed for bug 181891).

git-svn-id: svn://10.0.0.236/branches/CHIMERA_M1_0_1_BRANCH@134833 18797224-902f-48f8-a5cc-f745e15eee43
2002-12-05 06:44:50 +00:00
parent b129376c39
commit 59787fc856
4 changed files with 142 additions and 36 deletions
--- a/mozilla/camino/src/preferences/PreferenceManager.h
+++ b/mozilla/camino/src/preferences/PreferenceManager.h
@@ -54,6 +54,7 @@ class nsIPref;
 - (BOOL) initInternetConfig;
 - (BOOL) initMozillaPrefs;
 - (void) syncMozillaPrefs;
+- (void) savePrefsFile;

 - (NSString *) getICStringPref:(ConstStr255Param) prefKey;
 - (NSString *) homePage:(BOOL) checkStartupPagePref;
@@ -64,4 +65,8 @@ class nsIPref;
 - (BOOL)getBooleanPref: (const char*)prefName withSuccess:(BOOL*)outSuccess;
 - (int)getIntPref: (const char*)prefName withSuccess:(BOOL*)outSuccess;

+- (void)setPref:(const char*)prefName toString:(NSString*)value;
+- (void)setPref:(const char*)prefName toInt:(int)value;
+- (void)setPref:(const char*)prefName toBoolean:(BOOL)value;
+
@end
--- a/mozilla/camino/src/preferences/PreferenceManager.mm
+++ b/mozilla/camino/src/preferences/PreferenceManager.mm
@@ -40,6 +40,7 @@
 #import <SystemConfiguration/SystemConfiguration.h>
 #import "PreferenceManager.h"
 #import "UserDefaults.h"
+#import "CHBrowserService.h"

 #include "nsIServiceManager.h"
 #include "nsIProfile.h"
@@ -57,6 +58,17 @@ nsresult PR_CALLBACK
 app_getModuleInfo(nsStaticModuleInfo **info, PRUint32 *count);
 #endif

+@interface PreferenceManager(PreferenceManagerPrivate)
+
+- (void)registerNotificationListener;
+
+- (void)termEmbedding: (NSNotification*)aNotification;
+- (void)xpcomTerminate: (NSNotification*)aNotification;
+
+@end
+
+
+
@implementation PreferenceManager

 static PreferenceManager* gSharedInstance = nil;
@@ -83,6 +95,8 @@ static BOOL gMadePrefManager;
 {
  if ((self = [super init]))
  {
+    [self registerNotificationListener];
+
    if ([self initInternetConfig] == NO) {
      // XXXw. throw here
      NSLog (@"Failed to initialize Internet Config");
@@ -100,27 +114,44 @@ static BOOL gMadePrefManager;

 - (void) dealloc
 {
-  // XXX this never gets called!
-#if DEBUG
-  NSLog(@"Prefs manager dealloc");
-#endif
-
-  ::ICStop(mInternetConfig);
-  NS_IF_RELEASE(mPrefs);
-
-  nsresult rv;
-  nsCOMPtr<nsIPrefService> pref(do_GetService(NS_PREF_CONTRACTID, &rv));
-  if (NS_SUCCEEDED(rv)) {
-      //NSLog(@"Saving prefs file");
-      pref->SavePrefFile(nsnull);
-  }
-
-  if (self == gSharedInstance)
-    gSharedInstance = NULL;
-  
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
  [super dealloc];
 }

+- (void)termEmbedding: (NSNotification*)aNotification
+{
+  ::ICStop(mInternetConfig);
+  mInternetConfig = nil;
+  NS_IF_RELEASE(mPrefs);
+}
+
+- (void)xpcomTerminate: (NSNotification*)aNotification
+{
+  // save prefs now, in case any termination listeners set prefs.
+  [self savePrefsFile];
+  [gSharedInstance release];
+}
+
+- (void)registerNotificationListener
+{
+  [[NSNotificationCenter defaultCenter] addObserver:  self
+                                        selector:     @selector(termEmbedding:)
+                                        name:         TermEmbeddingNotificationName
+                                        object:       nil];
+
+  [[NSNotificationCenter defaultCenter] addObserver:  self
+                                        selector:     @selector(xpcomTerminate:)
+                                        name:         XPCOMShutDownNotificationName
+                                        object:       nil];
+}
+
+- (void) savePrefsFile
+{
+  nsCOMPtr<nsIPrefService> prefsService = do_GetService(NS_PREF_CONTRACTID);
+  if (prefsService)
+      prefsService->SavePrefFile(nsnull);
+}
+
 - (BOOL) initInternetConfig
 {
    OSStatus error;
@@ -414,6 +445,23 @@ static BOOL gMadePrefManager;
  return intPref;
 }

+- (void)setPref:(const char*)prefName toString:(NSString*)value
+{
+  if (mPrefs)
+    (void)mPrefs->SetCharPref(prefName, [value UTF8String]);
+}
+
+- (void)setPref:(const char*)prefName toInt:(int)value
+{
+  if (mPrefs)
+    (void)mPrefs->SetIntPref(prefName, (PRInt32)value);
+}
+
+- (void)setPref:(const char*)prefName toBoolean:(BOOL)value
+{
+  if (mPrefs)
+    (void)mPrefs->SetBoolPref(prefName, (PRBool)value);
+}


 //- (BOOL) getICBoolPref:(ConstStr255Param) prefKey;
--- a/mozilla/chimera/src/preferences/PreferenceManager.h
+++ b/mozilla/chimera/src/preferences/PreferenceManager.h
@@ -54,6 +54,7 @@ class nsIPref;
 - (BOOL) initInternetConfig;
 - (BOOL) initMozillaPrefs;
 - (void) syncMozillaPrefs;
+- (void) savePrefsFile;

 - (NSString *) getICStringPref:(ConstStr255Param) prefKey;
 - (NSString *) homePage:(BOOL) checkStartupPagePref;
@@ -64,4 +65,8 @@ class nsIPref;
 - (BOOL)getBooleanPref: (const char*)prefName withSuccess:(BOOL*)outSuccess;
 - (int)getIntPref: (const char*)prefName withSuccess:(BOOL*)outSuccess;

+- (void)setPref:(const char*)prefName toString:(NSString*)value;
+- (void)setPref:(const char*)prefName toInt:(int)value;
+- (void)setPref:(const char*)prefName toBoolean:(BOOL)value;
+
@end
--- a/mozilla/chimera/src/preferences/PreferenceManager.mm
+++ b/mozilla/chimera/src/preferences/PreferenceManager.mm
@@ -40,6 +40,7 @@
 #import <SystemConfiguration/SystemConfiguration.h>
 #import "PreferenceManager.h"
 #import "UserDefaults.h"
+#import "CHBrowserService.h"

 #include "nsIServiceManager.h"
 #include "nsIProfile.h"
@@ -57,6 +58,17 @@ nsresult PR_CALLBACK
 app_getModuleInfo(nsStaticModuleInfo **info, PRUint32 *count);
 #endif

+@interface PreferenceManager(PreferenceManagerPrivate)
+
+- (void)registerNotificationListener;
+
+- (void)termEmbedding: (NSNotification*)aNotification;
+- (void)xpcomTerminate: (NSNotification*)aNotification;
+
+@end
+
+
+
@implementation PreferenceManager

 static PreferenceManager* gSharedInstance = nil;
@@ -83,6 +95,8 @@ static BOOL gMadePrefManager;
 {
  if ((self = [super init]))
  {
+    [self registerNotificationListener];
+
    if ([self initInternetConfig] == NO) {
      // XXXw. throw here
      NSLog (@"Failed to initialize Internet Config");
@@ -100,27 +114,44 @@ static BOOL gMadePrefManager;

 - (void) dealloc
 {
-  // XXX this never gets called!
-#if DEBUG
-  NSLog(@"Prefs manager dealloc");
-#endif
-
-  ::ICStop(mInternetConfig);
-  NS_IF_RELEASE(mPrefs);
-
-  nsresult rv;
-  nsCOMPtr<nsIPrefService> pref(do_GetService(NS_PREF_CONTRACTID, &rv));
-  if (NS_SUCCEEDED(rv)) {
-      //NSLog(@"Saving prefs file");
-      pref->SavePrefFile(nsnull);
-  }
-
-  if (self == gSharedInstance)
-    gSharedInstance = NULL;
-  
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
  [super dealloc];
 }

+- (void)termEmbedding: (NSNotification*)aNotification
+{
+  ::ICStop(mInternetConfig);
+  mInternetConfig = nil;
+  NS_IF_RELEASE(mPrefs);
+}
+
+- (void)xpcomTerminate: (NSNotification*)aNotification
+{
+  // save prefs now, in case any termination listeners set prefs.
+  [self savePrefsFile];
+  [gSharedInstance release];
+}
+
+- (void)registerNotificationListener
+{
+  [[NSNotificationCenter defaultCenter] addObserver:  self
+                                        selector:     @selector(termEmbedding:)
+                                        name:         TermEmbeddingNotificationName
+                                        object:       nil];
+
+  [[NSNotificationCenter defaultCenter] addObserver:  self
+                                        selector:     @selector(xpcomTerminate:)
+                                        name:         XPCOMShutDownNotificationName
+                                        object:       nil];
+}
+
+- (void) savePrefsFile
+{
+  nsCOMPtr<nsIPrefService> prefsService = do_GetService(NS_PREF_CONTRACTID);
+  if (prefsService)
+      prefsService->SavePrefFile(nsnull);
+}
+
 - (BOOL) initInternetConfig
 {
    OSStatus error;
@@ -414,6 +445,23 @@ static BOOL gMadePrefManager;
  return intPref;
 }

+- (void)setPref:(const char*)prefName toString:(NSString*)value
+{
+  if (mPrefs)
+    (void)mPrefs->SetCharPref(prefName, [value UTF8String]);
+}
+
+- (void)setPref:(const char*)prefName toInt:(int)value
+{
+  if (mPrefs)
+    (void)mPrefs->SetIntPref(prefName, (PRInt32)value);
+}
+
+- (void)setPref:(const char*)prefName toBoolean:(BOOL)value
+{
+  if (mPrefs)
+    (void)mPrefs->SetBoolPref(prefName, (PRBool)value);
+}


 //- (BOOL) getICBoolPref:(ConstStr255Param) prefKey;