diff options
author | Hans de Goede <hdegoede@redhat.com> | 2012-01-18 11:17:21 +0100 |
---|---|---|
committer | Hans de Goede <hdegoede@redhat.com> | 2012-01-18 11:17:21 +0100 |
commit | 35d35634a947d9aa050fcdcddeb14727b2614b3b (patch) | |
tree | dc4534e1f54356171f6640ed7430870de06912ef /client | |
parent | df875563a70773ddaa1151796a2e42e7c9867841 (diff) | |
parent | a3a3b34a46f57ce86da444532e1db292638a74cd (diff) | |
download | spice-35d35634a947d9aa050fcdcddeb14727b2614b3b.tar.gz spice-35d35634a947d9aa050fcdcddeb14727b2614b3b.tar.xz spice-35d35634a947d9aa050fcdcddeb14727b2614b3b.zip |
Merge commit 'a3a3b34a46f57ce86da444532e1db292638a74cd' into 0.10
Diffstat (limited to 'client')
-rw-r--r-- | client/red_client.cpp | 1 | ||||
-rw-r--r-- | client/red_window.h | 2 | ||||
-rw-r--r-- | client/screen.cpp | 2 | ||||
-rw-r--r-- | client/windows/red_window.cpp | 2 | ||||
-rw-r--r-- | client/x11/red_window.cpp | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/client/red_client.cpp b/client/red_client.cpp index 2f6c6ce7..f3da4c92 100644 --- a/client/red_client.cpp +++ b/client/red_client.cpp @@ -274,7 +274,6 @@ void* Migrate::worker_main(void *data) void Migrate::start(const SpiceMsgMainMigrationBegin* migrate) { - std::string cert_subject; uint32_t peer_major; uint32_t peer_minor; diff --git a/client/red_window.h b/client/red_window.h index 1c7237b1..82353aa1 100644 --- a/client/red_window.h +++ b/client/red_window.h @@ -66,7 +66,7 @@ public: void set_cursor(LocalCursor* local_cursor); void hide_cursor(); void show_cursor(); - void cupture_mouse(); + void capture_mouse(); void release_mouse(); void start_key_interception(); void stop_key_interception(); diff --git a/client/screen.cpp b/client/screen.cpp index cd744ef6..a0dc0dfa 100644 --- a/client/screen.cpp +++ b/client/screen.cpp @@ -538,7 +538,7 @@ void RedScreen::capture_mouse() _mouse_captured = true; _window.hide_cursor(); reset_mouse_pos(); - _window.cupture_mouse(); + _window.capture_mouse(); } void RedScreen::relase_mouse() diff --git a/client/windows/red_window.cpp b/client/windows/red_window.cpp index e436f833..981fe9a5 100644 --- a/client/windows/red_window.cpp +++ b/client/windows/red_window.cpp @@ -695,7 +695,7 @@ bool RedWindow::get_mouse_anchor_point(SpicePoint& pt) return true; } -void RedWindow::cupture_mouse() +void RedWindow::capture_mouse() { RECT client_rect; POINT origin; diff --git a/client/x11/red_window.cpp b/client/x11/red_window.cpp index 86ddd3bd..2d179f89 100644 --- a/client/x11/red_window.cpp +++ b/client/x11/red_window.cpp @@ -1867,7 +1867,7 @@ void RedWindow::release_mouse() sync(true); } -void RedWindow::cupture_mouse() +void RedWindow::capture_mouse() { int grab_retries = MOUSE_GRAB_RETRIES; XLockDisplay(x_display); |