summaryrefslogtreecommitdiffstats
path: root/client/x11/red_window.cpp
diff options
context:
space:
mode:
authorUri Lublin <uril@redhat.com>2011-12-20 16:36:13 +0200
committerUri Lublin <uril@redhat.com>2011-12-21 13:04:01 +0200
commit67e785f4fc853985ae968b44280c8985651e41ac (patch)
treef199894ac42b1d085366edcc0f9f90ce959bd49d /client/x11/red_window.cpp
parentbaa375e8b51de94ee44466fe416202c29ea43e23 (diff)
downloadspice-67e785f4fc853985ae968b44280c8985651e41ac.tar.gz
spice-67e785f4fc853985ae968b44280c8985651e41ac.tar.xz
spice-67e785f4fc853985ae968b44280c8985651e41ac.zip
client: menu: make RedWindow::set_menu() return an error-code (#758260)
RedWindow::set_menu() can fail (on Windows when in fullscreen mode). For Windows spice-client, when in fullscreen mode, the system-menu is NULL. Returns 0 upon success, non-0 (currently only -1) upon failure. (cherry picked from commit 24d5852611c3d5be3ba824af64cd5a3356b82b9c) (seperator vs separator --> a small typo that got fixed)
Diffstat (limited to 'client/x11/red_window.cpp')
-rw-r--r--client/x11/red_window.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/x11/red_window.cpp b/client/x11/red_window.cpp
index cfc10c5e..3be53add 100644
--- a/client/x11/red_window.cpp
+++ b/client/x11/red_window.cpp
@@ -2215,8 +2215,9 @@ void RedWindow::on_pointer_leave()
}
}
-void RedWindow::set_menu(Menu* menu)
+int RedWindow::set_menu(Menu* menu)
{
+ return 0;
}
void RedWindow::init()