beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

setup: Fix page logic

Browse source
This commit is contained in:
Hylke Bons 2012-05-20 17:16:14 +01:00
parent 6a0ee9ed63
commit 9a7e1eaee1
3 changed files with 24 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
SparkleLib/SparkleListenerTcp.cs
View file

@ -107,11 +107,12 @@ namespace SparkleLib {
try {
// This blocks the thread
int i = 0;
int timeout = 300;
while (this.socket.Available < 1) {
try {
// We've timed out, let's ping the server to
// see if the connection is still up
if (i == 300) {
if (i == timeout) {
SparkleHelpers.DebugInfo ("ListenerTcp",
"Pinging " + Server);
@ -137,7 +138,7 @@ namespace SparkleLib {
// system likely woke up from sleep and we want to
// simulate a disconnect
int sleepiness = DateTime.Compare (
this.last_ping.AddMilliseconds (180 * 1000 * 1.2),
this.last_ping.AddMilliseconds (timeout * 1000 * 1.2),
DateTime.Now
);

41
SparkleShare/Mac/SparkleShare.csproj
View file

@ -10,7 +10,6 @@
<OutputType>Exe</OutputType>
<RootNamespace>SparkleShare</RootNamespace>
<AssemblyName>SparkleShare</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<ReleaseVersion>0.8.4</ReleaseVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@ -37,34 +36,18 @@
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="System.Xml">
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="System.Core">
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="System.Xml.Linq">
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="System.Drawing">
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="MonoMac">
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Mono.Posix">
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Drawing" />
<Reference Include="MonoMac" />
<Reference Include="Mono.Posix" />
<Reference Include="System.Net" />
<Reference Include="SparkleLib, Version=0.8.3.0, Culture=neutral, PublicKeyToken=null">
<SpecificVersion>False</SpecificVersion>
<Reference Include="SparkleLib">
<HintPath>..\..\bin\SparkleLib.dll</HintPath>
</Reference>
<Reference Include="SparkleLib.Git, Version=0.8.3.0, Culture=neutral, PublicKeyToken=null">
<SpecificVersion>False</SpecificVersion>
<Reference Include="SparkleLib.Git">
<HintPath>..\..\bin\SparkleLib.Git.dll</HintPath>
</Reference>
</ItemGroup>
@ -360,6 +343,12 @@
<Content Include="..\..\data\avatar-k.png">
<Link>Pixmaps\avatar-k.png</Link>
</Content>
<Content Include="..\..\data\plugins\ssnet.png">
<Link>Plugins\ssnet.png</Link>
</Content>
<Content Include="..\..\data\plugins\ssnet.xml">
<Link>Plugins\ssnet.xml</Link>
</Content>
</ItemGroup>
<ItemGroup>
<Folder Include="Pixmaps\" />

9
SparkleShare/SparkleSetupController.cs
View file

@ -206,9 +206,12 @@ namespace SparkleShare {
if (page_type == PageType.Add) {
if (WindowIsOpen) {
if (this.current_page == PageType.Error) {
if (this.current_page == PageType.Error ||
this.current_page == PageType.Finished ||
this.current_page == PageType.None) {
if (ChangePageEvent != null)
ChangePageEvent (page_type, null);
ChangePageEvent (PageType.Add, null);
}
if (ShowWindowEvent != null)
@ -216,7 +219,7 @@ namespace SparkleShare {
} else if (!Program.Controller.FirstRun && TutorialPageNumber == 0) {
if (ChangePageEvent != null)
ChangePageEvent (page_type, null);
ChangePageEvent (PageType.Add, null);
WindowIsOpen = true;