Author: mhutch
Date: 2007-12-03 16:48:51 -0500 (Mon, 03 Dec 2007)
New Revision: 90600

Modified:
   trunk/monodevelop/Extras/WelcomePage/ChangeLog
   trunk/monodevelop/Extras/WelcomePage/Makefile.am
   trunk/monodevelop/Extras/WelcomePage/WelcomePage.mdp
   trunk/monodevelop/Extras/WelcomePage/WelcomePageView.cs
Log:
* WelcomePageView.cs: Second part of the fix for "Bug 345423 - project
  is not a registered protocol".

Modified: trunk/monodevelop/Extras/WelcomePage/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/WelcomePage/ChangeLog      2007-12-03 21:47:34 UTC 
(rev 90599)
+++ trunk/monodevelop/Extras/WelcomePage/ChangeLog      2007-12-03 21:48:51 UTC 
(rev 90600)
@@ -1,3 +1,8 @@
+2007-12-03  Michael Hutchinson <[EMAIL PROTECTED]> 
+
+       * WelcomePageView.cs: Second part of the fix for "Bug 345423 - project 
is
+         not a registered protocol".
+
 2007-11-30  Michael Hutchinson <[EMAIL PROTECTED]> 
 
        * WelcomePageOptionPanel.cs, WelcomePageView.cs, 
WelcomePageCommands.cs: Use

Modified: trunk/monodevelop/Extras/WelcomePage/Makefile.am
===================================================================
--- trunk/monodevelop/Extras/WelcomePage/Makefile.am    2007-12-03 21:47:34 UTC 
(rev 90599)
+++ trunk/monodevelop/Extras/WelcomePage/Makefile.am    2007-12-03 21:48:51 UTC 
(rev 90600)
@@ -11,15 +11,18 @@
        -r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
        -r:$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
        -r:$(top_builddir)/build/bin/MonoDevelop.Projects.dll \
+       -r:Mono.Posix \
        -r:System \
        -r:System.Xml
 
 FILES =  \
+       gtk-gui/generated.cs \
        WelcomePageCommands.cs \
        WelcomePageOptionPanel.cs \
        WelcomePageView.cs
 
 RES =  \
+       gtk-gui/gui.stetic \
        WelcomePage.addin.xml \
        WelcomePage.xsl \
        WelcomePageContent.xml

Modified: trunk/monodevelop/Extras/WelcomePage/WelcomePage.mdp
===================================================================
--- trunk/monodevelop/Extras/WelcomePage/WelcomePage.mdp        2007-12-03 
21:47:34 UTC (rev 90599)
+++ trunk/monodevelop/Extras/WelcomePage/WelcomePage.mdp        2007-12-03 
21:48:51 UTC (rev 90600)
@@ -24,23 +24,27 @@
     <File name="mono-logo.png" subtype="Code" buildaction="FileCopy" />
     <File name="WelcomePage.css" subtype="Code" buildaction="FileCopy" />
     <File name="ChangeLog" subtype="Code" buildaction="Nothing" />
+    <File name="gtk-gui/gui.stetic" subtype="Code" 
buildaction="EmbedAsResource" />
+    <File name="gtk-gui/generated.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="False" refto="gecko-sharp, 
Version=2.0.0.0, Culture=neutral, PublicKeyToken=ccf7d78a55e9f021" />
     <ProjectReference type="Gac" localcopy="False" refto="System.Xml, 
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Gac" localcopy="False" refto="gnome-sharp, 
Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="False" refto="glade-sharp, 
Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Project" localcopy="False" 
refto="MonoDevelop.Core" />
     <ProjectReference type="Project" localcopy="False" 
refto="MonoDevelop.Components" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Ide" 
/>
     <ProjectReference type="Project" localcopy="False" 
refto="MonoDevelop.Core.Gui" />
     <ProjectReference type="Project" localcopy="False" 
refto="MonoDevelop.Projects" />
     <ProjectReference type="Gac" localcopy="False" refto="System, 
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+    <ProjectReference type="Gac" localcopy="True" refto="glade-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gnome-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, 
Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
+  <GtkDesignInfo gtkVersion="2.8.3" />
   <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" 
RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" 
SyncReferences="True" IsAutotoolsProject="True" 
RelativeConfigureInPath="../../">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar Sync="True" Name="DATA_FILES" />

Modified: trunk/monodevelop/Extras/WelcomePage/WelcomePageView.cs
===================================================================
--- trunk/monodevelop/Extras/WelcomePage/WelcomePageView.cs     2007-12-03 
21:47:34 UTC (rev 90599)
+++ trunk/monodevelop/Extras/WelcomePage/WelcomePageView.cs     2007-12-03 
21:48:51 UTC (rev 90600)
@@ -62,6 +62,7 @@
                static IWebBrowser browser;
                
                bool loadingProject;
+               bool loadingContent = false;
                
                string datadir;
                
@@ -119,6 +120,7 @@
                        StringWriter fs = new StringWriter ();
                        xslt.Transform (inxml, arg, fs, null);
                        
+                       loadingContent = true;
                        browser.LoadHtml (fs.ToString ());
                }
 
@@ -142,6 +144,12 @@
                
                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