kov changed gksu/trunk/ChangeLog, gksu/trunk/configure.ac, gksu/trunk/gksu/gksu.c

[Gustavo Noronha]

Mensagem de log: 
accepted patch by Joshua Kwan <jkwan at vmware.com> to make gksu return
the same status code as the child



-----


Modified: gksu/trunk/ChangeLog
===================================================================
--- gksu/trunk/ChangeLog	2009-02-22 19:53:55 UTC (rev 834)
+++ gksu/trunk/ChangeLog	2009-02-22 19:56:20 UTC (rev 835)
@@ -1,3 +1,9 @@
+2009-02-22  Gustavo Noronha Silva  <kov at debian.org>
+
+	* configure.ac, gksu/gksu.c:
+	- accepted patch by Joshua Kwan <jkwan at vmware.com> to
+	  make gksu return the same status code as the child
+
 2009-02-03  Gustavo Noronha Silva  <kov at debian.org>
 
 	* configure.ac:

Modified: gksu/trunk/configure.ac
===================================================================
--- gksu/trunk/configure.ac	2009-02-22 19:53:55 UTC (rev 834)
+++ gksu/trunk/configure.ac	2009-02-22 19:56:20 UTC (rev 835)
@@ -43,7 +43,7 @@
 AC_PATH_PROG(GCONFTOOL, gconftool-2)
 AM_GCONF_SOURCE_2
 
-PKG_CHECK_MODULES(GKSU, [libgksu2 >= 1.9.8, gtk+-2.0 >= 2.4.0])
+PKG_CHECK_MODULES(GKSU, [libgksu2 >= 2.0.8, gtk+-2.0 >= 2.4.0])
 
 gtk_doc_min_version=1.0
 AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])

Modified: gksu/trunk/gksu/gksu.c
===================================================================
--- gksu/trunk/gksu/gksu.c	2009-02-22 19:53:55 UTC (rev 834)
+++ gksu/trunk/gksu/gksu.c	2009-02-22 19:56:20 UTC (rev 835)
@@ -459,6 +459,7 @@
 
   gint newargc = 0;
   gchar **newargv = NULL;
+  gint8 exit_status = -1;
 
   guint run_mode = DEFAULT_MODE;
 
@@ -734,21 +735,24 @@
 	  }
 
 	if (run_mode == SUDO_MODE)
-	  gksu_sudo_full (context,
+	  gksu_sudo_fuller (context,
+			    NULL, NULL,
+			    NULL, NULL,
+			    &exit_status,
+			    &error);
+	else if (run_mode == SU_MODE)
+	  gksu_su_fuller (context,
 			  NULL, NULL,
 			  NULL, NULL,
+			  &exit_status,
 			  &error);
-	else if (run_mode == SU_MODE)
-	  gksu_su_full (context,
-			NULL, NULL,
-			NULL, NULL,
-			&error);
 
 	else
-	  gksu_run_full (context,
-			 NULL, NULL,
-			 NULL, NULL,
-			 &error);
+	  gksu_run_fuller (context,
+			   NULL, NULL,
+			   NULL, NULL,
+			   &exit_status,
+			   &error);
 	if ((error == NULL) || (error->code != GKSU_ERROR_WRONGPASS))
 	  break;
       }
@@ -764,5 +768,5 @@
       return 3;
     }
 
-  return 0;
+  return exit_status;
 }