diff options
author | Christophe Fergeau <cfergeau@redhat.com> | 2012-10-02 22:50:46 +0200 |
---|---|---|
committer | Christophe Fergeau <cfergeau@redhat.com> | 2012-10-02 23:10:06 +0200 |
commit | 8b47b54c7a08612c9c0fd6fa44d9d0ed46a85d83 (patch) | |
tree | 3d9f8dbcdc2b206a2f7e8219bf0ecb7c80a71075 /SPICEConsoleAPI.h | |
parent | 60c53563604bbf33096f968f1058c8d5f3750d6d (diff) |
Move SPICEController::StartClient to SpiceController
This method is OS-specific, this commit moves it to SpiceController
because this class has most of the OS-specific code.
Diffstat (limited to 'SPICEConsoleAPI.h')
-rw-r--r-- | SPICEConsoleAPI.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/SPICEConsoleAPI.h b/SPICEConsoleAPI.h index efb2e86..09e0b4e 100644 --- a/SPICEConsoleAPI.h +++ b/SPICEConsoleAPI.h @@ -61,8 +61,7 @@ public: SPICEConsoleAPI(const SPICEConsolePtr& plugin, const FB::BrowserHostPtr& host) : m_plugin(plugin), m_host(host), - m_connected_status(-2), - m_pid_controller(-1) + m_connected_status(-2) { registerMethod("connect", make_method(this, &SPICEConsoleAPI::connect)); registerMethod("show", make_method(this, &SPICEConsoleAPI::show)); @@ -139,7 +138,6 @@ private: std::map<std::string, std::string> m_languages; std::string m_usb_filter; int m_connected_status; - pid_t m_pid_controller; SpiceController m_external_controller; std::string m_tmp_dir; std::string m_trust_store_file; @@ -156,10 +154,7 @@ private: void SendMsg(uint32_t id, uint32_t value); template<typename T> void SendValue(uint32_t id, std::string attributeName); - static void *ControllerWaitHelper(void *opaque); - bool initSocket(void); - bool startClient(void); bool createTrustStore(void); }; |