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

[Gustavo Noronha]

Mensagem de log: 
2009-03-04  Gustavo Noronha Silva  <kov at debian.org>

	* gksu/gksu.c: -revert last change, since it was completely bogus,
	and any environment change should be up to libgksu, anyway




-----


Modified: gksu/trunk/ChangeLog
===================================================================
--- gksu/trunk/ChangeLog	2009-02-23 02:20:27 UTC (rev 840)
+++ gksu/trunk/ChangeLog	2009-03-04 18:26:34 UTC (rev 841)
@@ -1,3 +1,8 @@
+2009-03-04  Gustavo Noronha Silva  <kov at debian.org>
+
+	* gksu/gksu.c: -revert last change, since it was completely bogus,
+	and any environment change should be up to libgksu, anyway
+
 2009-02-22  Gustavo Noronha Silva  <kov at alface>
 
 	* Release 2.0.1

Modified: gksu/trunk/gksu/gksu.c
===================================================================
--- gksu/trunk/gksu/gksu.c	2009-02-23 02:20:27 UTC (rev 840)
+++ gksu/trunk/gksu/gksu.c	2009-03-04 18:26:34 UTC (rev 841)
@@ -740,20 +740,19 @@
 			    NULL, NULL,
 			    &exit_status,
 			    &error);
-	else
-          {
-            /* make sure the environment will not break running
-             * GNOME applications
-             */
-            unsetenv ("ORBIT_SOCKETDIR");
-            unsetenv ("DBUS_SESSION_BUS_ADDRESS");
+	else if (run_mode == SU_MODE)
+	  gksu_su_fuller (context,
+			  NULL, NULL,
+			  NULL, NULL,
+			  &exit_status,
+			  &error);
 
-            gksu_su_fuller (context,
-                            NULL, NULL,
-                            NULL, NULL,
-                            &exit_status,
-                            &error);
-          }
+	else
+	  gksu_run_fuller (context,
+			   NULL, NULL,
+			   NULL, NULL,
+			   &exit_status,
+			   &error);
 	if ((error == NULL) || (error->code != GKSU_ERROR_WRONGPASS))
 	  break;
       }