From e65cfac3c5d3aab3ed3991a52ab1f05b39f186e9 Mon Sep 17 00:00:00 2001 From: Marco Bonardo Date: Fri, 26 Mar 2010 22:57:28 +0100 Subject: [PATCH] Bug 554903 - Remove microsummaries.xpt reference from package-manifest and fix a left-over, r=sdwilsh --- browser/installer/package-manifest.in | 1 - toolkit/components/places/src/nsMicrosummaryService.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 0762d1f0f6cb..6505ed935b14 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -196,7 +196,6 @@ #endif @BINPATH@/components/locale.xpt @BINPATH@/components/lwbrk.xpt -@BINPATH@/components/microsummaries.xpt #ifndef WINCE @BINPATH@/components/migration.xpt #endif diff --git a/toolkit/components/places/src/nsMicrosummaryService.js b/toolkit/components/places/src/nsMicrosummaryService.js index 31b6ea254337..0287cebb0172 100644 --- a/toolkit/components/places/src/nsMicrosummaryService.js +++ b/toolkit/components/places/src/nsMicrosummaryService.js @@ -2161,7 +2161,7 @@ function sanitizeName(aName) { // If our input had not enough valid characters, use a random name. if (name.length < MIN_GENERATOR_NAME_LENGTH) - name = Math.random().toString(36).substr(2); + name = Math.random().toString(36).replace(/^.*\./, ''); // Force max length. return name.substring(0, MAX_GENERATOR_NAME_LENGTH);