patches/gnome-volume-manager-04-fixlocaluser.diff
author bc99092
Tue, 19 Sep 2006 20:46:09 +0000
changeset 8166 d0507d988b24
child 8169 cab423732ec5
permissions -rw-r--r--
2006-09-19 Brian Cameron <[email protected]> * gnome-volume-manager.spec, patches/gnome-volume-manager-04-fixlocaluser.diff: Fix problem that was causing gnome-volume-manager to just exit on startup.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8166
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
     1
--- manager.c-orig	2006-09-19 15:29:52.179060000 -0500
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
     2
+++ manager.c	2006-09-19 15:42:01.749377000 -0500
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
     3
@@ -25,7 +25,7 @@
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
     4
 #include <dirent.h>
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
     5
 #include <signal.h>
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
     6
 #include <unistd.h>
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
     7
-#include <utmp.h>
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
     8
+#include <utmpx.h>
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
     9
 
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    10
 #include <locale.h>
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    11
 
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    12
@@ -3087,7 +3087,7 @@ static gboolean
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    13
 gvm_local_user (void)
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    14
 {
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    15
 	gboolean local = FALSE;
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    16
-	struct utmp *utmp;
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    17
+	struct utmpx *utmp;
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    18
 	const char *user;
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    19
 	size_t ulen;
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    20
 	
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    21
@@ -3096,12 +3096,12 @@ gvm_local_user (void)
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    22
 	
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    23
 	setutent ();
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    24
 	
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    25
-	while (!local && (utmp = getutent ())) {
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    26
+	while (!local && (utmp = getutxent ())) {
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    27
 		if (utmp->ut_type != USER_PROCESS || strncmp (utmp->ut_user, user, ulen) != 0)
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    28
 			continue;
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    29
 		
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    30
 		/* only accept local X sessions */
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    31
-		local = utmp->ut_line[0] == ':' && utmp->ut_line[1] >= '0' && utmp->ut_line[1] <= '9';
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    32
+		local = utmp->ut_host[0] == ':' && utmp->ut_host[1] >= '0' && utmp->ut_host[1] <= '9';
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    33
 	}
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    34
 	
d0507d988b24 2006-09-19 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    35
 	endutent ();