From 0887aff38d359bdcbfe2d7f23533a81287f3b5e0 Mon Sep 17 00:00:00 2001
From: Matthias Dittrich <matthi.d@googlemail.com>
Date: Tue, 17 Jul 2012 14:58:13 +0200
Subject: [PATCH] fixes windows build

---
 SparkleLib/windows/SparkleLib.csproj                   |  5 +++--
 SparkleShare/Windows/SparkleAbout.cs                   |  7 -------
 SparkleShare/Windows/SparkleController.cs              |  2 +-
 SparkleShare/Windows/SparkleEventLog.cs                |  7 -------
 .../SparkleShareInviteOpener.csproj                    | 10 +++++++---
 .../Windows/SparkleShareInviteOpener/app.config        |  3 +++
 .../sparkleshare-invite-opener.cs                      |  2 +-
 SparkleShare/Windows/SparkleStatusIcon.cs              |  8 +-------
 8 files changed, 16 insertions(+), 28 deletions(-)
 create mode 100644 SparkleShare/Windows/SparkleShareInviteOpener/app.config

diff --git a/SparkleLib/windows/SparkleLib.csproj b/SparkleLib/windows/SparkleLib.csproj
index 45d2ea34..5f957fe1 100644
--- a/SparkleLib/windows/SparkleLib.csproj
+++ b/SparkleLib/windows/SparkleLib.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -80,6 +80,7 @@
     </Compile>
     <Compile Include="..\SparkleWatcher.cs">
       <Link>SparkleWatcher.cs</Link>
+      <SubType>Component</SubType>
     </Compile>
     <Compile Include="..\SparkleWatcherFactory.cs">
       <Link>SparkleWatcherFactory.cs</Link>
@@ -167,4 +168,4 @@
   <PropertyGroup>
     <PreBuildEvent>"$(ProjectDir)transform_tt.cmd"</PreBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/SparkleShare/Windows/SparkleAbout.cs b/SparkleShare/Windows/SparkleAbout.cs
index 9e89e24f..a6630c14 100644
--- a/SparkleShare/Windows/SparkleAbout.cs
+++ b/SparkleShare/Windows/SparkleAbout.cs
@@ -32,13 +32,6 @@ namespace SparkleShare {
         private Label updates;
 
 
-        // Short alias for the translations
-        public static string _(string s)
-        {
-            return Program._(s);
-        }
-
-
         public SparkleAbout ()
         {
             Title      = "About SparkleShare";
diff --git a/SparkleShare/Windows/SparkleController.cs b/SparkleShare/Windows/SparkleController.cs
index 9e30c77c..e4aaed09 100644
--- a/SparkleShare/Windows/SparkleController.cs
+++ b/SparkleShare/Windows/SparkleController.cs
@@ -147,7 +147,7 @@ namespace SparkleShare {
                 File.Delete (shortcut_path);
 
             Shortcut shortcut = new Shortcut ();
-            shortcut.Create (FoldersPath, shortcut_target);
+            shortcut.Create (FoldersPath, shortcut_path);
         }
 
 
diff --git a/SparkleShare/Windows/SparkleEventLog.cs b/SparkleShare/Windows/SparkleEventLog.cs
index eefa976f..07278497 100644
--- a/SparkleShare/Windows/SparkleEventLog.cs
+++ b/SparkleShare/Windows/SparkleEventLog.cs
@@ -42,13 +42,6 @@ namespace SparkleShare {
         private SparkleSpinner spinner;
         
         
-        // Short alias for the translations
-        public static string _(string s)
-        {
-            return Program._(s);
-        }
-
-        
         public SparkleEventLog ()
         {
             Title              = "Recent Changes";
diff --git a/SparkleShare/Windows/SparkleShareInviteOpener/SparkleShareInviteOpener.csproj b/SparkleShare/Windows/SparkleShareInviteOpener/SparkleShareInviteOpener.csproj
index 3d73a6f3..c741d98f 100644
--- a/SparkleShare/Windows/SparkleShareInviteOpener/SparkleShareInviteOpener.csproj
+++ b/SparkleShare/Windows/SparkleShareInviteOpener/SparkleShareInviteOpener.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,9 +10,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SparkleShareInviteOpener</RootNamespace>
     <AssemblyName>SparkleShareInviteOpener</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>..\Pixmaps\sparkleshare-app.ico</ApplicationIcon>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -38,6 +39,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="sparkleshare-invite-opener.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -46,4 +50,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/SparkleShare/Windows/SparkleShareInviteOpener/app.config b/SparkleShare/Windows/SparkleShareInviteOpener/app.config
new file mode 100644
index 00000000..e3656033
--- /dev/null
+++ b/SparkleShare/Windows/SparkleShareInviteOpener/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/SparkleShare/Windows/SparkleShareInviteOpener/sparkleshare-invite-opener.cs b/SparkleShare/Windows/SparkleShareInviteOpener/sparkleshare-invite-opener.cs
index 14aed109..aa356795 100644
--- a/SparkleShare/Windows/SparkleShareInviteOpener/sparkleshare-invite-opener.cs
+++ b/SparkleShare/Windows/SparkleShareInviteOpener/sparkleshare-invite-opener.cs
@@ -53,7 +53,7 @@ namespace SparkleShare {
 
             if (xml.Contains ("<sparkleshare>")) {
                 File.WriteAllText (target_path, xml);
-                Console.WriteLine ("Downloaded invite: " + safe_url);
+                Console.WriteLine ("Downloaded invite: " + url);
             }
         }
     }
diff --git a/SparkleShare/Windows/SparkleStatusIcon.cs b/SparkleShare/Windows/SparkleStatusIcon.cs
index 5527d017..a5934b90 100644
--- a/SparkleShare/Windows/SparkleStatusIcon.cs
+++ b/SparkleShare/Windows/SparkleStatusIcon.cs
@@ -46,13 +46,7 @@ namespace SparkleShare {
         private SparkleNotifyIcon notify_icon = new SparkleNotifyIcon ();
 
         
-        // Short alias for the translations
-        public static string _ (string s)
-        {
-            return Program._ (s);
-        }
-        
-        
+       
         public SparkleStatusIcon ()
 		{
 			CreateAnimationFrames ();