diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-07-06 02:31:19 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-07-06 02:31:19 +0800 |
commit | 8f2faaca26b01f71ef299a2e54d6fb8a0b6e522b (patch) | |
tree | 3a9eb77469e9555155a38a390d158c7b3c077da7 /sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c | |
parent | 02ef3ee281512664294f60ae53cefca61e17b526 (diff) | |
download | marcuscom-ports-8f2faaca26b01f71ef299a2e54d6fb8a0b6e522b.tar marcuscom-ports-8f2faaca26b01f71ef299a2e54d6fb8a0b6e522b.tar.gz marcuscom-ports-8f2faaca26b01f71ef299a2e54d6fb8a0b6e522b.tar.bz2 marcuscom-ports-8f2faaca26b01f71ef299a2e54d6fb8a0b6e522b.tar.lz marcuscom-ports-8f2faaca26b01f71ef299a2e54d6fb8a0b6e522b.tar.xz marcuscom-ports-8f2faaca26b01f71ef299a2e54d6fb8a0b6e522b.tar.zst marcuscom-ports-8f2faaca26b01f71ef299a2e54d6fb8a0b6e522b.zip |
Update to 2.11.5.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4183 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c')
-rw-r--r-- | sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c new file mode 100644 index 000000000..98c92bb99 --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c @@ -0,0 +1,34 @@ +--- capplets/about-me/gnome-about-me.c.orig Tue Jul 5 14:17:38 2005 ++++ capplets/about-me/gnome-about-me.c Tue Jul 5 14:20:06 2005 +@@ -260,12 +260,10 @@ about_me_focus_out (GtkWidget *widget, G + static char * + get_user_login (void) + { +- char buf[LINE_MAX * 4]; +- struct passwd pwd, *err; ++ struct passwd *pwd; + +- int i; +- i = getpwuid_r(getuid(), &pwd, buf, sizeof(buf), &err); +- return ((i == 0) && (err == &pwd)) ? g_strdup(pwd.pw_name) : NULL; ++ pwd = getpwuid(getuid()); ++ return (pwd != NULL) ? g_strdup(pwd->pw_name) : NULL; + } + + /* +@@ -655,6 +653,7 @@ about_me_setup_dialog (void) + struct passwd *pwent; + char *user = NULL; + gchar *str; ++ gchar **tok; + + me = g_new0 (GnomeAboutMe, 1); + +@@ -711,7 +710,6 @@ about_me_setup_dialog (void) + _("Unknown login ID, the user database might be corrupted")); + return ; + } +- gchar **tok; + tok = g_strsplit (pwent->pw_gecos, ",", 0); + + /************************************************/ |