From ea01de53feb47d592ba6401051ac85375e9a45a9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 9 Sep 2004 14:06:20 +0000 Subject: [PATCH] Clarify the relation of g_get_home_dir() and $HOME. --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-12 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ docs/reference/ChangeLog | 5 +++++ docs/reference/glib/tmpl/misc_utils.sgml | 7 ++++++- glib/gutils.c | 6 ------ 8 files changed, 31 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb0458b8..f91299f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-09-09 Matthias Clasen + + * glib/gutils.c (g_get_home_dir): Remove a misleading comment. + Thu Sep 9 00:10:40 2004 Matthias Clasen * glib/gstrfuncs.h: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index eb0458b8..f91299f3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2004-09-09 Matthias Clasen + + * glib/gutils.c (g_get_home_dir): Remove a misleading comment. + Thu Sep 9 00:10:40 2004 Matthias Clasen * glib/gstrfuncs.h: diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index eb0458b8..f91299f3 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,7 @@ +2004-09-09 Matthias Clasen + + * glib/gutils.c (g_get_home_dir): Remove a misleading comment. + Thu Sep 9 00:10:40 2004 Matthias Clasen * glib/gstrfuncs.h: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index eb0458b8..f91299f3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +2004-09-09 Matthias Clasen + + * glib/gutils.c (g_get_home_dir): Remove a misleading comment. + Thu Sep 9 00:10:40 2004 Matthias Clasen * glib/gstrfuncs.h: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index eb0458b8..f91299f3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +2004-09-09 Matthias Clasen + + * glib/gutils.c (g_get_home_dir): Remove a misleading comment. + Thu Sep 9 00:10:40 2004 Matthias Clasen * glib/gstrfuncs.h: diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index f66d1bef..7485434d 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,8 @@ +2004-09-09 Matthias Clasen + + * glib/tmpl/misc_utils.sgml: Add a hint about $HOME to the + docs of g_get_home_dir(). + Thu Sep 9 00:11:19 2004 Matthias Clasen * glib/glib-sections.txt: Add g_strv_length(). diff --git a/docs/reference/glib/tmpl/misc_utils.sgml b/docs/reference/glib/tmpl/misc_utils.sgml index 5ba34870..8ead291c 100644 --- a/docs/reference/glib/tmpl/misc_utils.sgml +++ b/docs/reference/glib/tmpl/misc_utils.sgml @@ -125,7 +125,12 @@ returned. -Gets the current user's home directory. +Gets the current user's home directory. + + +Note that in contrast to traditional Unix tools, this function +prefers passwd entries over the HOME +environment variable. @Returns: the current user's home directory. diff --git a/glib/gutils.c b/glib/gutils.c index c2fdf463..fe7d44a6 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -1165,12 +1165,6 @@ g_get_real_name (void) return g_real_name; } -/* Return the home directory of the user. If there is a HOME - * environment variable, its value is returned, otherwise use some - * system-dependent way of finding it out. If no home directory can be - * deduced, return NULL. - */ - G_CONST_RETURN gchar* g_get_home_dir (void) { -- 2.34.1