diff options
author | Alon Levy <alevy@redhat.com> | 2011-01-26 01:52:45 +0200 |
---|---|---|
committer | Alon Levy <alevy@redhat.com> | 2011-01-27 17:23:51 +0200 |
commit | bfdd2371f806cff9f80cee0ab4d1b5a809dd82ca (patch) | |
tree | 46e7699b7db53263b0705dc2f0829b7be1264d81 /client/application.h | |
parent | 3615be639bd77c2ffd340b622fc253e65d25f0b6 (diff) | |
download | spice-bfdd2371f806cff9f80cee0ab4d1b5a809dd82ca.tar.gz spice-bfdd2371f806cff9f80cee0ab4d1b5a809dd82ca.tar.xz spice-bfdd2371f806cff9f80cee0ab4d1b5a809dd82ca.zip |
client: --help should not need platform initialization
separate initialization into before command line parsing and after,
call later only if command line parsing succeeds (in particular, it
"fails" if --help is given).
Diffstat (limited to 'client/application.h')
-rw-r--r-- | client/application.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/client/application.h b/client/application.h index f9bbd53b..4133dfe6 100644 --- a/client/application.h +++ b/client/application.h @@ -290,7 +290,7 @@ private: bool set_disabled_display_effects(CmdLineParser& parser, char *val, const char* arg0, DisplaySetting& disp_setting); void on_cmd_line_invalid_arg(const char* arg0, const char* what, const char* val); - bool process_cmd_line(int argc, char** argv); + bool process_cmd_line(int argc, char** argv, bool& full_screen); void register_channels(); void abort(); void init_menu(); @@ -343,7 +343,10 @@ private: static void init_logger(); static void init_globals(); + static void init_platform_globals(); + static void cleanup_platform_globals(); static void cleanup_globals(); + void init_remainder(); friend class DisconnectedEvent; friend class ConnectionErrorEvent; |