[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:17:34 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 9d750573923447fca6fca6c0dc47fc629e8de1a2
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 7 22:42:19 2002 +0000

    	* MIME.subproj/IFContentHandler.m: (-[IFContentHandler HTMLDocument]):
    	Fix a warning that shows up with the new C++ compiler (not sure why it
    	is not showing up with the old one).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1298 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index de36e38..cee172b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-07  Darin Adler  <darin at apple.com>
+
+	* MIME.subproj/IFContentHandler.m: (-[IFContentHandler HTMLDocument]):
+	Fix a warning that shows up with the new C++ compiler (not sure why it
+	is not showing up with the old one).
+
 2002-06-07  Chris Blumenberg  <cblu at apple.com>
 	
 	Allow plug-ins to make a NPP_*URLNotify request when
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index de36e38..cee172b 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-06-07  Darin Adler  <darin at apple.com>
+
+	* MIME.subproj/IFContentHandler.m: (-[IFContentHandler HTMLDocument]):
+	Fix a warning that shows up with the new C++ compiler (not sure why it
+	is not showing up with the old one).
+
 2002-06-07  Chris Blumenberg  <cblu at apple.com>
 	
 	Allow plug-ins to make a NPP_*URLNotify request when
diff --git a/WebKit/MIME.subproj/IFContentHandler.m b/WebKit/MIME.subproj/IFContentHandler.m
index ca7e859..e5439c9 100644
--- a/WebKit/MIME.subproj/IFContentHandler.m
+++ b/WebKit/MIME.subproj/IFContentHandler.m
@@ -51,8 +51,9 @@ static NSString *textDocumentTemplate = nil;
         return [self useTemplate:@"plugin_document_template" withGlobal:&pluginDocumentTemplate];
     case IFMIMEHANDLERTYPE_TEXT:
         return [self useTemplate:@"text_document_template" withGlobal:&textDocumentTemplate];
+    default:
+        return nil;
     }
-    return nil;
 }
 
 - (NSString *) textHTMLDocumentBottom;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list