? depcomp
? stamp-h1
? gnome-session/session-properties.desktop.in
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-session/ChangeLog,v
retrieving revision 1.585
diff -p -u -r1.585 ChangeLog
--- ChangeLog	1 Apr 2005 00:46:32 -0000	1.585
+++ ChangeLog	5 May 2005 18:14:52 -0000
@@ -1,3 +1,7 @@
+2005-05-05  William Jon McCann  <mccann@jhu.edu>
+
+	* man/gnome-session-save.1: Document --silent option.
+
 2005-03-31  Steve Murphy  <murf@e-tools.com>
 
         * configure.in: Added "rw" to ALL_LINGUAS.
Index: gnome-session/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-session/gnome-session/ChangeLog,v
retrieving revision 1.446
diff -p -u -r1.446 ChangeLog
--- gnome-session/ChangeLog	26 Apr 2005 10:56:50 -0000	1.446
+++ gnome-session/ChangeLog	5 May 2005 18:14:53 -0000
@@ -1,3 +1,9 @@
+2005-05-05  William Jon McCann  <mccann@jhu.edu>
+
+	* save-session.c (save_complete, display_error):
+	Add command line option to avoid confirmation dialog on kill.
+	Fixes #149447.
+
 2005-04-26  Carlos Garnacho Parro  <carlosg@gnome.org>
 
 	Fix for #76791
Index: gnome-session/save-session.c
===================================================================
RCS file: /cvs/gnome/gnome-session/gnome-session/save-session.c,v
retrieving revision 1.25
diff -p -u -r1.25 save-session.c
--- gnome-session/save-session.c	19 May 2003 13:06:44 -0000	1.25
+++ gnome-session/save-session.c	5 May 2005 18:14:53 -0000
@@ -38,15 +38,19 @@ static gboolean zap = FALSE;
 /* True if we should use dialog boxes */
 static gboolean gui = FALSE; 
 
+/* True if we should do the requested action without confirmation */
+static gboolean silent = FALSE; 
+
 static char *session_name = NULL;
 
 static IceConn ice_conn = NULL;
 
 static const struct poptOption options[] = {
   {"session-name", 's', POPT_ARG_STRING, &session_name, 0, N_("Set the current session"), NULL},
-  {"kill", '\0', POPT_ARG_NONE, &zap, 0, N_("Kill session"),     NULL},
-  {"gui",  '\0', POPT_ARG_NONE, &gui, 0, N_("Use dialog boxes"), NULL},
-  {NULL,   '\0', 0, NULL, 0}
+  {"kill",   '\0', POPT_ARG_NONE, &zap, 0, N_("Kill session"),     NULL},
+  {"gui",    '\0', POPT_ARG_NONE, &gui, 0, N_("Use dialog boxes"), NULL},
+  {"silent", '\0', POPT_ARG_NONE, &silent, 0, N_("No not require confirmation"), NULL},
+  {NULL,     '\0', 0, NULL, 0}
 };
 
 static int exit_status = 0;
@@ -76,8 +80,8 @@ save_complete (GnomeClient* client, gpoi
      to.  Some of them aren't particularly useful.  Interestingly,
      there is no way to request a shutdown without a save.  */
   gnome_client_request_save (client, GNOME_SAVE_BOTH, zap,
-			     GNOME_INTERACT_ANY, 0, 1);
-  
+			     silent ? GNOME_INTERACT_NONE : GNOME_INTERACT_ANY,
+			     0, 1);
   
   ice_ping ();
 }
@@ -98,7 +102,7 @@ cancelled_cb (GnomeClient *client, gpoin
 static void
 display_error (const char *message)
 {
-  if (gui) 
+  if (gui && !silent) 
     {
       GtkWidget *dialog;
       
Index: man/gnome-session-save.1
===================================================================
RCS file: /cvs/gnome/gnome-session/man/gnome-session-save.1,v
retrieving revision 1.1
diff -p -u -r1.1 gnome-session-save.1
--- man/gnome-session-save.1	9 Dec 2002 22:03:09 -0000	1.1
+++ man/gnome-session-save.1	5 May 2005 18:14:53 -0000
@@ -6,7 +6,7 @@
 .SH NAME
 gnome-session-save \- Saves the current GNOME session (or terminates it)
 .SH SYNOPSIS
-.B gnome-session-save [\-\-kill] [\-\-gui]
+.B gnome-session-save [\-\-kill] [\-\-gui] [\-\-silent]
 .SH DESCRIPTION
 \fIgnome-session-save\fP can be used from a GNOME session to save a snapshot
 of the currently running applications.  This session will be later
@@ -20,6 +20,10 @@ The
 .B \-\-gui
 argument will show a dialog when the session is saved, and report errors
 in dialog boxes instead of printing to stderr.
+
+The
+.B \-\-silent
+argument will perform the requested action without confirmation from the user.
 
 .SH SEE ALSO
 .BR gnome-session(1)
