From: "Rodolfo García Peñas (kix)" <[email protected]>

The file switchmenu.h includes the function prototypes for switchmenu.c.

The prototypes included were moved from funcs.h.

Signed-off-by: Rodolfo García Peñas (kix) <[email protected]>
---
 src/Makefile.am  |    1 +
 src/event.c      |    1 +
 src/funcs.h      |    7 -------
 src/menu.c       |    1 +
 src/rootmenu.c   |    1 +
 src/startup.c    |    1 +
 src/switchmenu.c |    1 +
 src/switchmenu.h |   29 +++++++++++++++++++++++++++++
 src/winspector.c |    1 +
 9 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 src/switchmenu.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 8c7f764..3df6742 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -81,6 +81,7 @@ wmaker_SOURCES =      \
        superfluous.c \
        superfluous.h \
        switchmenu.c \
+       switchmenu.h \
        texture.c \
        texture.h \
        usermenu.c \
diff --git a/src/event.c b/src/event.c
index 5ccf11d..48fa81e 100644
--- a/src/event.c
+++ b/src/event.c
@@ -74,6 +74,7 @@
 #include "misc.h"
 #include "event.h"
 #include "winmenu.h"
+#include "switchmenu.h"
 
 /******** Global Variables **********/
 extern XContext wWinContext;
diff --git a/src/funcs.h b/src/funcs.h
index 82d0734..1eb5d78 100644
--- a/src/funcs.h
+++ b/src/funcs.h
@@ -36,11 +36,4 @@ typedef void (WDeathHandler)(pid_t pid, unsigned int status, 
void *cdata);
 
 Bool GetCommandForPid(int pid, char ***argv, int *argc);
 
-
-/* ---[ switchmenu.c ]---------------------------------------------------- */
-
-void UpdateSwitchMenu(WScreen *scr, WWindow *wwin, int action);
-void OpenSwitchMenu(WScreen *scr, int x, int y, int keyboard);
-void InitializeSwitchMenu(void);
-
 #endif
diff --git a/src/menu.c b/src/menu.c
index ddf01e6..337b9e3 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -43,6 +43,7 @@
 #include "workspace.h"
 #include "dialog.h"
 #include "rootmenu.h"
+#include "switchmenu.h"
 
 /****** Global Variables ******/
 
diff --git a/src/rootmenu.c b/src/rootmenu.c
index de602d5..f3c5671 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -54,6 +54,7 @@
 #include "xmodifier.h"
 #include "rootmenu.h"
 #include "startup.h"
+#include "switchmenu.h"
 
 #include <WINGs/WUtil.h>
 
diff --git a/src/startup.c b/src/startup.c
index 414ce0c..0175e7c 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -67,6 +67,7 @@
 #include "dialog.h"
 #include "wmspec.h"
 #include "event.h"
+#include "switchmenu.h"
 #ifdef XDND
 #include "xdnd.h"
 #endif
diff --git a/src/switchmenu.c b/src/switchmenu.c
index a890bbb..227b7fa 100644
--- a/src/switchmenu.c
+++ b/src/switchmenu.c
@@ -37,6 +37,7 @@
 #include "stacking.h"
 #include "workspace.h"
 #include "framewin.h"
+#include "switchmenu.h"
 
 #define IS_GNUSTEP_MENU(w) ((w)->wm_gnustep_attr && \
        ((w)->wm_gnustep_attr->flags & GSWindowLevelAttr) && \
diff --git a/src/switchmenu.h b/src/switchmenu.h
new file mode 100644
index 0000000..810286a
--- /dev/null
+++ b/src/switchmenu.h
@@ -0,0 +1,29 @@
+/*
+ *  Window Maker window manager
+ *
+ *  Copyright (c) 1997-2003 Alfredo K. Kojima
+ *  Copyright (c) 2013 Window Maker Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef WMSWITCHMENU_H
+#define WMSWITCHMENU_H
+
+void UpdateSwitchMenu(WScreen *scr, WWindow *wwin, int action);
+void OpenSwitchMenu(WScreen *scr, int x, int y, int keyboard);
+void InitializeSwitchMenu(void);
+
+#endif /* WMSWITCHMENU_H */
diff --git a/src/winspector.c b/src/winspector.c
index 41d3afb..59b56f2 100644
--- a/src/winspector.c
+++ b/src/winspector.c
@@ -47,6 +47,7 @@
 #include "client.h"
 #include "wmspec.h"
 #include "misc.h"
+#include "switchmenu.h"
 
 #include <WINGs/WUtil.h>
 
-- 
1.7.10.4


-- 
To unsubscribe, send mail to [email protected].

Reply via email to