From b89cc5859068fd5543dc9e7da3f469fb0c0a7a1c Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sat, 19 Sep 2009 15:57:20 +0200 Subject: Add all the action names used in 3.4 so configs don't break --- openbox/actions/addremovedesktop.c | 44 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'openbox/actions/addremovedesktop.c') diff --git a/openbox/actions/addremovedesktop.c b/openbox/actions/addremovedesktop.c index b6e621ab..1e7f0b57 100644 --- a/openbox/actions/addremovedesktop.c +++ b/openbox/actions/addremovedesktop.c @@ -11,6 +11,11 @@ static gpointer setup_func(xmlNodePtr node); static gpointer setup_add_func(xmlNodePtr node); static gpointer setup_remove_func(xmlNodePtr node); static gboolean run_func(ObActionsData *data, gpointer options); +/* 3.4-compatibility */ +static gpointer setup_addcurrent_func(xmlNodePtr node); +static gpointer setup_addlast_func(xmlNodePtr node); +static gpointer setup_removecurrent_func(xmlNodePtr node); +static gpointer setup_removelast_func(xmlNodePtr node); void action_addremovedesktop_startup(void) { @@ -18,6 +23,16 @@ void action_addremovedesktop_startup(void) NULL, NULL); actions_register("RemoveDesktop", setup_remove_func, g_free, run_func, NULL, NULL); + + /* 3.4-compatibility */ + actions_register("AddDesktopLast", setup_addlast_func, g_free, run_func, + NULL, NULL); + actions_register("RemoveDesktopLast", setup_removelast_func, g_free, run_func, + NULL, NULL); + actions_register("AddDesktopCurrent", setup_addcurrent_func, g_free, run_func, + NULL, NULL); + actions_register("RemoveDesktopCurrent", setup_removecurrent_func, g_free, run_func, + NULL, NULL); } static gpointer setup_func(xmlNodePtr node) @@ -69,3 +84,32 @@ static gboolean run_func(ObActionsData *data, gpointer options) return FALSE; } + +/* 3.4-compatibility */ +static gpointer setup_addcurrent_func(xmlNodePtr node) +{ + Options *o = setup_add_func(node); + o->current = TRUE; + return o; +} + +static gpointer setup_addlast_func(xmlNodePtr node) +{ + Options *o = setup_add_func(node); + o->current = FALSE; + return o; +} + +static gpointer setup_removecurrent_func(xmlNodePtr node) +{ + Options *o = setup_remove_func(node); + o->current = TRUE; + return o; +} + +static gpointer setup_removelast_func(xmlNodePtr node) +{ + Options *o = setup_remove_func(node); + o->current = FALSE; + return o; +} -- cgit v1.2.3