X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=parser%2Fparse.c;h=f8aed0b5b0228258eef79b2abf28cf2a48dea939;hb=f3801affc6cbb18a05bed59c2ffa3adf38ffe888;hp=f7ca9d708856922e7da0d894ead41a106574c03f;hpb=5cadc1bff5a26497df28f38e7e9b74d81dfa1084;p=chaz%2Fopenbox

diff --git a/parser/parse.c b/parser/parse.c
index f7ca9d70..f8aed0b5 100644
--- a/parser/parse.c
+++ b/parser/parse.c
@@ -32,7 +32,7 @@ static GSList  *xdg_data_dir_paths;
 struct Callback {
     gchar *tag;
     ParseCallback func;
-    void *data;
+    gpointer data;
 };
 
 struct _ObParseInst {
@@ -62,7 +62,7 @@ void parse_shutdown(ObParseInst *i)
 }
 
 void parse_register(ObParseInst *i, const gchar *tag,
-                    ParseCallback func, void *data)
+                    ParseCallback func, gpointer data)
 {
     struct Callback *c;
 
@@ -296,27 +296,27 @@ static GSList* split_paths(const gchar *paths)
 
 void parse_paths_startup()
 {
-    gchar *path;
+    const gchar *path;
 
     if (xdg_start)
         return;
     xdg_start = TRUE;
 
-    path = getenv("XDG_CONFIG_HOME");
+    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 = getenv("XDG_DATA_HOME");
+    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 = getenv("XDG_CONFIG_DIRS");
+    path = g_getenv("XDG_CONFIG_DIRS");
     if (path && path[0] != '\0') /* not unset or empty */
         xdg_config_dir_paths = split_paths(path);
     else {
@@ -333,7 +333,7 @@ void parse_paths_startup()
                                           xdg_config_home_path,
                                           (GSListFunc) g_slist_prepend);
     
-    path = getenv("XDG_DATA_DIRS");
+    path = g_getenv("XDG_DATA_DIRS");
     if (path && path[0] != '\0') /* not unset or empty */
         xdg_data_dir_paths = split_paths(path);
     else {