X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fmenu%2Ftimed_menu.c;fp=plugins%2Fmenu%2Ftimed_menu.c;h=19a24f1474d8bba70702c7e858687dec607c4af4;hb=ad45ecb6e3cf6166077c896d43c87cba09caa570;hp=31540c0258d7c097316d692b45e340f4101fd300;hpb=2477a38d2f3063b697e44bf3690cf280fb26ca8a;p=chaz%2Fopenbox diff --git a/plugins/menu/timed_menu.c b/plugins/menu/timed_menu.c index 31540c02..19a24f14 100644 --- a/plugins/menu/timed_menu.c +++ b/plugins/menu/timed_menu.c @@ -64,13 +64,16 @@ void timed_menu_clean_up(Menu *m) { TIMED_MENU_DATA(m)->mtime = 0; } -void timed_menu_read_pipe(int fd, Menu *menu) +void timed_menu_read_pipe(int fd, void *d) { + Menu *menu = d; char *tmpbuf = NULL; unsigned long num_read; #ifdef DEBUG /* because gdb is dumb */ +#if 0 Timed_Menu_Data *d = TIMED_MENU_DATA(menu); +#endif #endif unsigned long num_realloc; @@ -120,10 +123,9 @@ void timed_menu_read_pipe(int fd, Menu *menu) } } -void timed_menu_timeout_handler(Menu *data) +void timed_menu_timeout_handler(void *d) { - Action *a; - + Menu *data = d; if (!data->shown && TIMED_MENU_DATA(data)->fd == -1) { switch (TIMED_MENU_DATA(data)->type) { case (TIMED_MENU_PIPE): { @@ -131,10 +133,13 @@ void timed_menu_timeout_handler(Menu *data) as menu */ /* I hate you glib in all your hideous forms */ - char *args[] = {"/bin/sh", "-c", TIMED_MENU_DATA(data)->command, - NULL}; + char *args[4]; int child_stdout; int child_pid; + args[0] = "/bin/sh"; + args[1] = "-c"; + args[2] = TIMED_MENU_DATA(data)->command; + args[3] = NULL; if (g_spawn_async_with_pipes( NULL, args,