new method for loading menu files etc

[chaz/openbox] / openbox / menu.h

diff --git a/openbox/menu.h b/openbox/menu.h
index 74519343abb9ad1f8826768330c66fe34e725090..4780bda011b21fa66485ec49d7f138de3f689109 100644 (file)
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -93,7 +93,7 @@ void menu_shutdown();
 
 void menu_parse();
 
-gboolean menu_new(gchar *name, gchar *title, gpointer data);
+ObMenu* menu_new(gchar *name, gchar *title, gpointer data);
 void menu_free(gchar *name);
 
 gboolean menu_open_plugin(ObParseInst *i, gchar *name, gchar *plugin);
@@ -106,9 +106,10 @@ void menu_show(gchar *name, gint x, gint y, struct _ObClient *client);
 
 /* functions for building menus */
 void menu_clear_entries(gchar *name);
-void menu_add_normal(gchar *name, gint id, gchar *label, GSList *actions);
-void menu_add_submenu(gchar *name, gint id, gchar *submenu);
-void menu_add_separator(gchar *name, gint id);
+ObMenuEntry* menu_add_normal(gchar *name, gint id, gchar *label,
+                             GSList *actions);
+ObMenuEntry* menu_add_submenu(gchar *name, gint id, gchar *submenu);
+ObMenuEntry* menu_add_separator(gchar *name, gint id);
 
 ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id);