use g_slice_new() instead of g_new() part 4

10 files changed, 30 insertions, 559 deletions

diff --git a/obrender/color.c b/obrender/color.c
index 5e3f2169..dd0551ee 100644
--- a/obrender/color.c
+++ b/obrender/color.c
@@ -81,7 +81,7 @@ RrColor *RrColorNew(const RrInstance *inst, gint r, gint g, gint b)
         xcol.green = (g << 8) | g;
         xcol.blue = (b << 8) | b;
         if (XAllocColor(RrDisplay(inst), RrColormap(inst), &xcol)) {
-            out = g_new(RrColor, 1);
+            out = g_slice_new(RrColor);
             out->inst = inst;
             out->r = xcol.red >> 8;
             out->g = xcol.green >> 8;
@@ -112,7 +112,7 @@ void RrColorFree(RrColor *c)
             if (c->pixel) XFreeColors(RrDisplay(c->inst), RrColormap(c->inst),
                                       &c->pixel, 1, 0);
             if (c->gc) XFreeGC(RrDisplay(c->inst), c->gc);
-            g_free(c);
+            g_slice_free(RrColor, c);
         }
     }
 }
diff --git a/obrender/font.c b/obrender/font.c
index cde0d030..892b2c10 100644
--- a/obrender/font.c
+++ b/obrender/font.c
@@ -68,7 +68,7 @@ RrFont *RrFontOpen(const RrInstance *inst, const gchar *name, gint size,
     PangoStyle pstyle;
     PangoAttrList *attrlist;
 
-    out = g_new(RrFont, 1);
+    out = g_slice_new(RrFont);
     out->inst = inst;
     out->ref = 1;
     out->font_desc = pango_font_description_new();
@@ -133,7 +133,7 @@ void RrFontClose(RrFont *f)
         if (--f->ref < 1) {
             g_object_unref(f->layout);
             pango_font_description_free(f->font_desc);
-            g_free(f);
+            g_slice_free(RrFont, f);
         }
     }
 }
@@ -181,7 +181,7 @@ RrSize *RrFontMeasureString(const RrFont *f, const gchar *str,
 
     g_assert(!flow || maxwidth > 0);
 
-    size = g_new(RrSize, 1);
+    size = g_slice_new(RrSize);
     font_measure_full(f, str, &size->width, &size->height, shadow_x, shadow_y,
                       flow, maxwidth);
     return size;
diff --git a/obrender/image.c b/obrender/image.c
index f86a3ee0..bb65e3c0 100644
--- a/obrender/image.c
+++ b/obrender/image.c
@@ -50,7 +50,7 @@ static void RrImagePicFree(RrImagePic *pic)
     if (pic) {
         g_free(pic->data);
         g_free(pic->name);
-        g_free(pic);
+        g_slice_free(RrImagePic, pic);
     }
 }
 
@@ -235,7 +235,7 @@ static RrImagePic* ResizeImage(RrPixel32 *src,
         }
     }
 
-    pic = g_new(RrImagePic, 1);
+    pic = g_slice_new(RrImagePic);
     RrImagePicInit(pic, NULL, dstW, dstH, dststart);
 
     return pic;
@@ -335,7 +335,7 @@ RrImage* RrImageNew(RrImageCache *cache)
 
     g_assert(cache != NULL);
 
-    self = g_new0(RrImage, 1);
+    self = g_slice_new0(RrImage);
     self->ref = 1;
     self->cache = cache;
     return self;
@@ -369,7 +369,7 @@ void RrImageUnref(RrImage *self)
             RemovePicture(self, &self->original, 0, &self->n_original);
         while (self->n_resized > 0)
             RemovePicture(self, &self->resized, 0, &self->n_resized);
-        g_free(self);
+        g_slice_free(RrImage, self);
     }
 }
 
@@ -399,7 +399,7 @@ static void AddPictureFromData(RrImage *self, const char *name,
         }
 
     /* add the new picture */
-    pic = g_new(RrImagePic, 1);
+    pic = g_slice_new(RrImagePic);
     RrImagePicInit(pic, name, w, h, g_memdup(data, w*h*sizeof(RrPixel32)));
     AddPicture(self, &self->original, &self->n_original, pic);
 }
diff --git a/obrender/imagecache.c b/obrender/imagecache.c
index 036ac121..ad1183e4 100644
--- a/obrender/imagecache.c
+++ b/obrender/imagecache.c
@@ -29,7 +29,7 @@ RrImageCache* RrImageCacheNew(gint max_resized_saved)
 
     g_assert(max_resized_saved >= 0);
 
-    self = g_new(RrImageCache, 1);
+    self = g_slice_new(RrImageCache);
     self->ref = 1;
     self->max_resized_saved = max_resized_saved;
     self->pic_table = g_hash_table_new((GHashFunc)RrImagePicHash,
@@ -54,7 +54,7 @@ void RrImageCacheUnref(RrImageCache *self)
         g_hash_table_destroy(self->name_table);
         self->name_table = NULL;
 
-        g_free(self);
+        g_slice_free(RrImageCache, self);
     }
 }
 
diff --git a/obrender/instance.c b/obrender/instance.c
index b867815c..af0420ae 100644
--- a/obrender/instance.c
+++ b/obrender/instance.c
@@ -59,7 +59,7 @@ RrInstance* RrInstanceNew (Display *display, gint screen)
 {
     g_type_init(); /* supposedly needed for pango but seems to work without */
 
-    definst = g_new (RrInstance, 1);
+    definst = g_slice_new(RrInstance);
     definst->display = display;
     definst->screen = screen;
 
@@ -214,7 +214,7 @@ void RrInstanceFree (RrInstance *inst)
         g_free(inst->pseudo_colors);
         g_hash_table_destroy(inst->color_hash);
         g_object_unref(inst->pango);
-        g_free(inst);
+        g_slice_free(RrInstance, inst);
     }
 }
 
diff --git a/obrender/mask.c b/obrender/mask.c
index b6e3c443..506d5b28 100644
--- a/obrender/mask.c
+++ b/obrender/mask.c
@@ -24,7 +24,7 @@
 RrPixmapMask *RrPixmapMaskNew(const RrInstance *inst,
                               gint w, gint h, const gchar *data)
 {
-    RrPixmapMask *m = g_new(RrPixmapMask, 1);
+    RrPixmapMask *m = g_slice_new(RrPixmapMask);
     m->inst = inst;
     m->width = w;
     m->height = h;
@@ -40,7 +40,7 @@ void RrPixmapMaskFree(RrPixmapMask *m)
     if (m) {
         XFreePixmap(RrDisplay(m->inst), m->mask);
         g_free(m->data);
-        g_free(m);
+        g_slice_free(RrPixmapMask, m);
     }
 }
 
@@ -70,7 +70,7 @@ void RrPixmapMaskDraw(Pixmap p, const RrTextureMask *m, const RrRect *area)
 
 RrPixmapMask *RrPixmapMaskCopy(const RrPixmapMask *src)
 {
-    RrPixmapMask *m = g_new(RrPixmapMask, 1);
+    RrPixmapMask *m = g_slice_new(RrPixmapMask);
     m->inst = src->inst;
     m->width = src->width;
     m->height = src->height;
diff --git a/obrender/render.c b/obrender/render.c
index 20002e32..58bf12ec 100644
--- a/obrender/render.c
+++ b/obrender/render.c
@@ -200,7 +200,7 @@ RrAppearance *RrAppearanceNew(const RrInstance *inst, gint numtex)
 {
   RrAppearance *out;
 
-  out = g_new0(RrAppearance, 1);
+  out = g_slice_new0(RrAppearance);
   out->inst = inst;
   out->textures = numtex;
   out->surface.bevel_light_adjust = 128;
@@ -232,7 +232,7 @@ void RrAppearanceClearTextures(RrAppearance *a)
 RrAppearance *RrAppearanceCopy(RrAppearance *orig)
 {
     RrSurface *spo, *spc;
-    RrAppearance *copy = g_new(RrAppearance, 1);
+    RrAppearance *copy = g_slice_new(RrAppearance);
 
     copy->inst = orig->inst;
 
@@ -333,7 +333,7 @@ void RrAppearanceFree(RrAppearance *a)
         RrColorFree(p->split_secondary);
         g_free(p->pixel_data);
         p->pixel_data = NULL;
-        g_free(a);
+        g_slice_free(RrAppearance, a);
     }
 }
 
@@ -414,7 +414,7 @@ gint RrMinWidth(RrAppearance *a)
                                     a->texture[i].data.text.flow,
                                     a->texture[i].data.text.maxwidth);
             w = MAX(w, m->width);
-            g_free(m);
+            g_slice_free(RrSize, m);
             break;
         case RR_TEXTURE_RGBA:
             w += MAX(w, a->texture[i].data.rgba.width);
@@ -463,7 +463,7 @@ gint RrMinHeight(RrAppearance *a)
                      a->texture[i].data.text.flow,
                      a->texture[i].data.text.maxwidth);
                 h += MAX(h, m->height);
-                g_free(m);
+                g_slice_free(RrSize, m);
             }
             else
                 h += MAX(h,
diff --git a/obrender/render.h b/obrender/render.h
index 64c2f6a1..cf9883a9 100644
--- a/obrender/render.h
+++ b/obrender/render.h
@@ -316,6 +316,8 @@ RrFont *RrFontOpen          (const RrInstance *inst, const gchar *name,
                              gint size, RrFontWeight weight, RrFontSlant slant);
 RrFont *RrFontOpenDefault   (const RrInstance *inst);
 void    RrFontClose         (RrFont *f);
+/*! Returns an RrSize, that was allocated with g_slice_new().  Use g_slice_free() to
+  free it. */
 RrSize *RrFontMeasureString (const RrFont *f, const gchar *str,
                              gint shadow_offset_x, gint shadow_offset_y,
                              gboolean flow, gint maxwidth);
diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c
index ed205364..18daf784 100644
--- a/openbox/actions/execute.c
+++ b/openbox/actions/execute.c
@@ -53,7 +53,7 @@ static gpointer setup_func(xmlNodePtr node)
     xmlNodePtr n;
     Options *o;
 
-    o = g_new0(Options, 1);
+    o = g_slice_new0(Options);
 
     if ((n = obt_xml_find_node(node, "command")) ||
         (n = obt_xml_find_node(node, "execute")))
@@ -97,21 +97,22 @@ static void free_func(gpointer options)
         g_free(o->sn_icon);
         g_free(o->sn_wmclass);
         g_free(o->prompt);
-        if (o->data) g_free(o->data);
-        g_free(o);
+        if (o->data) g_slice_free(ObActionsData, o->data);
+        g_slice_free(Options, o);
     }
 }
 
 static Options* dup_options(Options *in, ObActionsData *data)
 {
-    Options *o = g_new(Options, 1);
+    Options *o = g_slice_new(Options);
     o->cmd = g_strdup(in->cmd);
     o->sn = in->sn;
     o->sn_name = g_strdup(in->sn_name);
     o->sn_icon = g_strdup(in->sn_icon);
     o->sn_wmclass = g_strdup(in->sn_wmclass);
     o->prompt = NULL;
-    o->data = g_memdup(data, sizeof(ObActionsData));
+    o->data = g_slice_new(ObActionsData);
+    memcpy(o->data, data, sizeof(ObActionsData));
     return o;
 }
 
diff --git a/parser/parse.c b/parser/parse.c
deleted file mode 100644
index 897d738f..00000000
--- a/parser/parse.c
+++ /dev/null
@@ -1,532 +0,0 @@
-/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
-
-   parse.c for the Openbox window manager
-   Copyright (c) 2003-2007   Dana Jansens
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   See the COPYING file for a copy of the GNU General Public License.
-*/
-
-#include "parse.h"
-#include <glib.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-static gboolean xdg_start;
-static gchar   *xdg_config_home_path;
-static gchar   *xdg_data_home_path;
-static GSList  *xdg_config_dir_paths;
-static GSList  *xdg_data_dir_paths;
-
-struct Callback {
-    gchar *tag;
-    ParseCallback func;
-    gpointer data;
-};
-
-struct _ObParseInst {
-    GHashTable *callbacks;
-};
-
-static void destfunc(struct Callback *c)
-{
-    g_free(c->tag);
-    g_free(c);
-}
-
-ObParseInst* parse_startup(void)
-{
-    ObParseInst *i = g_new(ObParseInst, 1);
-    i->callbacks = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
-                                         (GDestroyNotify)destfunc);
-    return i;
-}
-
-void parse_shutdown(ObParseInst *i)
-{
-    if (i) {
-        g_hash_table_destroy(i->callbacks);
-        g_free(i);
-    }
-}
-
-void parse_register(ObParseInst *i, const gchar *tag,
-                    ParseCallback func, gpointer data)
-{
-    struct Callback *c;
-
-    if ((c = g_hash_table_lookup(i->callbacks, tag))) {
-        g_error("Tag '%s' already registered", tag);
-        return;
-    }
-
-    c = g_new(struct Callback, 1);
-    c->tag = g_strdup(tag);
-    c->func = func;
-    c->data = data;
-    g_hash_table_insert(i->callbacks, c->tag, c);
-}
-
-gboolean parse_load_rc(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root)
-{
-    GSList *it;
-    gboolean r = FALSE;
-
-    if (file && parse_load(file, "openbox_config", doc, root))
-        return TRUE;
-
-    for (it = xdg_config_dir_paths; !r && it; it = g_slist_next(it)) {
-        gchar *path;
-
-        path = g_build_filename(it->data, "openbox", "rc.xml", NULL);
-        r = parse_load(path, "openbox_config", doc, root);
-        g_free(path);
-    }
-
-    return r;
-}
-
-gboolean parse_load_theme(const gchar *name, xmlDocPtr *doc, xmlNodePtr *root,
-                          gchar **retpath)
-{
-    GSList *it;
-    gchar *path;
-    gboolean r = FALSE;
-    gchar *eng;
-
-    /* backward compatibility.. */
-    path = g_build_filename(g_get_home_dir(), ".themes", name,
-                            "openbox-3", "themerc.xml", NULL);
-    if (parse_load(path, "openbox_theme", doc, root) &&
-        parse_attr_string("engine", *root, &eng))
-    {
-        if (!strcmp(eng, "box")) {
-            *retpath = g_path_get_dirname(path);
-            r = TRUE;
-        }
-        g_free(eng);
-    }
-    g_free(path);
-
-    if (!r) {
-        for (it = xdg_data_dir_paths; !r && it; it = g_slist_next(it)) {
-            path = g_build_filename(it->data, "themes", name, "openbox-3",
-                                    "themerc.xml", NULL);
-            if (parse_load(path, "openbox_theme", doc, root) &&
-                parse_attr_string("engine", *root, &eng))
-            {
-                if (!strcmp(eng, "box")) {
-                    *retpath = g_path_get_dirname(path);
-                    r = TRUE;
-                }
-                g_free(eng);
-            }
-            g_free(path);
-        }
-    }
-    return r;
-}
-
-gboolean parse_load_menu(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root)
-{
-    GSList *it;
-    gchar *path;
-    gboolean r = FALSE;
-
-    if (file[0] == '/') {
-        r = parse_load(file, "openbox_menu", doc, root);
-    } else {
-        for (it = xdg_config_dir_paths; !r && it; it = g_slist_next(it)) {
-            path = g_build_filename(it->data, "openbox", file, NULL);
-            r = parse_load(path, "openbox_menu", doc, root);
-            g_free(path);
-        }
-    }
-    return r;
-}
-
-gboolean parse_load(const gchar *path, const gchar *rootname,
-                    xmlDocPtr *doc, xmlNodePtr *root)
-{
-    struct stat s;
-
-    if (stat(path, &s) < 0)
-        return FALSE;
-
-    /* XML_PARSE_BLANKS is needed apparently. When it loads a theme file,
-       without this option, the tree is weird and has extra nodes in it. */
-    if ((*doc = xmlReadFile(path, NULL,
-                            XML_PARSE_NOBLANKS | XML_PARSE_RECOVER))) {
-        *root = xmlDocGetRootElement(*doc);
-        if (!*root) {
-            xmlFreeDoc(*doc);
-            *doc = NULL;
-            g_message("%s is an empty document", path);
-        } else {
-            if (xmlStrcmp((*root)->name, (const xmlChar*)rootname)) {
-                xmlFreeDoc(*doc);
-                *doc = NULL;
-                g_message("XML Document %s is of wrong type. Root "
-                          "node is not '%s'", path, rootname);
-            }
-        }
-    }
-    if (!*doc)
-        return FALSE;
-    return TRUE;
-}
-
-gboolean parse_load_mem(gpointer data, guint len, const gchar *rootname,
-                        xmlDocPtr *doc, xmlNodePtr *root)
-{
-    if ((*doc = xmlParseMemory(data, len))) {
-        *root = xmlDocGetRootElement(*doc);
-        if (!*root) {
-            xmlFreeDoc(*doc);
-            *doc = NULL;
-            g_message("Given memory is an empty document");
-        } else {
-            if (xmlStrcmp((*root)->name, (const xmlChar*)rootname)) {
-                xmlFreeDoc(*doc);
-                *doc = NULL;
-                g_message("XML Document in given memory is of wrong "
-                          "type. Root node is not '%s'\n", rootname);
-            }
-        }
-    }
-    if (!*doc)
-        return FALSE;
-    return TRUE;
-}
-
-void parse_close(xmlDocPtr doc)
-{
-    xmlFreeDoc(doc);
-}
-
-void parse_tree(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
-{
-    while (node) {
-        struct Callback *c = g_hash_table_lookup(i->callbacks, node->name);
-
-        if (c)
-            c->func(i, doc, node, c->data);
-
-        node = node->next;
-    }
-}
-
-gchar *parse_string(xmlDocPtr doc, xmlNodePtr node)
-{
-    xmlChar *c = xmlNodeListGetString(doc, node->children, TRUE);
-    gchar *s = g_strdup(c ? (gchar*)c : "");
-    xmlFree(c);
-    return s;
-}
-
-gint parse_int(xmlDocPtr doc, xmlNodePtr node)
-{
-    xmlChar *c = xmlNodeListGetString(doc, node->children, TRUE);
-    gint i = c ? atoi((gchar*)c) : 0;
-    xmlFree(c);
-    return i;
-}
-
-gboolean parse_bool(xmlDocPtr doc, xmlNodePtr node)
-{
-    xmlChar *c = xmlNodeListGetString(doc, node->children, TRUE);
-    gboolean b = FALSE;
-    if (c && !xmlStrcasecmp(c, (const xmlChar*) "true"))
-        b = TRUE;
-    else if (c && !xmlStrcasecmp(c, (const xmlChar*) "yes"))
-        b = TRUE;
-    else if (c && !xmlStrcasecmp(c, (const xmlChar*) "on"))
-        b = TRUE;
-    xmlFree(c);
-    return b;
-}
-
-gboolean parse_contains(const gchar *val, xmlDocPtr doc, xmlNodePtr node)
-{
-    xmlChar *c = xmlNodeListGetString(doc, node->children, TRUE);
-    gboolean r;
-    r = !xmlStrcasecmp(c, (const xmlChar*) val);
-    xmlFree(c);
-    return r;
-}
-
-xmlNodePtr parse_find_node(const gchar *tag, xmlNodePtr node)
-{
-    while (node) {
-        if (!xmlStrcmp(node->name, (const xmlChar*) tag))
-            return node;
-        node = node->next;
-    }
-    return NULL;
-}
-
-gboolean parse_attr_bool(const gchar *name, xmlNodePtr node, gboolean *value)
-{
-    xmlChar *c = xmlGetProp(node, (const xmlChar*) name);
-    gboolean r = FALSE;
-    if (c) {
-        if (!xmlStrcasecmp(c, (const xmlChar*) "true"))
-            *value = TRUE, r = TRUE;
-        else if (!xmlStrcasecmp(c, (const xmlChar*) "yes"))
-            *value = TRUE, r = TRUE;
-        else if (!xmlStrcasecmp(c, (const xmlChar*) "on"))
-            *value = TRUE, r = TRUE;
-        else if (!xmlStrcasecmp(c, (const xmlChar*) "false"))
-            *value = FALSE, r = TRUE;
-        else if (!xmlStrcasecmp(c, (const xmlChar*) "no"))
-            *value = FALSE, r = TRUE;
-        else if (!xmlStrcasecmp(c, (const xmlChar*) "off"))
-            *value = FALSE, r = TRUE;
-    }
-    xmlFree(c);
-    return r;
-}
-
-gboolean parse_attr_int(const gchar *name, xmlNodePtr node, gint *value)
-{
-    xmlChar *c = xmlGetProp(node, (const xmlChar*) name);
-    gboolean r = FALSE;
-    if (c) {
-        *value = atoi((gchar*)c);
-        r = TRUE;
-    }
-    xmlFree(c);
-    return r;
-}
-
-gboolean parse_attr_string(const gchar *name, xmlNodePtr node, gchar **value)
-{
-    xmlChar *c = xmlGetProp(node, (const xmlChar*) name);
-    gboolean r = FALSE;
-    if (c) {
-        *value = g_strdup((gchar*)c);
-        r = TRUE;
-    }
-    xmlFree(c);
-    return r;
-}
-
-gboolean parse_attr_contains(const gchar *val, xmlNodePtr node,
-                             const gchar *name)
-{
-    xmlChar *c = xmlGetProp(node, (const xmlChar*) name);
-    gboolean r = FALSE;
-    if (c)
-        r = !xmlStrcasecmp(c, (const xmlChar*) val);
-    xmlFree(c);
-    return r;
-}
-
-static gint slist_path_cmp(const gchar *a, const gchar *b)
-{
-    return strcmp(a, b);
-}
-
-typedef GSList* (*GSListFunc) (gpointer list, gconstpointer data);
-
-static GSList* slist_path_add(GSList *list, gpointer data, GSListFunc func)
-{
-    g_assert(func);
-
-    if (!data)
-        return list;
-
-    if (!g_slist_find_custom(list, data, (GCompareFunc) slist_path_cmp))
-        list = func(list, data);
-    else
-        g_free(data);
-
-    return list;
-}
-
-static GSList* split_paths(const gchar *paths)
-{
-    GSList *list = NULL;
-    gchar **spl, **it;
-
-    if (!paths)
-        return NULL;
-    spl = g_strsplit(paths, ":", -1);
-    for (it = spl; *it; ++it)
-        list = slist_path_add(list, *it, (GSListFunc) g_slist_append);
-    g_free(spl);
-    return list;
-}
-
-void parse_paths_startup(void)
-{
-    const gchar *path;
-
-    if (xdg_start)
-        return;
-    xdg_start = TRUE;
-
-    path = g_getenv("XDG_CONFIG_HOME");
-    if (path && path[0] != '\0') /* not unset or empty */
-        xdg_config_home_path = g_build_filename(path, NULL);
-    else
-        xdg_config_home_path = g_build_filename(g_get_home_dir(), ".config",
-                                                NULL);
-
-    path = g_getenv("XDG_DATA_HOME");
-    if (path && path[0] != '\0') /* not unset or empty */
-        xdg_data_home_path = g_build_filename(path, NULL);
-    else
-        xdg_data_home_path = g_build_filename(g_get_home_dir(), ".local",
-                                              "share", NULL);
-
-    path = g_getenv("XDG_CONFIG_DIRS");
-    if (path && path[0] != '\0') /* not unset or empty */
-        xdg_config_dir_paths = split_paths(path);
-    else {
-        xdg_config_dir_paths = slist_path_add(xdg_config_dir_paths,
-                                              g_strdup(CONFIGDIR),
-                                              (GSListFunc) g_slist_append);
-        xdg_config_dir_paths = slist_path_add(xdg_config_dir_paths,
-                                              g_build_filename
-                                              (G_DIR_SEPARATOR_S,
-                                               "etc", "xdg", NULL),
-                                              (GSListFunc) g_slist_append);
-    }
-    xdg_config_dir_paths = slist_path_add(xdg_config_dir_paths,
-                                          g_strdup(xdg_config_home_path),
-                                          (GSListFunc) g_slist_prepend);
-
-    path = g_getenv("XDG_DATA_DIRS");
-    if (path && path[0] != '\0') /* not unset or empty */
-        xdg_data_dir_paths = split_paths(path);
-    else {
-        xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
-                                            g_strdup(DATADIR),
-                                            (GSListFunc) g_slist_append);
-        xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
-                                            g_build_filename
-                                            (G_DIR_SEPARATOR_S,
-                                             "usr", "local", "share", NULL),
-                                            (GSListFunc) g_slist_append);
-        xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
-                                            g_build_filename
-                                            (G_DIR_SEPARATOR_S,
-                                             "usr", "share", NULL),
-                                            (GSListFunc) g_slist_append);
-    }
-    xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
-                                        g_strdup(xdg_data_home_path),
-                                        (GSListFunc) g_slist_prepend);
-}
-
-void parse_paths_shutdown(void)
-{
-    GSList *it;
-
-    if (!xdg_start)
-        return;
-    xdg_start = FALSE;
-
-    for (it = xdg_config_dir_paths; it; it = g_slist_next(it))
-        g_free(it->data);
-    g_slist_free(xdg_config_dir_paths);
-    xdg_config_dir_paths = NULL;
-    for (it = xdg_data_dir_paths; it; it = g_slist_next(it))
-        g_free(it->data);
-    g_slist_free(xdg_data_dir_paths);
-    xdg_data_dir_paths = NULL;
-    g_free(xdg_config_home_path);
-    xdg_config_home_path = NULL;
-    g_free(xdg_data_home_path);
-    xdg_data_home_path = NULL;
-}
-
-gchar *parse_expand_tilde(const gchar *f)
-{
-    gchar *ret;
-    GRegex *regex;
-
-    if (!f)
-        return NULL;
-
-    regex = g_regex_new("(?:^|(?<=[ \\t]))~(?:(?=[/ \\t])|$)",
-                        G_REGEX_MULTILINE | G_REGEX_RAW, 0, NULL);
-    ret = g_regex_replace_literal(regex, f, -1, 0, g_get_home_dir(), 0, NULL);
-    g_regex_unref(regex);
-
-    return ret;
-}
-
-gboolean parse_mkdir(const gchar *path, gint mode)
-{
-    gboolean ret = TRUE;
-
-    g_return_val_if_fail(path != NULL, FALSE);
-    g_return_val_if_fail(path[0] != '\0', FALSE);
-
-    if (!g_file_test(path, G_FILE_TEST_IS_DIR))
-        if (mkdir(path, mode) == -1)
-            ret = FALSE;
-
-    return ret;
-}
-
-gboolean parse_mkdir_path(const gchar *path, gint mode)
-{
-    gboolean ret = TRUE;
-
-    g_return_val_if_fail(path != NULL, FALSE);
-    g_return_val_if_fail(path[0] == '/', FALSE);
-
-    if (!g_file_test(path, G_FILE_TEST_IS_DIR)) {
-        gchar *c, *e;
-
-        c = g_strdup(path);
-        e = c;
-        while ((e = strchr(e + 1, '/'))) {
-            *e = '\0';
-            if (!(ret = parse_mkdir(c, mode)))
-                goto parse_mkdir_path_end;
-            *e = '/';
-        }
-        ret = parse_mkdir(c, mode);
-
-    parse_mkdir_path_end:
-        g_free(c);
-    }
-
-    return ret;
-}
-
-const gchar* parse_xdg_config_home_path(void)
-{
-    return xdg_config_home_path;
-}
-
-const gchar* parse_xdg_data_home_path(void)
-{
-    return xdg_data_home_path;
-}
-
-GSList* parse_xdg_config_dir_paths(void)
-{
-    return xdg_config_dir_paths;
-}
-
-GSList* parse_xdg_data_dir_paths(void)
-{
-    return xdg_data_dir_paths;
-}