4 files changed, 42 insertions, 1 deletions
diff --git a/SparkleShare/Linux/SparkleEventLog.cs b/SparkleShare/Linux/SparkleEventLog.cs
index db6ff3f..8fcac27 100755
--- a/SparkleShare/Linux/SparkleEventLog.cs
+++ b/SparkleShare/Linux/SparkleEventLog.cs
@@ -70,6 +70,7 @@ namespace SparkleShare {
                 new Gdk.RGBA () { Red = 1, Green = 1, Blue=1, Alpha = 1 });
 
             this.web_view = new WebView () { Editable = false };
+			this.web_view.Settings.EnablePlugins = false;
             this.web_view.NavigationRequested += WebViewNavigationRequested;
 
             this.scrolled_window.Add (this.web_view);
diff --git a/SparkleShare/Linux/SparkleUI.cs b/SparkleShare/Linux/SparkleUI.cs
index 4c5b27b..4bcc037 100644
--- a/SparkleShare/Linux/SparkleUI.cs
+++ b/SparkleShare/Linux/SparkleUI.cs
@@ -61,7 +61,7 @@ namespace SparkleShare {
 
         public void Run ()
         {   
-            (this.application as GLib.Application).Run (null, null);
+            (this.application as GLib.Application).Run (0, null);
         }
 
 
diff --git a/SparkleShare/Linux/sparkleshare.desktop.appdata.xml b/SparkleShare/Linux/sparkleshare.desktop.appdata.xml
new file mode 100644
index 0000000..6df28d1
--- /dev/null
+++ b/SparkleShare/Linux/sparkleshare.desktop.appdata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+  <id type="desktop">sparkleshare.desktop</id>
+  <metadata_licence>CC0-1.0</metadata_licence>
+  <project_license>GPL-3.0</project_license>
+  <name>SparkleShare</name>
+  <summary>Self hosted, instant, secure file sync</summary>
+  <description>
+    <p>SparkleShare creates a special folder on your computer. You can add remotely hosted folders (or "projects") to this folder. These projects will be automatically kept in sync with both the host and all of your peers when someone adds, removes or edits a file.</p>
+    <p>SparkleShare was made to cover certain use cases, but doesn't handle every scenario well. To help you decide if SparkleShare is right for you, here's a few examples of what it does well and less well:</p>
+    <p>Great:</p>
+    <ul>
+      <li>Frequently changing project files, like text, office documents, and images</li>
+      <li>Tracking and syncing files edited by multiple people</li>
+      <li>Reverting a file to any point in its history</li>
+      <li>Preventing spying on your files on the server using encryption</li>
+    </ul>
+    <p>Not so great:</p>
+    <ul>
+      <li>Full computer backups</li>
+      <li>Storing your photo or music collection</li>
+      <li>Large binary files that change often, like video editing projects</li>
+    </ul>
+    <p>Have fun!</p>
+  </description>
+  <url type="homepage">http://www.sparkleshare.org/</url>
+</component>
diff --git a/SparkleShare/Linux/sparkleshare.in b/SparkleShare/Linux/sparkleshare.in
index 5af417c..b53564c 100755
--- a/SparkleShare/Linux/sparkleshare.in
+++ b/SparkleShare/Linux/sparkleshare.in
@@ -8,6 +8,10 @@ fi
 start() {
   if [ -n "${SSH_AGENT_PID}" -o -n "${SSH_AUTH_SOCK}" ] ; then
     mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" $2 &
+    pid=$!
+    uid=`id -u`
+    mkdir -p /var/run/user/$uid/sparkleshare/
+    echo $pid > /var/run/user/$uid/sparkleshare/pidfile
   else
     ssh-agent mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" $2 &
   fi
@@ -23,6 +27,15 @@ case $1 in
     curl --insecure --output ~/SparkleShare/.$invite.xml $open
     start
     ;;
+  stop|--stop)
+    uid=`id -u`
+    if [ -e /var/run/user/$uid/sparkleshare/pidfile ] ; then
+      pid=`cat /var/run/user/$uid/sparkleshare/pidfile`
+      (kill $pid 2>&1) >/dev/null
+      rm /var/run/user/$uid/sparkleshare/pidfile
+    fi
+    ;;
+
   *)
     mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" --help
     ;;