From: Artur Signell <artur.signell@itmill.com>
Date: Tue, 9 Mar 2010 10:02:24 +0000 (+0000)
Subject: Re-applied fix for #4240
X-Git-Tag: 6.7.0.beta1~1978
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b1dc528de16aef5125f75286671c40453f2a36fc;p=vaadin-framework.git

Re-applied fix for #4240

svn changeset:11702/svn branch:6.3
---

diff --git a/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml b/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
index 51fa9382bc..2962ebbfd4 100644
--- a/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
+++ b/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
@@ -14,7 +14,7 @@
 	<inherits name="com.google.gwt.user.User" />
 
 	<inherits name="com.google.gwt.http.HTTP" />
-	
+
 	<source path="client" />
 	
 	<!-- Use our own history impl for IE to workaround #2931.	--> 
@@ -23,12 +23,6 @@
 		<when-property-is name="user.agent" value="ie6"/>
 	</replace-with>
 
-	<!-- Opera needs a different implementation due to GWT issue 3956 (#4099) -->
-	<replace-with class="com.google.gwt.user.client.impl.HistoryImplTimer">
-		<when-type-is class="com.google.gwt.user.client.impl.HistoryImpl" />
-		<when-property-is name="user.agent" value="opera" />
-	</replace-with>
-
 	<generate-with class="com.vaadin.terminal.gwt.widgetsetutils.WidgetMapGenerator">
 		<when-type-is class="com.vaadin.terminal.gwt.client.WidgetMap"/>
 	</generate-with>