Revision: 6260
Author: [email protected]
Date: Wed Sep 30 09:09:33 2009
Log: Rollback 6254:6256, IE plugin fixes that should have
been committed to trunk. Scottb will re-commit them there.

Reviewed by: scottb

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

Modified:
  /branches/farewellSwt/plugins/ie/oophm/oophm/oophm.vcproj
  /branches/farewellSwt/plugins/ie/oophm/oophm/plugin.cpp
  /branches/farewellSwt/plugins/ie/prebuilt/oophm.dll
  /branches/farewellSwt/plugins/ie/prebuilt/oophm64.dll

=======================================
--- /branches/farewellSwt/plugins/ie/oophm/oophm/oophm.vcproj   Tue Sep 29  
16:00:43 2009
+++ /branches/farewellSwt/plugins/ie/oophm/oophm/oophm.vcproj   Wed Sep 30  
09:09:33 2009
@@ -56,7 +56,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                                
AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;../../../platform/Win;../../../common"
+                               AdditionalIncludeDirectories="../../../common"
                                 
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GWT_DEBUGLEVEL=Spam"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -151,7 +151,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                                
AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;../../../platform/Win;../../../common"
+                               AdditionalIncludeDirectories="../../../common"
                                 
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GWT_DEBUGLEVEL=Spam"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -342,7 +342,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                FavorSizeOrSpeed="1"
-                                
AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;../../../platform/Win;../../../common"
+                               
AdditionalIncludeDirectories="../../../platform/Win;../../../common"
                                
PreprocessorDefinitions="_WINDOWS;GWT_DEBUGDISABLE"
                                RuntimeLibrary="0"
                                UsePrecompiledHeader="0"
=======================================
--- /branches/farewellSwt/plugins/ie/oophm/oophm/plugin.cpp     Tue Sep 29  
16:01:10 2009
+++ /branches/farewellSwt/plugins/ie/oophm/oophm/plugin.cpp     Wed Sep 30  
09:09:33 2009
@@ -92,12 +92,7 @@
      return S_OK;
    }

-  // Use the current thread ID as a proxy for tab ID.
-  DWORD threadId = GetCurrentThreadId();
-  char buf[20];
-  snprintf(buf, sizeof(buf), "%lu", threadId);
-  std::string tabKey = buf;
-
+  std::string tabKey = ""; // TODO(jat): add support for tab identity
    std::string sessionKey = BSTRToUTF8(bsessionKey);
    std::string moduleName = BSTRToUTF8(bmoduleName);
    IOmNavigator* navigator;
=======================================
--- /branches/farewellSwt/plugins/ie/prebuilt/oophm.dll Tue Sep 29 16:01:10  
2009
+++ /branches/farewellSwt/plugins/ie/prebuilt/oophm.dll Wed Sep 30 09:09:33  
2009
Binary file, no diff available.
=======================================
--- /branches/farewellSwt/plugins/ie/prebuilt/oophm64.dll       Tue Sep 29  
15:51:30 2009
+++ /branches/farewellSwt/plugins/ie/prebuilt/oophm64.dll       Wed Sep 30  
09:09:33 2009
Binary file, no diff available.

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

Reply via email to