From 7a4b4f6c0475f626ddd31933419d17d83c6dbf6d Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 25 Dec 2008 16:32:32 +0000 Subject: merges r20089, r20090 and r20091 from trunk into ruby_1_9_1. * ext/win32ole/win32ole.c (ole_event_free): invoke IConnectionPoint::Unadvise before invoking IConnectionPoint::Release. * test/win32ole/test_win32ole_event.rb, test/win32ole/err_in_callback.rb, test/win32ole/test_err_in_callback.rb: Use ActiveX Data Object Library instead of InternetExplorer. -- * test/win32ole/test_err_in_callback.rb: add teardown. -- * test/win32ole/test_win32ole_event.rb: rename test class. * test/win32ole/test_win32ole_variant_outarg.rb: add in order to use ADO instead of Internet Explorer. remove test/win32ole/test_win32ole_variant_with_ie.rb. * test/win32ole/orig_data.csv: ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21052 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/win32ole/test_err_in_callback.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'test') diff --git a/test/win32ole/test_err_in_callback.rb b/test/win32ole/test_err_in_callback.rb index bbbab719d..f067c82e4 100644 --- a/test/win32ole/test_err_in_callback.rb +++ b/test/win32ole/test_err_in_callback.rb @@ -39,6 +39,5 @@ if defined?(WIN32OLE) def teardown File.unlink("test_err_in_callback.log") end - end end -- cgit