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

[Gustavo Noronha]

Mensagem de log: 
startup notification is now done completely by the
library


-----


Modified: gksu/trunk/ChangeLog
===================================================================
--- gksu/trunk/ChangeLog	2006-08-06 18:53:39 UTC (rev 680)
+++ gksu/trunk/ChangeLog	2006-08-06 18:58:50 UTC (rev 681)
@@ -1,5 +1,9 @@
 2006-08-06  Gustavo Noronha Silva  <kov at debian.org>
 
+	* gksu/gksu.c:
+	- remove all the startup notification-related code, which
+	  is now done by the library;
+
 	* nautilus-gksu/libnautilus-gksu.c:
 	- only display the menu item if we're not already
 	  root

Modified: gksu/trunk/gksu/gksu.c
===================================================================
--- gksu/trunk/gksu/gksu.c	2006-08-06 18:53:39 UTC (rev 680)
+++ gksu/trunk/gksu/gksu.c	2006-08-06 18:58:50 UTC (rev 681)
@@ -12,14 +12,9 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
 #include <X11/Xlib.h>
 #include <gtk/gtk.h>
 
-#define SN_API_NOT_YET_FROZEN
-#include <libsn/sn.h>
-
 #include <libgksu.h>
 
 #include "defines.h"
@@ -206,7 +201,6 @@
 main (int argc, char **argv)
 {
   GksuContext *context;
-  SnDisplay *sn_display;
 
   GError *error = NULL;
 
@@ -438,23 +432,8 @@
    * FIXME: should be moved to libgksu, which should have two new API functions:
    * gksu_context_launcher_context_{initiate,complete}
    */
-  sn_display = sn_display_new (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
-			       NULL, NULL);
-  context->sn_context = sn_launcher_context_new (sn_display, gdk_screen_get_number (gdk_display_get_default_screen (gdk_display_get_default ())));
-  sn_launcher_context_set_description (context->sn_context, _("Granting Rights"));
-  sn_launcher_context_set_name (context->sn_context, g_get_prgname ());
-  sn_launcher_context_set_binary_name (context->sn_context,
-				       gksu_context_get_command (context));
 
   {
-    guint32 launch_time = gdk_x11_display_get_user_time((GdkDisplay*)GDK_DISPLAY());
-    sn_launcher_context_initiate (context->sn_context,
-				  g_get_prgname (),
-				  gksu_context_get_command (context),
-				  launch_time);
-  }
-
-  {
     struct passwd *pwentry;
 
     pwentry = getpwnam (gksu_context_get_user (context));
@@ -470,7 +449,6 @@
       {
 	gint retval = g_spawn_command_line_sync (gksu_context_get_command (context),
 						 NULL, NULL, NULL, NULL);
-	sn_launcher_context_complete(context->sn_context);
 	return retval;
       }
   }
@@ -508,8 +486,6 @@
       }
   }
 
-  sn_launcher_context_complete(context->sn_context);
-
   if (error && (error->code != GKSU_ERROR_CANCELED))
     {
       gk_dialog (GTK_MESSAGE_ERROR,