Author: mhutch
Date: 2007-12-03 21:05:45 -0500 (Mon, 03 Dec 2007)
New Revision: 90618

Modified:
   trunk/monodevelop/Extras/WelcomePage/ChangeLog
   trunk/monodevelop/Extras/WelcomePage/WelcomePageView.cs
Log:
* WelcomePageView.cs: Use new LinkClicked event.

Modified: trunk/monodevelop/Extras/WelcomePage/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/WelcomePage/ChangeLog      2007-12-04 02:05:02 UTC 
(rev 90617)
+++ trunk/monodevelop/Extras/WelcomePage/ChangeLog      2007-12-04 02:05:45 UTC 
(rev 90618)
@@ -1,5 +1,9 @@
 2007-12-03  Michael Hutchinson <[EMAIL PROTECTED]> 
 
+       * WelcomePageView.cs: Use new LinkClicked event.
+
+2007-12-03  Michael Hutchinson <[EMAIL PROTECTED]> 
+
        * WelcomePageView.cs: Second part of the fix for "Bug 345423 - project 
is
          not a registered protocol".
 

Modified: trunk/monodevelop/Extras/WelcomePage/WelcomePageView.cs
===================================================================
--- trunk/monodevelop/Extras/WelcomePage/WelcomePageView.cs     2007-12-04 
02:05:02 UTC (rev 90617)
+++ trunk/monodevelop/Extras/WelcomePage/WelcomePageView.cs     2007-12-04 
02:05:45 UTC (rev 90618)
@@ -62,7 +62,6 @@
                static IWebBrowser browser;
                
                bool loadingProject;
-               bool loadingContent = false;
                
                string datadir;
                
@@ -91,7 +90,7 @@
                                browser = WebBrowserService.GetWebBrowser ();
                                Control.Show ();
                                Control.Show ();
-                               browser.LocationChanging += CatchUri;
+                               browser.LinkClicked += CatchUri;
                                browser.LinkStatusChanged += LinkMessage;
                        }
                        
@@ -120,7 +119,6 @@
                        StringWriter fs = new StringWriter ();
                        xslt.Transform (inxml, arg, fs, null);
                        
-                       loadingContent = true;
                        browser.LoadHtml (fs.ToString ());
                }
 
@@ -144,12 +142,6 @@
                
                void CatchUri (object sender, LocationChangingEventArgs e)
                {
-                       //don't intercept the URI when we actually want to load 
a page
-                       if (loadingContent) {
-                               loadingContent = false;
-                               return;
-                       }
-                       
                        e.SuppressChange = true;
        
                        string URI = e.NextLocation;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to