prefix and capitalize ObMenu ObMenuEntry and ObMenuEntryRenderType

[chaz/openbox] / plugins / menu / timed_menu.c

diff --git a/plugins/menu/timed_menu.c b/plugins/menu/timed_menu.c
index 19a24f1474d8bba70702c7e858687dec607c4af4..a6e2e8dd7beffe1cb82ad7bb93f7f6ddbfe5c86e 100644 (file)
--- 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);
@@ -66,7 +66,7 @@ void timed_menu_clean_up(Menu *m) {
 
 void timed_menu_read_pipe(int fd, void *d)
 {
-    Menu *menu = d;
+    ObMenu *menu = d;
     char *tmpbuf = NULL;
     unsigned long num_read;
 #ifdef DEBUG
@@ -125,7 +125,7 @@ void timed_menu_read_pipe(int fd, void *d)
 
 void timed_menu_timeout_handler(void *d)
 {
-    Menu *data = d;
+    ObMenu *data = d;
     if (!data->shown && TIMED_MENU_DATA(data)->fd == -1) {
         switch (TIMED_MENU_DATA(data)->type) {
             case (TIMED_MENU_PIPE): {
@@ -187,7 +187,7 @@ void timed_menu_timeout_handler(void *d)
 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;