Bug 826160 - Don't remove the social.active preference when migrating to multi-provider builds. r+a=gavin
authorMark Hammond <mhammond@skippinet.com.au>
Fri, 01 Feb 2013 11:09:48 -0500
changeset 127393 6cc4f8e1f617309c6e1e4041d620247f591427be
parent 127392 65e6d331c58bc23da4fedf418e135ce590e1c4d0
child 127394 cc98af1d1c215b1cd627f8736b13701aa5b6b9aa
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs826160
milestone20.0a2
Bug 826160 - Don't remove the social.active preference when migrating to multi-provider builds. r+a=gavin
browser/modules/Social.jsm
--- a/browser/modules/Social.jsm
+++ b/browser/modules/Social.jsm
@@ -116,17 +116,16 @@ this.Social = {
       currentProvider = this._getProviderFromOrigin(this._currentProviderPref);
     } else {
       // Migrate data from previous single-provider builds where we used
       // social.active to indicate that the first available provider should be
       // used.
       try {
         let active = Services.prefs.getBoolPref("social.active");
         if (active) {
-          Services.prefs.clearUserPref("social.active");
           currentProvider = providers[0];
           currentProvider.active = true;
         }
       } catch(ex) {}
     }
     this._setProvider(currentProvider, notifyProviderChange);
   },