[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 7af495a55c094e94289fd8a9642c223736e5c5f9
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 27 02:53:57 2010 +0000

    MiniBrowser crashes when opening main menu item
    https://bugs.webkit.org/show_bug.cgi?id=46588
    
    Reviewed by Simon Fraser.
    
    * UIProcess/API/mac/PageClientImpl.mm:
    (WebKit::PageClientImpl::setEditCommandState): Don't allow default
    String -> NSString conversion to take place, and use the increasingly
    misnamed nsStringFromWebCoreString instead.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68364 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index ea72898..1c652ea 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,17 @@
 2010-09-26  Sam Weinig  <sam at webkit.org>
 
+        Reviewed by Simon Fraser.
+
+        MiniBrowser crashes when opening main menu item
+        https://bugs.webkit.org/show_bug.cgi?id=46588
+
+        * UIProcess/API/mac/PageClientImpl.mm:
+        (WebKit::PageClientImpl::setEditCommandState): Don't allow default
+        String -> NSString conversion to take place, and use the increasingly
+        misnamed nsStringFromWebCoreString instead.
+
+2010-09-26  Sam Weinig  <sam at webkit.org>
+
         Another windows build fix windows attempt.
 
         * win/WebKit2Common.vsprops:
diff --git a/WebKit2/UIProcess/API/mac/PageClientImpl.mm b/WebKit2/UIProcess/API/mac/PageClientImpl.mm
index ff428b5..bee4672 100644
--- a/WebKit2/UIProcess/API/mac/PageClientImpl.mm
+++ b/WebKit2/UIProcess/API/mac/PageClientImpl.mm
@@ -203,7 +203,7 @@ void PageClientImpl::clearAllEditCommands()
 
 void PageClientImpl::setEditCommandState(const String& commandName, bool isEnabled, int newState)
 {
-    [m_wkView _setUserInterfaceItemState:commandName enabled:isEnabled state:newState];
+    [m_wkView _setUserInterfaceItemState:nsStringFromWebCoreString(commandName) enabled:isEnabled state:newState];
 }
 
 #if USE(ACCELERATED_COMPOSITING)
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index 97a3c06..d0fa6c0 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -1899,7 +1899,6 @@
 			isa = PBXProject;
 			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "WebKit2" */;
 			compatibilityVersion = "Xcode 3.1";
-			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,

-- 
WebKit Debian packaging