Fix event dispatching across platforms, clean up icon on win32, update installer template.

win32/nsi/mt-daapd.nsi.templ

@@ -57,6 +57,8 @@
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+Icon "..\ff.ico"
+UninstallIcon "..\ff.ico"
 OutFile "${PRODUCT_NAME} (${PRODUCT_VERSION}).exe"
 InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
@@ -89,12 +91,13 @@ Section -Pre
   
   lbl_continue:
   ; should really loop until service stops...
-  DetailPrint "Service is stopped..."
-  Sleep 1000
+  DetailPrint "Sent stop message... waiting for stop"
+  Sleep 5000
+
   
   !include WinMessages.nsh
-  FindWindow $0 "" "Firefly Config"
-  SendMessage $0 ${WM_USER} 0 0 
+  FindWindow $0 "" "FireflyShellNotifyIconHidden"
+  SendMessage $0 ${WM_CLOSE} 0 0 
   nsSCM::QueryStatus "Bonjour Service"
   Pop $0
   Pop $1
@@ -186,6 +189,14 @@ HasConf:
  rescan_set:
   WriteINIStr "$2\mt-daapd.conf" "general" "rescan_interval" "600" 
  rescan_skip:
+
+  ReadINIStr $0 "$2\mt-daapd.conf" "general" "logfile"
+  StrCmp $0 "" logfile_set logfile_skip
+  
+ logfile_set:
+  WriteINIStr "$2\mt-daapd.conf" "general" "logfile" "firefly.log"
+ logfile_skip:
+ 
   SetAutoClose False
 SectionEnd
 
@@ -197,6 +208,9 @@ Section -AdditionalIcons
   CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Debug Mode.lnk" "$2\firefly.exe" "-d9 -f"
   CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Firefly Configuration.lnk" "$2\FireflyShell.exe"
   CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Advanced Configuration.lnk" "notepad.exe" "$2\mt-daapd.conf"
+
+  Delete "$SMPROGRAMS\Startup\Firefly Configuration.lnk"
+  
 SectionEnd
 
 Section -Post
@@ -224,7 +238,7 @@ Section -Post
   ExecWait 'netsh firewall add allowedprogram "$2\firefly.exe" "${PRODUCT_NAME}" enable'  
 
   nsSCM::Start "${PRODUCT_NAME}"
-  Exec "$2\FireflyShell.exe"
+  Exec '"$2\FireflyShell.exe" -q'
 SectionEnd