freebsd-ports/www/libxul/files/patch-toolkit-components-places-src-nsMorkHistoryImporter.cpp
Joe Marcus Clarke 69fe7c5867 Merge patches from firefox3 to hopefully fix the build on certain platforms.
Additionally, fix a plist problem with files being installed to /etc.
2009-04-12 03:30:29 +00:00

17 lines
615 B
C++

--- toolkit/components/places/src/nsMorkHistoryImporter.cpp.orig 2008-03-19 20:30:49.000000000 +0100
+++ toolkit/components/places/src/nsMorkHistoryImporter.cpp 2008-12-17 09:38:05.000000000 +0100
@@ -148,9 +148,12 @@ AddToHistoryCB(const nsCSubstring &aRowI
}
PRTime date;
- if (PR_sscanf(values[kLastVisitColumn].get(), "%lld", &date) != 1) {
+ long long ld;
+ if (PR_sscanf(values[kLastVisitColumn].get(), "%lld", &ld) != 1) {
date = -1;
- }
+ } else {
+ date = ld;
+ }
PRBool isTyped = values[kTypedColumn].EqualsLiteral("1");
PRInt32 transition = isTyped ?