# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1425233236 -3600
# Node ID a1f740acf68eda9cb99d662b27b092e0e674328c
# Parent  12530a091878bb18f999d01f9bdde73174acdf03
37.0b1

diff -r 12530a091878 -r a1f740acf68e MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Sun Mar 01 14:13:25 2015 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes	Sun Mar 01 19:07:16 2015 +0100
@@ -2,6 +2,8 @@
 Sun Mar  1 13:11:49 UTC 2015 - wr@rosenauer.org
 
 - update to Firefox 37.0b1
+- removed obsolete patch
+  * mozilla-bmo1088588.patch
 - requires NSPR 4.10.8
 
 -------------------------------------------------------------------
diff -r 12530a091878 -r a1f740acf68e MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Sun Mar 01 14:13:25 2015 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Sun Mar 01 19:07:16 2015 +0100
@@ -143,8 +143,7 @@
 Patch9:         mozilla-repo.patch
 Patch10:        mozilla-icu-strncat.patch
 Patch11:        mozilla-arm-disable-edsp.patch
-Patch12:        mozilla-bmo1088588.patch
-Patch13:        mozilla-openaes-decl.patch
+Patch12:        mozilla-openaes-decl.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-no-default-ualocale.patch
@@ -257,7 +256,6 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
 # Firefox
 %patch101 -p1
 %patch102 -p1
diff -r 12530a091878 -r a1f740acf68e MozillaFirefox/mozilla-bmo1088588.patch
--- a/MozillaFirefox/mozilla-bmo1088588.patch	Sun Mar 01 14:13:25 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-bmo1088588.patch
\ No newline at end of file
diff -r 12530a091878 -r a1f740acf68e firefox-kde.patch
--- a/firefox-kde.patch	Sun Mar 01 14:13:25 2015 +0100
+++ b/firefox-kde.patch	Sun Mar 01 19:07:16 2015 +0100
@@ -1,11 +1,11 @@
 # HG changeset patch
-# Parent  ae5fa7b97ee57df54434bebc6dbda400b7525340
+# Parent  1426724b00dc9de228bf0ead1facc1f8fe5d68cf
 
 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1272 @@
+@@ -0,0 +1,1276 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -295,17 +295,22 @@
 +    <panel id="social-share-panel"
 +           class="social-panel"
 +           type="arrow"
-+           orient="horizontal"
++           orient="vertical"
 +           onpopupshowing="SocialShare.onShowing()"
 +           onpopuphidden="SocialShare.onHidden()"
 +           hidden="true">
-+      <vbox class="social-share-toolbar">
-+        <arrowscrollbox id="social-share-provider-buttons" orient="vertical" flex="1">
++      <hbox class="social-share-toolbar">
++        <toolbarbutton id="manage-share-providers" class="toolbarbutton share-provider-button"
++                       tooltiptext="&social.addons.label;"
++                       oncommand="BrowserOpenAddonsMgr('addons://list/service');
++                                  this.parentNode.parentNode.hidePopup();"/>
++        <arrowscrollbox id="social-share-provider-buttons" orient="horizontal" flex="1" pack="end">
 +          <toolbarbutton id="add-share-provider" class="toolbarbutton share-provider-button" type="radio"
 +                         group="share-providers" tooltiptext="&findShareServices.label;"
 +                         oncommand="SocialShare.showDirectory()"/>
 +        </arrowscrollbox>
-+      </vbox>
++      </hbox>
++      <hbox id="share-container" flex="1"/>
 +    </panel>
 +
 +    <panel id="social-notification-panel"
@@ -642,7 +647,6 @@
 +    </toolbar>
 +
 +    <toolbar id="TabsToolbar"
-+             class="toolbar-primary"
 +             fullscreentoolbar="true"
 +             customizable="true"
 +             mode="icons"
@@ -728,7 +732,7 @@
 +           to the default placements of buttons in CustomizableUI.jsm, so the
 +           customization code doesn't get confused.
 +      -->
-+    <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
++    <toolbar id="nav-bar"
 +             aria-label="&navbarCmd.label;"
 +             fullscreentoolbar="true" mode="icons" customizable="true"
 +             iconsize="small"
@@ -1300,7 +1304,7 @@
          <button id="editBookmarkPanelDeleteButton"
                  class="editBookmarkPanelBottomButton"
                  label="&editBookmark.cancel.label;"
-@@ -1198,17 +1198,17 @@
+@@ -1202,17 +1202,17 @@
  
    <hbox id="full-screen-warning-container" hidden="true" fadeout="true">
      <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
@@ -1336,11 +1340,11 @@
  *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
  *       content/browser/chatWindow.xul                (content/chatWindow.xul)
          content/browser/content.js                    (content/content.js)
-         content/browser/content-UITour.js             (content/content-UITour.js)
          content/browser/defaultthemes/1.footer.jpg    (content/defaultthemes/1.footer.jpg)
          content/browser/defaultthemes/1.header.jpg    (content/defaultthemes/1.header.jpg)
          content/browser/defaultthemes/1.icon.jpg      (content/defaultthemes/1.icon.jpg)
          content/browser/defaultthemes/1.preview.jpg   (content/defaultthemes/1.preview.jpg)
+         content/browser/defaultthemes/2.footer.jpg    (content/defaultthemes/2.footer.jpg)
 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
 --- a/browser/components/build/nsModule.cpp
 +++ b/browser/components/build/nsModule.cpp
@@ -1427,7 +1431,7 @@
      // when the user will select the default.  We refresh here periodically
      // in case the default changes.  On other Windows OS's defaults can also
      // be set while the prefs are open.
-@@ -572,16 +578,27 @@ var gMainPane = {
+@@ -549,16 +555,27 @@ var gMainPane = {
     */
    setDefaultBrowser: function()
    {
@@ -1895,7 +1899,7 @@
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -689,19 +689,21 @@
+@@ -688,19 +688,21 @@
  @RESPATH@/defaults/autoconfig/prefcalls.js
  @RESPATH@/browser/defaults/profile/prefs.js
  
diff -r 12530a091878 -r a1f740acf68e firefox-multilocale-chrome.patch
--- a/firefox-multilocale-chrome.patch	Sun Mar 01 14:13:25 2015 +0100
+++ b/firefox-multilocale-chrome.patch	Sun Mar 01 19:07:16 2015 +0100
@@ -1,12 +1,13 @@
 # HG changeset patch
 # Parent 16846914f968944f991c8b12fdc38ce8fc099d73
 # User Wolfgang Rosenauer <wr@rosenauer.org>
+# Parent  c0a406c7a6cc5edc8fb34549428866ff39ad878f
 Add searchplugins to chrome packaging for proper localization
 
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -389,16 +389,20 @@ pref("browser.helperApps.deleteTempFileO
+@@ -378,16 +378,20 @@ pref("browser.helperApps.deleteTempFileO
  #endif
  
  // search engines URL
@@ -19,18 +20,18 @@
 +pref("browser.search.loadFromJars", true);
 +pref("browser.search.jarURIs", "chrome://browser/locale/searchplugins/");
 +
- // disable logging for the search service by default
- pref("browser.search.log", false);
- 
  // Ordering of Search Engines in the Engine list. 
  pref("browser.search.order.1",                "chrome://browser-region/locale/region.properties");
  pref("browser.search.order.2",                "chrome://browser-region/locale/region.properties");
  pref("browser.search.order.3",                "chrome://browser-region/locale/region.properties");
  
+ // Market-specific search defaults (US market only)
+ pref("browser.search.geoSpecificDefaults", true);
+ pref("browser.search.defaultenginename.US",      "data:text/plain,browser.search.defaultenginename.US=Yahoo");
 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
 --- a/browser/locales/Makefile.in
 +++ b/browser/locales/Makefile.in
-@@ -66,24 +66,27 @@ STUB_HOOK = $(NSINSTALL) -D '$(_ABS_DIST
+@@ -66,27 +66,30 @@ STUB_HOOK = $(NSINSTALL) -D '$(_ABS_DIST
      cp ../installer/windows/l10ngen/stub.exe '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \
      chmod 0755 '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \
      $(NULL)
@@ -41,17 +42,20 @@
  else
 -SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) ddg
 +SEARCHPLUGINS_NAMES = $(shell cat \
-+  $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \
-+  @srcdir@/en-US/searchplugins/list.txt ) ) ddg
++    $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \
++    @srcdir@/en-US/searchplugins/list.txt ) ) ddg
  endif
  SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins
  # metro build call a searchplugins target for search engine plugins
  .PHONY: searchplugins
  SEARCHPLUGINS_TARGET := libs searchplugins
--SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call MERGE_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin))))
+-SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call EN_US_OR_L10N_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin))))
++#SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call EN_US_OR_L10N_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin))))
++SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES))
+ # Some locale-specific search plugins may have preprocessor directives, but the
+ # default en-US ones do not.
+ SEARCHPLUGINS_FLAGS := --silence-missing-directive-warnings
 -PP_TARGETS += SEARCHPLUGINS
-+#SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call MERGE_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin))))
-+SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES))
 +#PP_TARGETS += SEARCHPLUGINS
  
  # Required for l10n.mk - defines a list of app sub dirs that should
@@ -61,7 +65,7 @@
  DIST_SUBDIRS = browser metro
  else
  DIST_SUBDIRS = $(DIST_SUBDIR)
-@@ -117,16 +120,39 @@ NO_JA_JP_MAC_AB_CD := $(if $(filter ja-J
+@@ -120,16 +123,39 @@ NO_JA_JP_MAC_AB_CD := $(if $(filter ja-J
  libs:: $(FINAL_TARGET)/defaults/profile/bookmarks.html ;
  
  libs:: $(addprefix generic/profile/,$(PROFILE_FILES))
@@ -104,7 +108,7 @@
 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
 --- a/browser/locales/jar.mn
 +++ b/browser/locales/jar.mn
-@@ -141,14 +141,15 @@
+@@ -146,14 +146,15 @@
      locale/browser/syncQuota.properties         (%chrome/browser/syncQuota.properties)
  #endif
  % locale browser-region @AB_CD@ %locale/browser-region/
diff -r 12530a091878 -r a1f740acf68e mozilla-bmo1088588.patch
--- a/mozilla-bmo1088588.patch	Sun Mar 01 14:13:25 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# HG changeset patch
-# User Dirk Mueller <dmueller@suse.com>
-# Date 1414618964 0
-#      Wed Oct 29 21:42:44 2014 +0000
-# Node ID 8e3825b2d12a9f295b6ff9a972340b9d84fce068
-# Parent  262e4847ad6cca40d7375e40a0d6ebe8b372e3d3
-Bug 1088588 - fix ifdef in X11TextureSourceOGL.cpp, r?nical
-
-diff --git a/gfx/layers/opengl/X11TextureSourceOGL.cpp b/gfx/layers/opengl/X11TextureSourceOGL.cpp
---- a/gfx/layers/opengl/X11TextureSourceOGL.cpp
-+++ b/gfx/layers/opengl/X11TextureSourceOGL.cpp
-@@ -94,14 +94,14 @@ X11TextureSourceOGL::ContentTypeToSurfac
-   switch (aType) {
-     case gfxContentType::COLOR:
-       return SurfaceFormat::R8G8B8X8;
-     case gfxContentType::COLOR_ALPHA:
-       return SurfaceFormat::R8G8B8A8;
-     default:
-       return SurfaceFormat::UNKNOWN;
-   }
- }
- 
-+}
-+}
-+
- #endif
--
--}
--}
diff -r 12530a091878 -r a1f740acf68e mozilla-kde.patch
--- a/mozilla-kde.patch	Sun Mar 01 14:13:25 2015 +0100
+++ b/mozilla-kde.patch	Sun Mar 01 19:07:16 2015 +0100
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  aba9432d1fd32a118ba24e92c6b6e99ddb0b9bdc
+# Parent  2b183c17f6e4693372442af1a8ee0be364f8cba0
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@@ -46,7 +46,7 @@
  #include "prefread.h"
  #include "prefapi_private_data.h"
  
-@@ -1172,16 +1173,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
+@@ -1165,16 +1166,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
  
  static nsresult pref_LoadPrefsInDirList(const char *listId)
  {
@@ -81,7 +81,7 @@
      return NS_OK;
  
    bool hasMore;
-@@ -1197,17 +1216,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1190,17 +1209,17 @@ static nsresult pref_LoadPrefsInDirList(
  
      nsAutoCString leaf;
      path->GetNativeLeafName(leaf);
@@ -100,7 +100,7 @@
  {
    nsZipItemPtr<char> manifest(jarReader, name, true);
    NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1301,26 +1320,38 @@ static nsresult pref_InitInitialObjects(
+@@ -1294,26 +1313,38 @@ static nsresult pref_InitInitialObjects(
    /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
    static const char* specialFiles[] = {
  #if defined(XP_MACOSX)
@@ -223,9 +223,9 @@
  
  #ifdef MOZ_WIDGET_ANDROID
  #include "AndroidBridge.h"
- using namespace mozilla::widget::android;
  #endif
-@@ -2717,16 +2721,25 @@ nsDownload::SetState(DownloadState aStat
+ 
+@@ -2716,16 +2720,25 @@ nsDownload::SetState(DownloadState aStat
        nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
  
        // Master pref to control this function.
@@ -251,12 +251,12 @@
          int64_t goat = PR_Now() - mStartTime;
          showTaskbarAlert = goat > alertIntervalUSec;
  
-@@ -2757,16 +2770,17 @@ nsDownload::SetState(DownloadState aStat
+@@ -2756,16 +2769,17 @@ nsDownload::SetState(DownloadState aStat
                    NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
                    message, !removeWhenDone,
                    mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"),
                    mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"),
-                   EmptyString(), EmptyString(), nullptr);
+                   EmptyString(), EmptyString(), nullptr, mPrivate);
              }
          }
        }
@@ -3137,13 +3137,13 @@
 diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
 --- a/widget/gtk/nsFilePicker.cpp
 +++ b/widget/gtk/nsFilePicker.cpp
-@@ -1,32 +1,34 @@
- /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
- /* This Source Code Form is subject to the terms of the Mozilla Public
-  * License, v. 2.0. If a copy of the MPL was not distributed with this
+@@ -4,32 +4,34 @@
   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  
  #include "mozilla/Types.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
  
  #include <gtk/gtk.h>
 +#include <gdk/gdkx.h>
@@ -3172,7 +3172,7 @@
  nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr;
  
  void
-@@ -224,17 +226,19 @@ nsFilePicker::AppendFilters(int32_t aFil
+@@ -238,17 +240,19 @@ nsFilePicker::AppendFilters(int32_t aFil
    return nsBaseFilePicker::AppendFilters(aFilterMask);
  }
  
@@ -3193,7 +3193,7 @@
  
    mFilters.AppendElement(filter);
    mFilterNames.AppendElement(name);
-@@ -349,16 +353,32 @@ nsFilePicker::Show(int16_t *aReturn)
+@@ -363,16 +367,32 @@ nsFilePicker::Show(int16_t *aReturn)
  
  NS_IMETHODIMP
  nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
@@ -3226,7 +3226,7 @@
  
    GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
    const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-@@ -537,8 +557,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -551,8 +571,235 @@ nsFilePicker::Done(GtkWidget* file_choos
    if (mCallback) {
      mCallback->Done(result);
      mCallback = nullptr;
@@ -3561,7 +3561,7 @@
      mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build$VERSION",
                                                             "RELEASE",
                                                             osVersion);
-     isTablet = mozilla::widget::android::GeckoAppShell::IsTablet();
+     isTablet = mozilla::widget::GeckoAppShell::IsTablet();
    }
 +  desktop = NS_LITERAL_STRING("android");
  #endif
diff -r 12530a091878 -r a1f740acf68e mozilla-repo.patch
--- a/mozilla-repo.patch	Sun Mar 01 14:13:25 2015 +0100
+++ b/mozilla-repo.patch	Sun Mar 01 19:07:16 2015 +0100
@@ -1,5 +1,6 @@
 # HG changeset patch
 # Parent 80b6464bd883864fce57e8748010869af1be69e9
+# Parent  d160c6876c5f05d902b391551bf4f684254b3c7d
 
 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
 --- a/toolkit/mozapps/installer/package-name.mk
@@ -10,7 +11,7 @@
  
  ifndef INCLUDED_RCS_MK
    USE_RCS_MK := 1
-   include $(topsrcdir)/config/makefiles/makeutils.mk
+   include $(MOZILLA_DIR)/config/makefiles/makeutils.mk
  endif
  
 -MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null))
diff -r 12530a091878 -r a1f740acf68e mozilla-shared-nss-db.patch
--- a/mozilla-shared-nss-db.patch	Sun Mar 01 14:13:25 2015 +0100
+++ b/mozilla-shared-nss-db.patch	Sun Mar 01 19:07:16 2015 +0100
@@ -7,7 +7,7 @@
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -8268,16 +8268,31 @@ if test "$MOZ_ENABLE_SKIA"; then
+@@ -8207,16 +8207,31 @@ if test "$MOZ_ENABLE_SKIA"; then
      MOZ_ENABLE_SKIA_GPU=1
      AC_DEFINE(USE_SKIA_GPU)
      AC_SUBST(MOZ_ENABLE_SKIA_GPU)
@@ -84,10 +84,10 @@
  #include "ExtendedValidation.h"
  #include "NSSCertDBTrustDomain.h"
  #include "mozilla/Telemetry.h"
+ #include "nsAppDirectoryServiceDefs.h"
  #include "nsCertVerificationThread.h"
  #include "nsAppDirectoryServiceDefs.h"
- #include "nsComponentManagerUtils.h"
-@@ -986,17 +993,31 @@ nsNSSComponent::InitializeNSS()
+@@ -996,17 +1003,31 @@ nsNSSComponent::InitializeNSS()
    if (NS_FAILED(rv)) {
      nsPSMInitPanic::SetPanic();
      return NS_ERROR_NOT_AVAILABLE;
diff -r 12530a091878 -r a1f740acf68e series
--- a/series	Sun Mar 01 14:13:25 2015 +0100
+++ b/series	Sun Mar 01 19:07:16 2015 +0100
@@ -12,7 +12,6 @@
 mozilla-icu-strncat.patch
 mozilla-arm-disable-edsp.patch
 mozilla-idldir.patch
-mozilla-bmo1088588.patch
 mozilla-openaes-decl.patch
 
 # Firefox patches
diff -r 12530a091878 -r a1f740acf68e toolkit-download-folder.patch
--- a/toolkit-download-folder.patch	Sun Mar 01 14:13:25 2015 +0100
+++ b/toolkit-download-folder.patch	Sun Mar 01 19:07:16 2015 +0100
@@ -6,7 +6,7 @@
 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
 --- a/browser/components/preferences/main.js
 +++ b/browser/components/preferences/main.js
-@@ -290,17 +290,17 @@ var gMainPane = {
+@@ -408,17 +408,17 @@ var gMainPane = {
        // and was available as an option in the 1.5 drop down. On XP this
        // was in My Documents, on OSX it was in User Docs. In 2.0, we did
        // away with the drop down option, although the special label was
@@ -17,18 +17,18 @@
        // folder. See nsDownloadManager for details. 
 -      downloadFolder.label = bundlePreferences.getString("downloadsFolderName");
 +      downloadFolder.label = "Downloads";
-       iconUrlSpec = fph.getURLSpecFromFile(this._indexToFolder(1));
+       iconUrlSpec = fph.getURLSpecFromFile(yield this._indexToFolder(1));
      } else {
        // 'Desktop'
        downloadFolder.label = bundlePreferences.getString("desktopFolderName");
-       iconUrlSpec = fph.getURLSpecFromFile(this._getDownloadsFolder("Desktop"));
+       iconUrlSpec = fph.getURLSpecFromFile(yield this._getDownloadsFolder("Desktop"));
      }
      downloadFolder.image = "moz-icon://" + iconUrlSpec + "?size=16";
-     
+   }),
 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
 --- a/toolkit/components/downloads/nsDownloadManager.cpp
 +++ b/toolkit/components/downloads/nsDownloadManager.cpp
-@@ -1365,18 +1365,20 @@ nsDownloadManager::GetDefaultDownloadsDi
+@@ -1361,18 +1361,20 @@ nsDownloadManager::GetDefaultDownloadsDi
    // Vista:
    // Downloads
    // XP/2K: