kov changed gksu/branches/gksu2/ChangeLog, gksu/branches/gksu2/configure.ac, gksu/branches/gksu2/gksu/gksu.c

[Gustavo Noronha]

Mensagem de log: 
disabled code that will be moved to the libgksu
package and started the port to libgksu2


-----


Modified: gksu/branches/gksu2/ChangeLog
===================================================================
--- gksu/branches/gksu2/ChangeLog	2006-01-29 21:18:15 UTC (rev 510)
+++ gksu/branches/gksu2/ChangeLog	2006-01-29 21:20:48 UTC (rev 511)
@@ -1,5 +1,9 @@
 2006-01-29  Gustavo Noronha Silva  <kov at debian.org>
 
+	* configure.ac, gksu/gksu.c:
+	- disabled code that will be moved to the libgksu
+	  package and started the port to libgksu2
+
 	* gksu/gksu.c:
 	- removed code moved to libgksu, started porting to
 	  libgksu2, misc fixes and cleanup, removed trailing

Modified: gksu/branches/gksu2/configure.ac
===================================================================
--- gksu/branches/gksu2/configure.ac	2006-01-29 21:18:15 UTC (rev 510)
+++ gksu/branches/gksu2/configure.ac	2006-01-29 21:20:48 UTC (rev 511)
@@ -43,8 +43,7 @@
 AC_PATH_PROG(GCONFTOOL, gconftool-2)
 AM_GCONF_SOURCE_2
 
-PKG_CHECK_MODULES(GKSU, [libgksu1.2 >= 1.3.3, libgksuui1.0 >= 1.0.6, 
-			gtk+-2.0 >= 2.4.0, gnome-keyring-1, gconf-2.0])
+PKG_CHECK_MODULES(GKSU, [libgksu2, gtk+-2.0 >= 2.4.0, gnome-keyring-1, gconf-2.0])
 
 gtk_doc_min_version=1.0
 AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])

Modified: gksu/branches/gksu2/gksu/gksu.c
===================================================================
--- gksu/branches/gksu2/gksu/gksu.c	2006-01-29 21:18:15 UTC (rev 510)
+++ gksu/branches/gksu2/gksu/gksu.c	2006-01-29 21:20:48 UTC (rev 511)
@@ -16,11 +16,11 @@
 #include <X11/Xlib.h>
 #include <gtk/gtk.h>
 
-#include <gconf/gconf-client.h>
+#if 0
 #include <gnome-keyring.h>
+#endif
 
-#include <gksuui.h>
-#include <gksu.h>
+#include <libgksu.h>
 
 #include "defines.h"
 #include "../config.h"
@@ -30,7 +30,6 @@
 #define BASE_PATH "/apps/gksu/"
 
 /* GLOBALS */
-GConfClient *gconf_client = NULL;
 gboolean print_pass = FALSE;
 gboolean force_grab = FALSE;
 gboolean sudo_mode = FALSE;
@@ -125,16 +124,20 @@
 "\n"), PACKAGE_VERSION, cmdname);
 }
 
+#if 0
 static void
 keyring_create_item_cb (GnomeKeyringResult result,
                         guint32 id, gpointer keyring_loop)
 {
   g_main_loop_quit (keyring_loop);
 }
+#endif
 
 gboolean
 try_gnome_keyring_password (GksuContext *context)
 {
+  /* disabled - will probably be moved to libgksu */
+#if 0
   GnomeKeyringAttributeList *attributes;
   GnomeKeyringAttribute attribute;
   GnomeKeyringResult result;
@@ -179,7 +182,7 @@
       keyring_command = g_strdup (gksu_context_get_command (context));
       gksu_context_set_command (context, "/bin/echo test > /dev/null");
       gksu_context_set_password (context, keyring_password);
-      gksu_context_run (context, &error);
+      gksu_su_full (context, NULL, NULL, NULL, NULL, &error);
 
       if (!error)
 	keyring_has_password = TRUE;
@@ -197,16 +200,15 @@
       return FALSE; /* we do not need a password */
     }
 
+#endif
   return TRUE;
 }
 
 int
 main (int argc, char **argv)
 {
-  GtkWidget *dialog;
   GksuContext *context;
 
-  gchar *password = NULL;
   GError *error = NULL;
 
   gint newargc = 0;
@@ -216,7 +218,6 @@
   gchar *desktop_file_name = NULL;
   GdkPixbuf *icon = NULL;
 
-  int retvalue = 0;
   int c = 0;
 
   setlocale (LC_ALL, "");
@@ -256,8 +257,6 @@
   gtk_init (&newargc, &newargv);
 
   context = gksu_context_new ();
-  gconf_client = gconf_client_get_default ();
-  get_configuration_options (context);
   while ((c = getopt_long(newargc, newargv, "?hu:lpm:kt:i:gdsS::P::aD:", long_opts, NULL))
 	 != EOF)
     {
@@ -316,9 +315,6 @@
 	case 'd':
 	  gksu_context_set_debug (context, TRUE);
 	  break;
-	case 's':
-	  gksu_context_set_ssh_fwd (context, TRUE);
-	  break;
 	case 'S':
 	  sudo_mode = TRUE;