projects
/
profile
/
ivi
/
weston.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cb10843
)
desktop-shell: don't crash on menu
author
Pekka Paalanen
<ppaalanen@gmail.com>
Thu, 19 Jan 2012 14:40:28 +0000
(16:40 +0200)
committer
Kristian Høgsberg
<krh@bitplanet.net>
Thu, 19 Jan 2012 15:19:01 +0000
(10:19 -0500)
Add dummy menu callback function, so we don't crash after every time
someone opens the menu.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
clients/desktop-shell.c
patch
|
blob
|
history
diff --git
a/clients/desktop-shell.c
b/clients/desktop-shell.c
index
642e92a
..
f50f425
100644
(file)
--- a/
clients/desktop-shell.c
+++ b/
clients/desktop-shell.c
@@
-132,6
+132,12
@@
sigchild_handler(int s)
}
static void
+menu_func(struct window *window, int index, void *data)
+{
+ printf("Selected index %d from a panel menu.\n", index);
+}
+
+static void
show_menu(struct panel *panel, struct input *input, uint32_t time)
{
int32_t x, y;
@@
-142,7
+148,7
@@
show_menu(struct panel *panel, struct input *input, uint32_t time)
input_get_position(input, &x, &y);
window_show_menu(window_get_display(panel->window),
input, time, panel->window,
- x - 10, y - 10,
NULL
, entries, 4);
+ x - 10, y - 10,
menu_func
, entries, 4);
}
static void