        self.addonsTotalCount = self.addons.length;
 diff -r e3e008015298 toolkit/mozapps/update/nsUpdateService.js
 --- a/toolkit/mozapps/update/nsUpdateService.js	Wed Jan 23 11:46:06 2013 -0800
-+++ b/toolkit/mozapps/update/nsUpdateService.js	Tue Feb 12 07:50:01 2013 +0100
++++ b/toolkit/mozapps/update/nsUpdateService.js	Wed Feb 13 10:45:17 2013 +0100
 @@ -46,21 +46,21 @@ const PREF_APP_UPDATE_STAGE_ENABLED     
  const PREF_APP_UPDATE_URL                 = "app.update.url";
  const PREF_APP_UPDATE_URL_DETAILS         = "app.update.url.details";

   case eAppliedUpdate:
   case eAppliedService:
     // An update was applied in the background, so we need to switch to using
@@ -952,29 +942,34 @@ nsUpdateProcessor::ProcessUpdate(nsIUpda
     }
   } else {
     MOZ_ASSERT(argc == 1); // see above

         // TODO: use more informative error code here
diff -r e3e008015298 toolkit/xre/nsUpdateDriver.cpp
--- a/toolkit/xre/nsUpdateDriver.cpp	Wed Jan 23 11:46:06 2013 -0800
+++ b/toolkit/xre/nsUpdateDriver.cpp	Wed Feb 13 10:45:17 2013 +0100
@@ -412,45 +412,42 @@ SwitchToUpdatedApp(nsIFile *greDir, nsIF
 
   nsCAutoString updaterPath;
   rv = updater->GetNativePath(updaterPath);
   if (NS_FAILED(rv))
     return;
 
 #endif
 
-  // Get the directory to which the update will be applied. On Mac OSX we need
-  // to apply the update to the Updated.app directory under the Foo.app
-  // directory which is the parent of the parent of the appDir. On other
-  // platforms we will just apply to the appDir/updated.
+  // Get the directory to which the update will be applied. For JonDoBrowser on
+  // Linux we need to apply the update to the parent of the parent of the
+  // appDir.
   nsCOMPtr<nsIFile> updatedDir;
 #if defined(XP_MACOSX)
+  // XXX: Not implemented yet.
+#else
+  // XXX: Only Linux currently.
   nsCAutoString applyToDir;
   {
     nsCOMPtr<nsIFile> parentDir1, parentDir2;
     rv = appDir->GetParent(getter_AddRefs(parentDir1));
     if (NS_FAILED(rv))
       return;
     rv = parentDir1->GetParent(getter_AddRefs(parentDir2));
     if (NS_FAILED(rv))
       return;
-    if (!GetFile(parentDir2, NS_LITERAL_CSTRING("Updated.app"), updatedDir))
+    if (!GetFile(parentDir2, NS_LITERAL_CSTRING("updated"), updatedDir))
       return;
-    rv = updatedDir->GetNativePath(applyToDir);
   }
-#else
-  if (!GetFile(appDir, NS_LITERAL_CSTRING("updated"), updatedDir))
-    return;
 #if defined(XP_WIN)
   nsAutoString applyToDirW;
   rv = updatedDir->GetPath(applyToDirW);
 
   NS_ConvertUTF16toUTF8 applyToDir(applyToDirW);
 #else
-  nsCAutoString applyToDir;
   rv = updatedDir->GetNativePath(applyToDir);
 #endif
 #endif
   if (NS_FAILED(rv))
     return;
 
   // Make sure that the updated directory exists
   bool updatedDirExists = false;
@@ -608,56 +605,50 @@ ApplyUpdate(nsIFile *greDir, nsIFile *up
   
   nsCAutoString updaterPath;
   rv = updater->GetNativePath(updaterPath);
