diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-05-24 21:47:06 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-05-24 21:47:06 +0000 |
| commit | d1e355de2c6aae38cea3cdc0e0b902ea2b194e86 (patch) | |
| tree | dcb99d7232895e2b54ed58fbaa7d3a775da9ccfc /plugins/placement | |
| parent | 927f99e4125743bbecf41b1aa7dbce9587fb6156 (diff) | |
this is a big one! im putting stats in here just cuz!
59 files changed, 1691 insertions(+), 607 deletions(-)
Adding the beginings of ObConf. Adding a resistance-config plugin for ObConf.
Creating an obparser library that obrender can use, the kernel can use, plugins can use, and ObConf and its plugins can use. (its just code for using libXml2)
Diffstat (limited to 'plugins/placement')
| -rw-r--r-- | plugins/placement/history.c | 14 | ||||
| -rw-r--r-- | plugins/placement/placement.c | 2 |
2 files changed, 3 insertions, 13 deletions
diff --git a/plugins/placement/history.c b/plugins/placement/history.c index 9d932b9e..716487b6 100644 --- a/plugins/placement/history.c +++ b/plugins/placement/history.c @@ -3,7 +3,7 @@ #include "kernel/frame.h" #include "kernel/client.h" #include "kernel/screen.h" -#include "kernel/parse.h" +#include "parser/parse.h" #include "history.h" #include <glib.h> #include <string.h> @@ -193,18 +193,8 @@ static void load_history() char *role; struct HistoryItem *hi; - if (!(doc = xmlParseFile(history_path))) + if (!parse_load(history_path, "openbox_history", &doc, &node)) return; - if (!(node = xmlDocGetRootElement(doc))) { - xmlFreeDoc(doc); - doc = NULL; - return; - } - if (xmlStrcasecmp(node->name, (const xmlChar*)"openbox_history")) { - xmlFreeDoc(doc); - doc = NULL; - return; - } node = parse_find_node("entry", node->xmlChildrenNode); while (node) { diff --git a/plugins/placement/placement.c b/plugins/placement/placement.c index dd818970..889168b9 100644 --- a/plugins/placement/placement.c +++ b/plugins/placement/placement.c @@ -3,7 +3,7 @@ #include "kernel/frame.h" #include "kernel/screen.h" #include "kernel/openbox.h" -#include "kernel/parse.h" +#include "parser/parse.h" #include "history.h" #include <glib.h> |