summaryrefslogtreecommitdiff
path: root/openbox/actions.c
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@comhem.se>2007-12-18 21:12:52 +0100
committerMikael Magnusson <mikachu@comhem.se>2007-12-18 21:12:52 +0100
commit2b8b5da04b14af1639143cc332874c7e1a03a8bb (patch)
tree74fc76cd53dc5684b8009960e896ecbc91cf0891 /openbox/actions.c
parent9586ad246dae1f1de89f2070722cfa0c0c41c477 (diff)
parent46f90bca8ab55a2f43bf33af1adf178bd0bd81d9 (diff)
Merge branch 'backport'
Diffstat (limited to 'openbox/actions.c')
-rw-r--r--openbox/actions.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/openbox/actions.c b/openbox/actions.c
index cfe0bdde..75d4af05 100644
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -275,12 +275,12 @@ void actions_run_acts(GSList *acts,
}
}
-gboolean actions_interactive_act_running()
+gboolean actions_interactive_act_running(void)
{
return interactive_act != NULL;
}
-void actions_interactive_cancel_act()
+void actions_interactive_cancel_act(void)
{
if (interactive_act) {
interactive_act->def->i_cancel(interactive_act->options);
@@ -306,7 +306,7 @@ static gboolean actions_interactive_begin_act(ObActionsAct *act, guint state)
return FALSE;
}
-static void actions_interactive_end_act()
+static void actions_interactive_end_act(void)
{
if (interactive_act) {
ungrab_keyboard();