Revision: 6054
Author: [email protected]
Date: Mon Aug 31 20:16:21 2009
Log: Update to match new API.

http://code.google.com/p/google-web-toolkit/source/detail?r=6054

Modified:
  /changes/jat/plugins/plugins/webkit/Plugin/OophmWebScriptObject.mm

=======================================
--- /changes/jat/plugins/plugins/webkit/Plugin/OophmWebScriptObject.mm  Sat  
Aug 29 13:11:38 2009
+++ /changes/jat/plugins/plugins/webkit/Plugin/OophmWebScriptObject.mm  Mon  
Aug 31 20:16:21 2009
@@ -141,9 +141,14 @@
    }

    const std::string urlStr = [url UTF8String];
-  if (AllowedConnections::isAllowed(urlStr)) {
-    return [self doConnectWithUrl:url withSessionKey:sessionKey  
withHost:host
-        withModule:moduleName withHostedHtmlVersion:hostedHtmlVersion];
+  bool allowed = false;
+  if (AllowedConnections::matchesRule(urlStr, &allowed)) {
+    if (allowed) {
+      return [self doConnectWithUrl:url withSessionKey:sessionKey  
withHost:host
+          withModule:moduleName withHostedHtmlVersion:hostedHtmlVersion];
+    } else {
+      return YES;
+    }
    }

    // Otherwise, bring up an alert dialog

--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---

Reply via email to