rootmenu header file updated

The contents of the rootmenu.h file are not used and can be removed,
but the prototypes of rootmenu.c are in funcs.h and should be moved
to the correct (rootmenu.h) file.

src/event.c

@@ -66,6 +66,7 @@
 #include "balloon.h"
 #include "xinerama.h"
 #include "wmspec.h"
+#include "rootmenu.h"
 
 /******** Global Variables **********/
 extern XContext wWinContext;

src/funcs.h

@@ -37,8 +37,6 @@ void Restart(char *manager, Bool abortOnFailure);
 void SetupEnvironment(WScreen *scr);
 void DispatchEvent(XEvent *event);
 void UpdateSwitchMenu(WScreen *scr, WWindow *wwin, int action);
-void wRootMenuBindShortcuts(Window window);
-void OpenRootMenu(WScreen *scr, int x, int y, int keyboard);
 void OpenSwitchMenu(WScreen *scr, int x, int y, int keyboard);
 void InitializeSwitchMenu(void);
 void OpenWindowMenu(WWindow *wwin, int x, int y, int keyboard);
@@ -86,7 +84,6 @@ char * FindImage(char *paths, char *file);
 char * GetShortcutString(char *text);
 char * EscapeWM_CLASS(char *name, char *class);
 
-Bool wRootMenuPerformShortcut(XEvent *event);
 Bool RelaunchWindow(WWindow *wwin);
 Bool IsDoubleClick(WScreen *scr, XEvent *event);
 Bool UpdateDomainFile(WDDomain *domain);

src/menu.c

@@ -42,6 +42,7 @@
 #include "xinerama.h"
 #include "workspace.h"
 #include "dialog.h"
+#include "rootmenu.h"
 
 /****** Global Variables ******/
 

src/rootmenu.h

@@ -22,23 +22,8 @@
 #ifndef WMROOTMENU_H
 #define WMROOTMENU_H
 
-#include "WindowMaker.h"
-
-
-typedef void *WRootMenuData;
-
-
-typedef struct _WRootMenuReader {
-    Bool (*checkMenuChange)(char *path, time_t lastAccessTime);
-
-    WRootMenuData (*openMenuFile)(char *path);
-    Bool (*hasMoreData)(WRootMenuData *data);
-    Bool (*nextCommand)(WRootMenuData *data,
-                        char **title,
-                        char **command,
-                        char **parameter,
-                        char **shortcut);
-    void (*closeMenuFile)(WRootMenuData *data);
-} WRootMenuReader;
+Bool wRootMenuPerformShortcut(XEvent * event);
+void wRootMenuBindShortcuts(Window window);
+void OpenRootMenu(WScreen * scr, int x, int y, int keyboard);
 
 #endif /* WMROOTMENU_H */

src/screen.c

@@ -55,6 +55,7 @@
 #include "balloon.h"
 #include "geomview.h"
 #include "wmspec.h"
+#include "rootmenu.h"
 
 #include "xinerama.h"
 

src/window.c

@@ -58,6 +58,7 @@
 #include "appmenu.h"
 #include "appicon.h"
 #include "superfluous.h"
+#include "rootmenu.h"
 
 #ifdef MWM_HINTS
 # include "motif.h"