From b359dbbf5ee28513e42c9336167012e78514d456 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 26 Aug 2004 00:08:46 +0000 Subject: [PATCH] Test the new XDG basedir functions. 2004-08-26 Tor Lillqvist * tests/testglib.c (main): Test the new XDG basedir functions. --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-12 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ tests/testglib.c | 17 ++++++++++++++++- 6 files changed, 36 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cdbc98aae..1b6cfd54e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-08-26 Tor Lillqvist + + * tests/testglib.c (main): Test the new XDG basedir functions. + 2004-08-25 Tor Lillqvist * glib/gwin32.c (g_win32_get_windows_version): New diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index cdbc98aae..1b6cfd54e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2004-08-26 Tor Lillqvist + + * tests/testglib.c (main): Test the new XDG basedir functions. + 2004-08-25 Tor Lillqvist * glib/gwin32.c (g_win32_get_windows_version): New diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index cdbc98aae..1b6cfd54e 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,7 @@ +2004-08-26 Tor Lillqvist + + * tests/testglib.c (main): Test the new XDG basedir functions. + 2004-08-25 Tor Lillqvist * glib/gwin32.c (g_win32_get_windows_version): New diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index cdbc98aae..1b6cfd54e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +2004-08-26 Tor Lillqvist + + * tests/testglib.c (main): Test the new XDG basedir functions. + 2004-08-25 Tor Lillqvist * glib/gwin32.c (g_win32_get_windows_version): New diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index cdbc98aae..1b6cfd54e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +2004-08-26 Tor Lillqvist + + * tests/testglib.c (main): Test the new XDG basedir functions. + 2004-08-25 Tor Lillqvist * glib/gwin32.c (g_win32_get_windows_version): New diff --git a/tests/testglib.c b/tests/testglib.c index 76bd04552..83ee2cfe9 100644 --- a/tests/testglib.c +++ b/tests/testglib.c @@ -322,6 +322,8 @@ int main (int argc, char *argv[]) { + const gchar *s; + gchar **sv; GList *list, *t; GSList *slist, *st; GHashTable *hash_table; @@ -434,7 +436,20 @@ main (int argc, g_free (string); g_print ("user: %s\n", g_get_user_name ()); g_print ("real: %s\n", g_get_real_name ()); - g_print ("home: %s\n", g_get_home_dir ()); + s = g_get_home_dir (); + g_print ("home: %s\n", s ? s : "NULL!"); + s = g_get_home_dir (); + g_print ("home: %s\n", s ? s : "NULL!"); + s = g_get_user_data_dir (); + g_print ("user_data: %s\n", s ? s : "NULL!"); + s = g_get_user_config_dir (); + g_print ("user_config: %s\n", s ? s : "NULL!"); + s = g_get_user_cache_dir (); + g_print ("user_cache: %s\n", s ? s : "NULL!"); + sv = (gchar **) g_get_system_data_dirs (); + g_print ("system_data: %s\n", sv ? g_strjoinv (G_SEARCHPATH_SEPARATOR_S, sv) : "NULL!"); + sv = (gchar **) g_get_system_config_dirs (); + g_print ("system_config: %s\n", s ? g_strjoinv (G_SEARCHPATH_SEPARATOR_S, sv) : "NULL!"); g_print ("tmp-dir: %s\n", g_get_tmp_dir ()); /* type sizes */