diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-05 08:57:42 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-05 08:57:42 +0000 |
| commit | 4b1326f06330c00501dd84100ed3a1987e2fa631 (patch) | |
| tree | 6675ebcf771a6fdfeb9a2164f08811407731482e /xorg-server/hw/xwin/xlaunch/config.h | |
| parent | 7397e255c2e82618ab55ef2c81636c8e688b1225 (diff) | |
| parent | 163827567b71b0763a4c1a7104159cd08b5c2d95 (diff) | |
| download | vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.tar.gz vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.tar.bz2 vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/xwin/xlaunch/config.h')
| -rw-r--r-- | xorg-server/hw/xwin/xlaunch/config.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/xorg-server/hw/xwin/xlaunch/config.h b/xorg-server/hw/xwin/xlaunch/config.h index 8448c54a4..8017ffb55 100644 --- a/xorg-server/hw/xwin/xlaunch/config.h +++ b/xorg-server/hw/xwin/xlaunch/config.h @@ -64,8 +64,13 @@ struct CConfig std::string font_server; std::string extra_params; std::string extra_ssh; +#ifdef _DEBUG + CConfig() : window(MultiWindow), client(NoClient), clientstart(NoXClient), display("1"), +#else CConfig() : window(MultiWindow), client(NoClient), clientstart(NoXClient), display("0"), - protocol_path(""), program("xeyes"), progs(PROG_NUMBER), compress(false), host(""), user(""), +#endif + local(false), protocol(""), + protocol_path(""), program("xeyes"), progs(PROG_NUMBER), compress(false), host(""), user("ago"), password(""), password_save(false), password_start(false), broadcast(false), indirect(false), xdmcp_host(""), xhosts(HOST_NUMBER), clipboard(true), no_access_control(false), font_server(), extra_params(), extra_ssh() {}; |