X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=plugins%2Fmenu%2Ftimed_menu.c;h=a6e2e8dd7beffe1cb82ad7bb93f7f6ddbfe5c86e;hb=fd19711e6a7cdc63f10b79cedc7ff54d7a9d2e81;hp=31540c0258d7c097316d692b45e340f4101fd300;hpb=f54b294ef6691af88d175936e30cfc04d028cc32;p=chaz%2Fopenbox

diff --git a/plugins/menu/timed_menu.c b/plugins/menu/timed_menu.c
index 31540c02..a6e2e8dd 100644
--- a/plugins/menu/timed_menu.c
+++ b/plugins/menu/timed_menu.c
@@ -15,8 +15,8 @@
 #include "kernel/action.h"
 #include "kernel/event.h"
 
-#define TIMED_MENU(m) ((Menu *)m)
-#define TIMED_MENU_DATA(m) ((Timed_Menu_Data *)((Menu *)m)->plugin_data)
+#define TIMED_MENU(m) ((ObMenu *)m)
+#define TIMED_MENU_DATA(m) ((Timed_Menu_Data *)((ObMenu *)m)->plugin_data)
 static char *PLUGIN_NAME = "timed_menu";
 
 typedef enum {
@@ -26,7 +26,7 @@ typedef enum {
 
 typedef struct {
     Timed_Menu_Type type;
-    Timer *timer;
+    ObTimer *timer;
     char *command; /* for the PIPE */
     char *buf; /* buffer to hold partially read menu */
     unsigned long buflen; /* how many bytes are in the buffer */
@@ -41,7 +41,7 @@ void plugin_startup()
 { }
 void plugin_shutdown() { }
 
-void timed_menu_clean_up(Menu *m) {
+void timed_menu_clean_up(ObMenu *m) {
     if (TIMED_MENU_DATA(m)->buf != NULL) {
         fprintf(stderr, "%s", TIMED_MENU_DATA(m)->buf);
         g_free(TIMED_MENU_DATA(m)->buf);
@@ -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)
 {
+    ObMenu *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;
-
+    ObMenu *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,
@@ -182,7 +187,7 @@ void timed_menu_timeout_handler(Menu *data)
 void *plugin_create()
 {
     Timed_Menu_Data *d = g_new(Timed_Menu_Data, 1);
-    Menu *m = menu_new("", PLUGIN_NAME, NULL);
+    ObMenu *m = menu_new("", PLUGIN_NAME, NULL);
     
     m->plugin = PLUGIN_NAME;