[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 47f306e78efa118aa600536e8eb9eacbcfc9d341
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 31 14:05:23 2002 +0000

    	* Misc.subproj/WebKitDebug.h: Use displayableString in DEBUG_OBJECT
    	for nicer logging.
    
    	* WebView.subproj/IFWebView.mm:
    	(-[IFWebView keyDown:]):
    	(-[IFWebView keyUp:]):
    	Use DEBUG_OBJECT so we don't get exceptions when the key characters
    	are not simple ASCII characters.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1243 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 84bbdf4..493f688 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-05-31  Darin Adler  <darin at apple.com>
+
+	* Misc.subproj/WebKitDebug.h: Use displayableString in DEBUG_OBJECT
+	for nicer logging.
+
+	* WebView.subproj/IFWebView.mm:
+	(-[IFWebView keyDown:]):
+	(-[IFWebView keyUp:]):
+	Use DEBUG_OBJECT so we don't get exceptions when the key characters
+	are not simple ASCII characters.
+
 2002-05-30  Richard Williamson  <rjw at apple.com>
 
     API and comment cleanup.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 84bbdf4..493f688 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-05-31  Darin Adler  <darin at apple.com>
+
+	* Misc.subproj/WebKitDebug.h: Use displayableString in DEBUG_OBJECT
+	for nicer logging.
+
+	* WebView.subproj/IFWebView.mm:
+	(-[IFWebView keyDown:]):
+	(-[IFWebView keyUp:]):
+	Use DEBUG_OBJECT so we don't get exceptions when the key characters
+	are not simple ASCII characters.
+
 2002-05-30  Richard Williamson  <rjw at apple.com>
 
     API and comment cleanup.
diff --git a/WebKit/Misc.subproj/WebKitDebug.h b/WebKit/Misc.subproj/WebKitDebug.h
index 1458580..5c18bfc 100644
--- a/WebKit/Misc.subproj/WebKitDebug.h
+++ b/WebKit/Misc.subproj/WebKitDebug.h
@@ -3,6 +3,7 @@
 */
 
 #import <Foundation/Foundation.h>
+#import <Foundation/NSStringPrivate.h>
 
 #ifdef NDEBUG
 
@@ -64,7 +65,7 @@ void WebKitLog(unsigned int level, const char *file, int line, const char *funct
 }
 #endif
 
-#define DEBUG_OBJECT(object) [[object description] lossyCString]
+#define DEBUG_OBJECT(object) [[[object description] displayableString] lossyCString]
 
 #define WEBKITDEBUGLEVEL(level, format...) \
     WebKitLog(level, __FILE__, __LINE__, __PRETTY_FUNCTION__, format)
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index 9916e3e..c25521e 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -564,12 +564,11 @@
 
 - (void)keyDown: (NSEvent *)event
 {
-    WEBKITDEBUGLEVEL(WEBKIT_LOG_EVENTS, "keyDown: %s\n", [[event description] cString]);
+    WEBKITDEBUGLEVEL(WEBKIT_LOG_EVENTS, "keyDown: %s\n", DEBUG_OBJECT(event));
     int state = 0;
     
     [self _addModifiers:[event modifierFlags] toState:&state];
     QKeyEvent kEvent(QEvent::KeyPress, 0, 0, state, NSSTRING_TO_QSTRING([event characters]), [event isARepeat], 1);
-
     
     KHTMLView *widget = _private->widget;
     if (widget != 0l)
@@ -579,12 +578,11 @@
 
 - (void)keyUp: (NSEvent *)event
 {
-    WEBKITDEBUGLEVEL(WEBKIT_LOG_EVENTS, "keyUp: %s\n", [[event description] cString]);
+    WEBKITDEBUGLEVEL(WEBKIT_LOG_EVENTS, "keyUp: %s\n", DEBUG_OBJECT(event));
     int state = 0;
     
     [self _addModifiers:[event modifierFlags] toState:&state];
     QKeyEvent kEvent(QEvent::KeyPress, 0, 0, state, NSSTRING_TO_QSTRING([event characters]), [event isARepeat], 1);
-
     
     KHTMLView *widget = _private->widget;
     if (widget != 0l)
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 9916e3e..c25521e 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -564,12 +564,11 @@
 
 - (void)keyDown: (NSEvent *)event
 {
-    WEBKITDEBUGLEVEL(WEBKIT_LOG_EVENTS, "keyDown: %s\n", [[event description] cString]);
+    WEBKITDEBUGLEVEL(WEBKIT_LOG_EVENTS, "keyDown: %s\n", DEBUG_OBJECT(event));
     int state = 0;
     
     [self _addModifiers:[event modifierFlags] toState:&state];
     QKeyEvent kEvent(QEvent::KeyPress, 0, 0, state, NSSTRING_TO_QSTRING([event characters]), [event isARepeat], 1);
-
     
     KHTMLView *widget = _private->widget;
     if (widget != 0l)
@@ -579,12 +578,11 @@
 
 - (void)keyUp: (NSEvent *)event
 {
-    WEBKITDEBUGLEVEL(WEBKIT_LOG_EVENTS, "keyUp: %s\n", [[event description] cString]);
+    WEBKITDEBUGLEVEL(WEBKIT_LOG_EVENTS, "keyUp: %s\n", DEBUG_OBJECT(event));
     int state = 0;
     
     [self _addModifiers:[event modifierFlags] toState:&state];
     QKeyEvent kEvent(QEvent::KeyPress, 0, 0, state, NSSTRING_TO_QSTRING([event characters]), [event isARepeat], 1);
-
     
     KHTMLView *widget = _private->widget;
     if (widget != 0l)

-- 
WebKit Debian packaging