Merge 1.4.1 r603:604 into trunk

lib/arch/CArchAppUtilUnix.cpp

@@ -50,9 +50,9 @@ standardStartupStatic(int argc, char** argv)
 }
 
 int
-CArchAppUtilUnix::run(int argc, char** argv, CreateTaskBarReceiverFunc createTaskBarReceiver)
+CArchAppUtilUnix::run(int argc, char** argv)
 {
-	return app().runInner(argc, argv, NULL, &standardStartupStatic, createTaskBarReceiver);
+	return app().runInner(argc, argv, NULL, &standardStartupStatic);
 }
 
 void

lib/arch/CArchAppUtilUnix.h

@@ -24,6 +24,6 @@ public:
 	virtual ~CArchAppUtilUnix();
 	
 	bool parseArg(const int& argc, const char* const* argv, int& i);
-	int run(int argc, char** argv, CreateTaskBarReceiverFunc createTaskBarReceiver);
+	int run(int argc, char** argv);
 	void startNode();
 };

lib/synergy/CApp.cpp

@@ -52,13 +52,13 @@ m_daemon(false), // daemon mode not supported on windows (use --service)
 m_debugServiceWait(false),
 m_relaunchMode(false),
 m_pauseOnExit(false),
-m_disableTray(false),
 #else
 m_daemon(true), // backward compatibility for unix (daemon by default)
 #endif
 m_backend(false),
 m_restartable(true),
 m_noHooks(false),
+m_disableTray(false),
 m_pname(NULL),
 m_logFilter(NULL),
 m_logFile(NULL),

lib/synergy/CApp.h

@@ -41,11 +41,11 @@ public:
 		const char*	m_logFile;
 		const char*	m_display;
 		CString m_name;
+		bool m_disableTray;
 #if SYSAPI_WIN32
 		bool m_relaunchMode;
 		bool m_debugServiceWait;
 		bool m_pauseOnExit;
-		bool m_disableTray;
 #endif
 	};