From c828154886a40fa48b0545fd5d22e277f6d210e9 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sat, 21 Nov 2009 13:34:33 -0500 Subject: Revert all commits for the Hooks feature to move it to a topic branch. This reverts commit fd2f617be7ff57fcb187daa737f66d243544c8cd. This reverts commit a47d0a53652a96ca1df96fc9268757df1431ae55. This reverts commit a1908e076736e1a618bd305c5963dbfecaa30497. This reverts commit dc2e6f6bf7143a56de360a393b33906735e63625. This reverts commit 985e7dadf9a3ebf4bd265d955c3198e96405e5d2. This reverts commit db781556d63d1a50bd1b1b4b6b5423ef703bf2c7. This reverts commit feec8f663f0a11546c2da87575fecc8a88d97ca1. --- openbox/config.c | 44 -------------------------------------------- 1 file changed, 44 deletions(-) (limited to 'openbox/config.c') diff --git a/openbox/config.c b/openbox/config.c index 9e111b84..5c0691ca 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -22,7 +22,6 @@ #include "mouse.h" #include "actions.h" #include "translate.h" -#include "hooks.h" #include "client.h" #include "screen.h" #include "openbox.h" @@ -345,47 +344,6 @@ static void parse_per_app_settings(xmlNodePtr node, gpointer d) } } -static void parse_hook(xmlNodePtr node, gpointer d) -{ - gchar *name; - ObHook hook; - xmlNodePtr n; - - - if (!obt_parse_attr_string(node, "name", &name)) { - g_message(_("Hook in config file is missing a name")); - return; - } - - hook = hooks_hook_from_name(name); - if (!hook) - g_message(_("Unknown hook \"%s\" in config file"), name); - else { - if ((n = obt_parse_find_node(node->children, "action"))) - while (n) { - ObActionsAct *action; - - action = actions_parse(n); - if (action) - hooks_add(hook, action); - n = obt_parse_find_node(n->next, "action"); - } - } - - g_free(name); -} - -static void parse_hooks(xmlNodePtr node, gpointer d) -{ - xmlNodePtr n; - - if ((n = obt_parse_find_node(node->children, "hook"))) - while (n) { - parse_hook(n, NULL); - n = obt_parse_find_node(n->next, "hook"); - } -} - /* @@ -1039,8 +997,6 @@ void config_startup(ObtParseInst *i) obt_parse_register(i, "menu", parse_menu, NULL); - obt_parse_register(i, "hooks", parse_hooks, NULL); - config_per_app_settings = NULL; obt_parse_register(i, "applications", parse_per_app_settings, NULL); -- cgit v1.2.3