callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix user name computation -mig

Browse Source 
svn path=/trunk/; revision=195
This commit is contained in:
Arturo Espinosa
1998-04-25 17:50:32 +00:00
parent 07f873d107
commit 6b3f6b3bf0
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/gui/main.c
View File

@ -11,7 +11,7 @@
#include <gnome.h> #include <gnome.h>
#include <pwd.h> #include <pwd.h>
#include <sys/types.h> #include <sys/types.h>
#include <string.h>
#include "alarm.h" #include "alarm.h"
#include "calendar.h" #include "calendar.h"
#include "eventedit.h" #include "eventedit.h"
@ -62,8 +62,14 @@ init_username (void)
passwd = getpwuid (getuid ()); passwd = getpwuid (getuid ());
if ((p = passwd->pw_name)) { if ((p = passwd->pw_name)) {
char *comma;
user_name = g_strdup (p); user_name = g_strdup (p);
full_name = g_strdup (passwd->pw_gecos); full_name = g_strdup (passwd->pw_gecos);
/* Keep only the name from the gecos field */
if ((comma = strchr (full_name, ',')) != NULL)
*comma = 0;
} else { } else {
if ((p = getenv ("USER"))) { if ((p = getenv ("USER"))) {
user_name = g_strdup (p); user_name = g_strdup (p);

8
calendar/main.c
View File

@ -11,7 +11,7 @@
#include <gnome.h> #include <gnome.h>
#include <pwd.h> #include <pwd.h>
#include <sys/types.h> #include <sys/types.h>
#include <string.h>
#include "alarm.h" #include "alarm.h"
#include "calendar.h" #include "calendar.h"
#include "eventedit.h" #include "eventedit.h"
@ -62,8 +62,14 @@ init_username (void)
passwd = getpwuid (getuid ()); passwd = getpwuid (getuid ());
if ((p = passwd->pw_name)) { if ((p = passwd->pw_name)) {
char *comma;
user_name = g_strdup (p); user_name = g_strdup (p);
full_name = g_strdup (passwd->pw_gecos); full_name = g_strdup (passwd->pw_gecos);
/* Keep only the name from the gecos field */
if ((comma = strchr (full_name, ',')) != NULL)
*comma = 0;
} else { } else {
if ((p = getenv ("USER"))) { if ((p = getenv ("USER"))) {
user_name = g_strdup (p); user_name = g_strdup (p);