rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge 1.4.1 r603:604 into trunk

This commit is contained in:
Nick Bolton 2010-06-13 00:06:11 +00:00
parent 351818a4db
commit 8ee25ea2ce
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/arch/CArchAppUtilUnix.cpp
View File

@ -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

2
lib/arch/CArchAppUtilUnix.h
View File

@ -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();
};

2
lib/synergy/CApp.cpp
View File

@ -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),

2
lib/synergy/CApp.h
View File

@ -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
};