diff --git a/SparkleShare/Windows/SparkleBubbles.cs b/SparkleShare/Windows/SparkleBubbles.cs
index c6be2784..9c588a7c 100644
--- a/SparkleShare/Windows/SparkleBubbles.cs
+++ b/SparkleShare/Windows/SparkleBubbles.cs
@@ -27,8 +27,10 @@ namespace SparkleShare {
public SparkleBubbles ()
{
- Controller.ShowBubbleEvent += delegate (string title, string subtext, string image_path) {
- SparkleUI.StatusIcon.ShowBalloon(title, subtext, image_path);
+ Controller.ShowBubbleEvent += delegate (string title, string subtext,
+ string image_path) {
+
+ SparkleUI.StatusIcon.ShowBalloon (title, subtext, image_path);
};
}
}
diff --git a/SparkleShare/Windows/SparkleController.cs b/SparkleShare/Windows/SparkleController.cs
index 1413120a..12472f2b 100644
--- a/SparkleShare/Windows/SparkleController.cs
+++ b/SparkleShare/Windows/SparkleController.cs
@@ -218,7 +218,8 @@ namespace SparkleShare {
Environment.SetEnvironmentVariable ("SSH_AUTH_SOCK",
auth_sock_match.Groups [1].Value);
- Match ssh_pid_match = new Regex (@"SSH_AGENT_PID=([^;\n\r]*)").Match (output);
+ Match ssh_pid_match =
+ new Regex (@"SSH_AGENT_PID=([^;\n\r]*)").Match (output);
if (ssh_pid_match.Success) {
string ssh_pid = ssh_pid_match.Groups [1].Value;
@@ -230,7 +231,8 @@ namespace SparkleShare {
"ssh-agent started, PID=" + ssh_pid);
} else {
- SparkleHelpers.DebugInfo ("Controller", "ssh-agent started, PID=unknown");
+ SparkleHelpers.DebugInfo ("Controller",
+ "ssh-agent started, PID=unknown");
}
}
}
diff --git a/SparkleShare/Windows/SparkleShare.csproj b/SparkleShare/Windows/SparkleShare.csproj
index 6ed932f4..c7333b65 100644
--- a/SparkleShare/Windows/SparkleShare.csproj
+++ b/SparkleShare/Windows/SparkleShare.csproj
@@ -110,12 +110,6 @@
True
Icons.resx
-
- Form
-
-
- Notification.cs
-
True
True
@@ -218,10 +212,6 @@
ResXFileCodeGenerator
Icons.Designer.cs
-
- Notification.cs
- Designer
-
ResXFileCodeGenerator
Resources.Designer.cs
diff --git a/SparkleShare/Windows/SparkleShare.sln b/SparkleShare/Windows/SparkleShare.sln
index 70ef9a9b..388751ff 100644
--- a/SparkleShare/Windows/SparkleShare.sln
+++ b/SparkleShare/Windows/SparkleShare.sln
@@ -1,43 +1,43 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare", "SparkleShare.csproj", "{728483AA-E34B-4441-BF2C-C8BC2901E4E0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib", "..\..\SparkleLib\windows\SparkleLib.csproj", "{2C914413-B31C-4362-93C7-1AE34F09112A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShareInviteOpen", "SparkleShareInviteOpen\SparkleShareInviteOpen.csproj", "{1DB5492D-B897-4A5E-8DD7-175EC65F52F2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib.Git", "..\..\SparkleLib\windows\SparkleLib.Git.csproj", "{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.Build.0 = Release|Any CPU
- {2C914413-B31C-4362-93C7-1AE34F09112A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2C914413-B31C-4362-93C7-1AE34F09112A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2C914413-B31C-4362-93C7-1AE34F09112A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2C914413-B31C-4362-93C7-1AE34F09112A}.Release|Any CPU.Build.0 = Release|Any CPU
- {1DB5492D-B897-4A5E-8DD7-175EC65F52F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1DB5492D-B897-4A5E-8DD7-175EC65F52F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1DB5492D-B897-4A5E-8DD7-175EC65F52F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1DB5492D-B897-4A5E-8DD7-175EC65F52F2}.Release|Any CPU.Build.0 = Release|Any CPU
- {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = SparkleShare.csproj
- outputpath = bin
- name = SparkleShare
- EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare", "SparkleShare.csproj", "{728483AA-E34B-4441-BF2C-C8BC2901E4E0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib", "..\..\SparkleLib\windows\SparkleLib.csproj", "{2C914413-B31C-4362-93C7-1AE34F09112A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib.Git", "..\..\SparkleLib\windows\SparkleLib.Git.csproj", "{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShareInviteOpener", "SparkleShareInviteOpener\SparkleShareInviteOpener.csproj", "{1DB5492D-B897-4A5E-8DD7-175EC65F52F2}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1DB5492D-B897-4A5E-8DD7-175EC65F52F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1DB5492D-B897-4A5E-8DD7-175EC65F52F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1DB5492D-B897-4A5E-8DD7-175EC65F52F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1DB5492D-B897-4A5E-8DD7-175EC65F52F2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2C914413-B31C-4362-93C7-1AE34F09112A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2C914413-B31C-4362-93C7-1AE34F09112A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2C914413-B31C-4362-93C7-1AE34F09112A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2C914413-B31C-4362-93C7-1AE34F09112A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(MonoDevelopProperties) = preSolution
+ StartupItem = SparkleShare.csproj
+ outputpath = bin
+ name = SparkleShare
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/SparkleShare/Windows/SparkleShareInviteOpen/SparkleShareInviteOpener.csproj b/SparkleShare/Windows/SparkleShareInviteOpen/SparkleShareInviteOpener.csproj
deleted file mode 100644
index 9e49f1df..00000000
--- a/SparkleShare/Windows/SparkleShareInviteOpen/SparkleShareInviteOpener.csproj
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
- Debug
- AnyCPU
- 9.0.30729
- 2.0
- {1DB5492D-B897-4A5E-8DD7-175EC65F52F2}
- Exe
- Properties
- SparkleShareInviteOpen
- SparkleShareInviteOpen
- v3.5
- 512
- ..\..\..\data\icons\sparkleshare.ico
-
-
- true
- full
- false
- ..\..\..\bin\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- ..\..\..\bin\
- TRACE
- prompt
- 4
-
-
-
-
-
-
- sparkleshare-invite-open.cs
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SparkleShare/Windows/SparkleShareInviteOpen/Properties/AssemblyInfo.cs b/SparkleShare/Windows/SparkleShareInviteOpener/Properties/AssemblyInfo.cs
similarity index 100%
rename from SparkleShare/Windows/SparkleShareInviteOpen/Properties/AssemblyInfo.cs
rename to SparkleShare/Windows/SparkleShareInviteOpener/Properties/AssemblyInfo.cs
diff --git a/SparkleShare/Windows/SparkleShareInviteOpen/SparkleShareInviteOpen.csproj b/SparkleShare/Windows/SparkleShareInviteOpener/SparkleShareInviteOpener.csproj
similarity index 91%
rename from SparkleShare/Windows/SparkleShareInviteOpen/SparkleShareInviteOpen.csproj
rename to SparkleShare/Windows/SparkleShareInviteOpener/SparkleShareInviteOpener.csproj
index 974378f1..582fdcf5 100644
--- a/SparkleShare/Windows/SparkleShareInviteOpen/SparkleShareInviteOpen.csproj
+++ b/SparkleShare/Windows/SparkleShareInviteOpener/SparkleShareInviteOpener.csproj
@@ -8,8 +8,8 @@
{1DB5492D-B897-4A5E-8DD7-175EC65F52F2}
Exe
Properties
- SparkleShareInviteOpen
- SparkleShareInviteOpen
+ SparkleShareInviteOpener
+ SparkleShareInviteOpener
v3.5
512
..\..\..\data\icons\sparkleshare.ico
@@ -36,6 +36,7 @@
+
-
\ No newline at end of file
+
diff --git a/SparkleShare/Windows/sparkleshare-invite-opener.cs b/SparkleShare/Windows/SparkleShareInviteOpener/sparkleshare-invite-opener.cs
similarity index 100%
rename from SparkleShare/Windows/sparkleshare-invite-opener.cs
rename to SparkleShare/Windows/SparkleShareInviteOpener/sparkleshare-invite-opener.cs