diff --git a/include/action.h b/include/action.h index 126e5b54..ab9741ab 100644 --- a/include/action.h +++ b/include/action.h @@ -2,9 +2,10 @@ #ifndef __LABWC_ACTION_H #define __LABWC_ACTION_H +#include + struct view; struct server; -struct wl_list; struct action { struct wl_list link; /* diff --git a/include/private/action.h b/include/private/action.h deleted file mode 100644 index 1bb89acd..00000000 --- a/include/private/action.h +++ /dev/null @@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -#ifndef __LABWC_PRIVATE_ACTION_H -#define __LABWC_PRIVATE_ACTION_H - -/* Don't include ourself as search path starts at current directory */ -#include "../action.h" - -enum action_arg_type { - LAB_ACTION_ARG_STR = 0, -}; - -struct action_arg { - struct wl_list link; /* struct action.args */ - - char *key; /* May be NULL if there is just one arg */ - enum action_arg_type type; -}; - -struct action_arg_str { - struct action_arg base; - char *value; -}; - -#endif /* __LABWC_PRIVATE_ACTION_H */ diff --git a/src/action.c b/src/action.c index c1e38d7d..4f3171e1 100644 --- a/src/action.c +++ b/src/action.c @@ -6,17 +6,33 @@ #include #include #include +#include "action.h" #include "common/list.h" #include "common/mem.h" #include "common/spawn.h" #include "debug.h" #include "labwc.h" #include "menu/menu.h" -#include "private/action.h" #include "ssd.h" #include "view.h" #include "workspaces.h" +enum action_arg_type { + LAB_ACTION_ARG_STR = 0, +}; + +struct action_arg { + struct wl_list link; /* struct action.args */ + + char *key; /* May be NULL if there is just one arg */ + enum action_arg_type type; +}; + +struct action_arg_str { + struct action_arg base; + char *value; +}; + enum action_type { ACTION_TYPE_INVALID = 0, ACTION_TYPE_NONE,