#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>
/* find the client */
for (it = history_list; it != NULL; it = it->next) {
hi = it->data;
- if (!g_utf8_collate(hi->name, name) &&
- !g_utf8_collate(hi->class, class) &&
- !g_utf8_collate(hi->role, role))
+ if (!strcmp(hi->name, name) &&
+ !strcmp(hi->class, class) &&
+ !strcmp(hi->role, role))
return hi;
}
return NULL;
}
-gboolean place_history(Client *c)
+gboolean place_history(ObClient *c)
{
struct HistoryItem *hi;
int x, y, w, h;
if (hi && !(hi->flags & PLACED)) {
hi->flags |= PLACED;
- if (ob_state != State_Starting) {
+ if (ob_state() != OB_STATE_STARTING) {
if (hi->flags & HAVE_POSITION ||
hi->flags & HAVE_SIZE) {
if (hi->flags & HAVE_POSITION) {
w = c->area.width;
h = c->area.height;
}
- client_configure(c, Corner_TopLeft, x, y, w, h,
+ client_configure(c, OB_CORNER_TOPLEFT, x, y, w, h,
TRUE, TRUE);
}
if (hi->flags & HAVE_DESKTOP) {
return FALSE;
}
-static void set_history(Client *c)
+static void set_history(ObClient *c)
{
struct HistoryItem *hi;
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) {