Install FDO desktop menu file when webapp is started in standalone mode.

Assistant/Install.hs

@@ -11,6 +11,7 @@ module Assistant.Install where
 
 import Assistant.Common
 import Assistant.Install.AutoStart
+import Assistant.Install.Menu
 import Assistant.Ssh
 import Locations.UserConfig
 import Utility.FileMode
@@ -49,6 +50,8 @@ ensureInstalled = go =<< standaloneAppBase
 #ifdef darwin_HOST_OS
 		autostartfile <- userAutoStart osxAutoStartLabel
 #else
+		installMenu program
+			=<< desktopMenuFilePath "git-annex" <$> userConfigDir
 		autostartfile <- autoStartPath "git-annex" <$> userConfigDir
 #endif
 		installAutoStart program autostartfile

Build/DesktopFile.hs

@@ -26,24 +26,6 @@ import System.Posix.Files
 import System.FilePath
 import Data.Maybe
 
-{- The command can be either just "git-annex", or the full path to use
- - to run it. -}
-desktop :: FilePath -> DesktopEntry
-desktop command = genDesktopEntry
-	"Git Annex"
-	"Track and sync the files in your Git Annex"
-	False
-	(command ++ " webapp")
-	["Network", "FileTransfer"]
-
-autostart :: FilePath -> DesktopEntry
-autostart command = genDesktopEntry
-	"Git Annex Assistant"
-	"Autostart"
-	False
-	(command ++ " assistant --autostart")
-	[]
-
 systemwideInstall :: IO Bool
 systemwideInstall = isroot <||> destdirset
   where

debian/changelog

@@ -2,6 +2,7 @@ git-annex (4.20130418) UNRELEASED; urgency=low
 
   * assistant: Work around misfeature in git 1.8.2 that makes
     `git commit --alow-empty -m ""` run an editor.
+  * Install FDO desktop menu file when webapp is started in standalone mode.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 18 Apr 2013 16:22:48 -0400