head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.10 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.8 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.6 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.4 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.2 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.2.0.8 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.6 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.4 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.2 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.1.1.1.0.12 pkgsrc-2008Q3-base:1.1.1.1 cube-native-xorg:1.1.1.1.0.10 cube-native-xorg-base:1.1.1.1 pkgsrc-2008Q2:1.1.1.1.0.8 pkgsrc-2008Q2-base:1.1.1.1 cwrapper:1.1.1.1.0.6 pkgsrc-2008Q1:1.1.1.1.0.4 pkgsrc-2008Q1-base:1.1.1.1 pkgsrc-2007Q4:1.1.1.1.0.2 pkgsrc-2007Q4-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2009.10.22.17.25.44; author drochner; state dead; branches; next 1.2; 1.2 date 2008.10.16.15.24.01; author drochner; state Exp; branches; next 1.1; 1.1 date 2007.11.05.19.17.29; author drochner; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2007.11.05.19.17.29; author drochner; state Exp; branches; next ; desc @@ 1.3 log @update to 2.28.1 This switches to the gnome-2.28 release branch. @ text @$NetBSD: patch-ab,v 1.2 2008/10/16 15:24:01 drochner Exp $ --- capplets/about-me/gnome-about-me.c.orig 2008-09-24 18:36:23.000000000 +0200 +++ capplets/about-me/gnome-about-me.c @@@@ -329,17 +329,12 @@@@ 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; -#if defined(__sun) && !defined(_POSIX_PTHREAD_SEMANTICS) - i = getpwuid_r (getuid (), &pwd, buf, sizeof (buf)); - return (i != 0) ? g_strdup (pwd.pw_name) : NULL; -#else - i = getpwuid_r (getuid (), &pwd, buf, sizeof (buf), &err); - return ((i == 0) && (err == &pwd)) ? g_strdup (pwd.pw_name) : NULL; -#endif + pwd = getpwuid (getuid ()); + if (pwd == NULL) + return NULL; + return g_strdup (pwd->pw_name); } /* @ 1.2 log @update to 2.24.0.1 This switches to the gnome-2.24 release branch. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.4 2007/09/19 23:53:50 wiz Exp $ d3 1 a3 1 --- capplets/about-me/gnome-about-me.c.orig 2006-09-24 20:42:14.000000000 +0000 d5 2 a6 1 @@@@ -267,16 +267,12 @@@@ static char * d9 1 a9 1 char buf[LINE_MAX * 4]; d14 1 a14 1 -#if __sun @ 1.1.1.1 log @Import gnome-control-center-2.20.1, part of the GNOME desktop which was in the pkgsrc tree as "control-center". The upstream filename is "gnome-control-center", and it is more descriptive anyway. Sorry for breaking updates etc... @ text @@