Commit 9c4d40bb authored by Florian Quèze's avatar Florian Quèze
Browse files

Bug 1345294 - script generated patch (+ some hand cleanup) to replace... 

Bug 1345294 - script generated patch (+ some hand cleanup) to replace {get,set}ComplexValue for nsISupportsString by {get,set}StringPref, r=Mossop.
parent 881a5070

browser/base/content/aboutaccounts/aboutaccounts.js

+2 −5
Original line number Diff line number Diff line
@@ -30,17 +30,14 @@ function log(msg) { 


function getPreviousAccountNameHash() {

  try {

    return Services.prefs.getComplexValue(PREF_LAST_FXA_USER, Ci.nsISupportsString).data;

    return Services.prefs.getStringPref(PREF_LAST_FXA_USER);

  } catch (_) {

    return "";

  }

}



function setPreviousAccountNameHash(acctName) {

  let string = Cc["@mozilla.org/supports-string;1"]

               .createInstance(Ci.nsISupportsString);

  string.data = sha256(acctName);

  Services.prefs.setComplexValue(PREF_LAST_FXA_USER, Ci.nsISupportsString, string);

  Services.prefs.setStringPref(PREF_LAST_FXA_USER, sha256(acctName));

}



function needRelinkWarning(acctName) {

browser/base/content/browser-feeds.js

+1 −4
Original line number Diff line number Diff line
@@ -335,10 +335,7 @@ var FeedHandler = { 
        Services.prefs.setCharPref(msg.data.pref, msg.data.value);

        break;

      case "FeedWriter:SetFeedComplexString": {

        let supportsString = Cc["@mozilla.org/supports-string;1"].

                             createInstance(Ci.nsISupportsString);

        supportsString.data = msg.data.value;

        Services.prefs.setComplexValue(msg.data.pref, Ci.nsISupportsString, supportsString);

        Services.prefs.setStringPref(msg.data.pref, msg.data.value);

        break;

      }

      case "FeedConverter:ExecuteClientApp":

browser/base/content/browser.js

+1 −5
Original line number Diff line number Diff line
@@ -3611,11 +3611,7 @@ function openHomeDialog(aURL) { 


  if (pressedVal == 0) {

    try {

      var homepageStr = Components.classes["@mozilla.org/supports-string;1"]

                        .createInstance(Components.interfaces.nsISupportsString);

      homepageStr.data = aURL;

      gPrefService.setComplexValue("browser.startup.homepage",

                                   Components.interfaces.nsISupportsString, homepageStr);

      gPrefService.setStringPref("browser.startup.homepage", aURL);

    } catch (ex) {

      dump("Failed to set the home page.\n" + ex + "\n");

    }

browser/base/content/test/general/browser_homeDrop.js

+3 −6
Original line number Diff line number Diff line
@@ -35,13 +35,11 @@ add_task(function*() { 
        observe(subject, topic, data) {

          is(topic, "nsPref:changed", "observed correct topic");

          is(data, HOMEPAGE_PREF, "observed correct data");

          let modified = Services.prefs.getComplexValue(HOMEPAGE_PREF,

                                                        Ci.nsISupportsString);

          is(modified.data, homepage, "homepage is set correctly");

          let modified = Services.prefs.getStringPref(HOMEPAGE_PREF);

          is(modified, homepage, "homepage is set correctly");

          Services.prefs.removeObserver(HOMEPAGE_PREF, observer);



          Services.prefs.setComplexValue(HOMEPAGE_PREF,

                                         Ci.nsISupportsString, homepageStr);

          Services.prefs.setStringPref(HOMEPAGE_PREF, "about:mozilla;");



          resolve();

        }
@@ -87,4 +85,3 @@ add_task(function*() { 
              "http://mochi.test:8888/|http://mochi.test:8888/b|http://mochi.test:8888/c");

  yield dropInvalidURI();

});

browser/base/content/test/newtab/head.js

+1 −5
Original line number Diff line number Diff line
@@ -253,11 +253,7 @@ function setPinnedLinks(aLinks) { 
    });

  }



  let string = Cc["@mozilla.org/supports-string;1"]

                 .createInstance(Ci.nsISupportsString);

  string.data = JSON.stringify(links);

  Services.prefs.setComplexValue("browser.newtabpage.pinned",

                                 Ci.nsISupportsString, string);

  Services.prefs.setStringPref("browser.newtabpage.pinned", JSON.stringify(links));



  NewTabUtils.pinnedLinks.resetCache();

  NewTabUtils.allPages.update();