[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:59:02 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6172da0a342b13983d18cdb1a8c36ad2f229181f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 12 06:33:14 2002 +0000
WebFoundation:
* English.lproj/StringsNotToBeLocalized.txt: Update.
WebCore:
* kwq/KWQWidget.mm: (QWidget::setCursor): Remove printf I left
in by accident.
WebKit:
* Plugins.subproj/WebNetscapePluginPackage.m: (-[WebNetscapePluginPackage load]):
Use fileSystemRepresentationWithPath, not cString, to turn a path into something
to pass to FSPathMakeRef.
* English.lproj/StringsNotToBeLocalized.txt: Update.
WebBrowser:
* BrowserNSStringExtras.m: (-[NSString compareVersionString:]):
Use lossyCString so we don't get an exception if a string is bad.
* English.lproj/StringsNotToBeLocalized.txt: Update.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2629 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 24716fc..5735962 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,10 @@
2002-11-11 Darin Adler <darin at apple.com>
+ * kwq/KWQWidget.mm: (QWidget::setCursor): Remove printf I left
+ in by accident.
+
+2002-11-11 Darin Adler <darin at apple.com>
+
- tighten up cursor handling a bit more
* kwq/KWQWidget.mm:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 24716fc..5735962 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,10 @@
2002-11-11 Darin Adler <darin at apple.com>
+ * kwq/KWQWidget.mm: (QWidget::setCursor): Remove printf I left
+ in by accident.
+
+2002-11-11 Darin Adler <darin at apple.com>
+
- tighten up cursor handling a bit more
* kwq/KWQWidget.mm:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 24716fc..5735962 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,10 @@
2002-11-11 Darin Adler <darin at apple.com>
+ * kwq/KWQWidget.mm: (QWidget::setCursor): Remove printf I left
+ in by accident.
+
+2002-11-11 Darin Adler <darin at apple.com>
+
- tighten up cursor handling a bit more
* kwq/KWQWidget.mm:
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index c6ac55a..276959d 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -289,7 +289,6 @@ void QWidget::setCursor(const QCursor &cur)
id view = data->view;
while (view) {
if ([view respondsToSelector:@selector(setDocumentCursor:)]) {
- printf("setting cursor to %p\n", cur.handle());
[view setDocumentCursor:cur.handle()];
break;
}
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 50762cd..8441fea 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,13 @@
2002-11-11 Darin Adler <darin at apple.com>
+ * Plugins.subproj/WebNetscapePluginPackage.m: (-[WebNetscapePluginPackage load]):
+ Use fileSystemRepresentationWithPath, not cString, to turn a path into something
+ to pass to FSPathMakeRef.
+
+ * English.lproj/StringsNotToBeLocalized.txt: Update.
+
+2002-11-11 Darin Adler <darin at apple.com>
+
- tighten up cursor handling a bit more
* WebView.subproj/WebDynamicScrollBarsView.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 50762cd..8441fea 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
2002-11-11 Darin Adler <darin at apple.com>
+ * Plugins.subproj/WebNetscapePluginPackage.m: (-[WebNetscapePluginPackage load]):
+ Use fileSystemRepresentationWithPath, not cString, to turn a path into something
+ to pass to FSPathMakeRef.
+
+ * English.lproj/StringsNotToBeLocalized.txt: Update.
+
+2002-11-11 Darin Adler <darin at apple.com>
+
- tighten up cursor handling a bit more
* WebView.subproj/WebDynamicScrollBarsView.m:
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 6e75766..2d8a7ea 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -1,5 +1,8 @@
" "
+" *target*"
" >>>"
+"%2d) "
+"%@ %@ in \"%@\""
"%@"
"%@-%d"
"%@."
@@ -9,6 +12,8 @@
"(This file must be converted with BinHex 4.0)"
","
"."
+"/"
+"/<!--frame%d-->-->"
"/Library/Internet Plug-Ins"
"/favicon.ico"
"/tmp/%@"
@@ -20,6 +25,7 @@
"6"
"7"
";"
+"<!--framePath "
"="
"ANIMEXTS1"
"Apple Chancery"
@@ -98,7 +104,6 @@
"WebFrameStateProvisional"
"WebHTMLView"
"WebHistoryEntriesChangedNotification"
-"WebHistoryItem %@"
"WebHostToSiteURLs"
"WebIconDatabaseDirectory"
"WebIconDidChangeNotification"
@@ -150,6 +155,8 @@
"WebSiteURLToIconURLKey"
"WebURLsWithTitlesPboardType"
"\""
+"\n "
+"\n "
"\n"
"\n--------------------------------------------\n"
"_CGFontCacheSetMaxSize"
@@ -173,6 +180,7 @@
"image/gif"
"image/jpeg"
"image/png"
+"isTargetItem"
"lastVisitedDate"
"nullplugin"
"text/"
@@ -186,7 +194,9 @@
Bookmarks.subproj/WebBookmarkList.m:"Children"
Bookmarks.subproj/WebBookmarkList.m:"Title"
Bookmarks.subproj/WebBookmarkProxy.m:"Title"
-History.subproj/WebBackForwardList.m:" %d) "
+History.subproj/WebHistoryItem.m:"NO"
+History.subproj/WebHistoryItem.m:"YES"
+History.subproj/WebHistoryItem.m:"children"
History.subproj/WebHistoryItem.m:"title"
Misc.subproj/WebIconDatabase.m:"Experiments"
Misc.subproj/WebIconDatabase.m:"icon:%@"
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginPackage.m b/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
index d995561..53b12af 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
@@ -3,13 +3,14 @@
Copyright (c) 2002, Apple, Inc. All rights reserved.
*/
-#import <WebKit/WebKitLogging.h>
#import <WebKit/WebNetscapePluginPackage.h>
+#import <WebKit/WebKitLogging.h>
+
typedef void (* FunctionPointer) (void);
typedef void (* TransitionVector) (void);
-FunctionPointer functionPointerForTVector(TransitionVector);
-TransitionVector tVectorForFunctionPointer(FunctionPointer);
+static FunctionPointer functionPointerForTVector(TransitionVector);
+static TransitionVector tVectorForFunctionPointer(FunctionPointer);
@implementation WebNetscapePluginPackage
@@ -264,7 +265,7 @@ TransitionVector tVectorForFunctionPointer(FunctionPointer);
FSSpec spec;
FSRef fref;
- err = FSPathMakeRef((UInt8 *)[path cString], &fref, NULL);
+ err = FSPathMakeRef((UInt8 *)[[NSFileManager defaultManager] fileSystemRepresentationWithPath:path], &fref, NULL);
if(err != noErr){
ERROR("FSPathMakeRef failed. Error=%d", err);
return NO;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list