From: Dana Jansens Date: Thu, 28 Jul 2011 18:05:54 +0000 (-0400) Subject: rm the actions_parse* functions which parsed xml actions X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=5803570e1144dda9132ab3e87fc9bd47aa73c8f2;p=dana%2Fopenbox.git rm the actions_parse* functions which parsed xml actions --- diff --git a/openbox/actions.c b/openbox/actions.c index 76c7cb50..41c0f236 100644 --- a/openbox/actions.c +++ b/openbox/actions.c @@ -202,56 +202,6 @@ static ObActionsAct* actions_act_find_name(const gchar *name) return act; } -ObActionsAct* actions_parse_string(const gchar *name) -{ - ObActionsAct *act = NULL; - - if ((act = actions_act_find_name(name))) { - if (act->def->canbeinteractive) { - if (act->def->setup.i) - act->options = act->def->setup.i(NULL, - &act->i_pre, - &act->i_input, - &act->i_cancel, - &act->i_post); - } - else { - if (act->def->setup.n) - act->options = act->def->setup.n(NULL); - } - } - - - return act; -} - -ObActionsAct* actions_parse(xmlNodePtr node) -{ - gchar *name; - ObActionsAct *act = NULL; - - if (obt_xml_attr_string(node, "name", &name)) { - if ((act = actions_act_find_name(name))) { - /* there is more stuff to parse here */ - if (act->def->canbeinteractive) { - if (act->def->setup.i) - act->options = act->def->setup.i(NULL, - &act->i_pre, - &act->i_input, - &act->i_cancel, - &act->i_post); - } - else { - if (act->def->setup.n) - act->options = act->def->setup.n(NULL); - } - } - g_free(name); - } - - return act; -} - ObActionsAct* actions_act_new(const gchar *name, GHashTable *config) { ObActionsAct *act = NULL; diff --git a/openbox/actions.h b/openbox/actions.h index 13846d19..859a1c73 100644 --- a/openbox/actions.h +++ b/openbox/actions.h @@ -81,9 +81,6 @@ gboolean actions_register(const gchar *name, gboolean actions_set_shutdown(const gchar *name, ObActionsShutdownFunc shutdown); -ObActionsAct* actions_parse(xmlNodePtr node); -ObActionsAct* actions_parse_string(const gchar *name); - gboolean actions_act_is_interactive(ObActionsAct *act); /*! Create a new ObActionAct structure.