? depcomp
? stamp-h1
? po/stamp-it
? smproxy/Makefile
? smproxy/Makefile.in
? smproxy/gnome-smproxy
Index: gnome-session/headers.h
===================================================================
RCS file: /cvs/gnome/gnome-session/gnome-session/headers.h,v
retrieving revision 1.15
diff -u -p -r1.15 headers.h
--- gnome-session/headers.h	16 May 2005 22:43:47 -0000	1.15
+++ gnome-session/headers.h	27 Mar 2006 03:41:15 -0000
@@ -166,13 +166,13 @@ extern gchar *session_name;
 
 /* Milliseconds to wait for clients to register before assuming that
  * they have finished any initialisation needed by other clients. */
-extern guint purge_delay;
+extern gint purge_delay;
 
 /* Milliseconds to wait for clients to die before cutting our throat. */
-extern guint suicide_delay;
+extern gint suicide_delay;
 
 /* Milliseconds to wait for clients to complete save before reporting error. */
-extern guint warn_delay;
+extern gint warn_delay;
 
 /* Prompting for save session on logout. If true, session will automatically
  * save, if false, user will be prompted to have option of saving session on
Index: gnome-session/main.c
===================================================================
RCS file: /cvs/gnome/gnome-session/gnome-session/main.c,v
retrieving revision 1.77
diff -u -p -r1.77 main.c
--- gnome-session/main.c	21 Mar 2006 17:37:40 -0000	1.77
+++ gnome-session/main.c	27 Mar 2006 03:41:16 -0000
@@ -68,23 +68,23 @@ gboolean save_selected = FALSE;
 gboolean failsafe = FALSE;
 
 /* Wait period for clients to register. */
-guint purge_delay = 120000;
+gint purge_delay = 120000;
 
 /* Wait period for clients to save. */
-guint warn_delay = 120000;
+gint warn_delay = 120000;
 
 /* Wait period for clients to die during shutdown. */
-guint suicide_delay = 10000;
+gint suicide_delay = 10000;
 
 gchar *session_name = NULL;
 
-static const struct poptOption options[] = {
-  {"choose-session", '\0', POPT_ARG_STRING, &session_name, 0, N_("Specify a session name to load"), NULL},
-  {"failsafe", '\0', POPT_ARG_NONE, &failsafe, 0, N_("Only read saved sessions from the default.session file"), NULL},
-  {"purge-delay", '\0', POPT_ARG_INT, &purge_delay, 0, N_("Millisecond period spent waiting for clients to register (0=forever)"), NULL},
-  {"warn-delay", '\0', POPT_ARG_INT, &warn_delay, 0, N_("Millisecond period spent waiting for clients to respond (0=forever)"), NULL},
-  {"suicide-delay", '\0', POPT_ARG_INT, &suicide_delay, 0, N_("Millisecond period spent waiting for clients to die (0=forever)"), NULL},
-  {NULL, '\0', 0, NULL, 0}
+static const GOptionEntry options[] = {
+  {"choose-session", '\0', 0, G_OPTION_ARG_STRING, &session_name, N_("Specify a session name to load"), N_("NAME")},
+  {"failsafe", '\0', 0, G_OPTION_ARG_NONE, &failsafe, N_("Only read saved sessions from the default.session file"), NULL},
+  {"purge-delay", '\0', 0, G_OPTION_ARG_INT, &purge_delay, N_("Millisecond period spent waiting for clients to register (0=forever)"), N_("DELAY")},
+  {"warn-delay", '\0', 0, G_OPTION_ARG_INT, &warn_delay, N_("Millisecond period spent waiting for clients to respond (0=forever)"), N_("DELAY")},
+  {"suicide-delay", '\0', 0, G_OPTION_ARG_INT, &suicide_delay, N_("Millisecond period spent waiting for clients to die (0=forever)"), N_("DELAY")},
+  {NULL}
 };
 
 /* A separate function to ease the impending #if hell.  */
@@ -334,6 +334,7 @@ main (int argc, char *argv[])
   char *display_str;
   char **versions;
   GConfClient *gconf_client;
+  GOptionContext *goption_context;
   
   if (getenv ("GSM_VERBOSE_DEBUG"))
     gsm_set_verbose (TRUE);
@@ -398,8 +399,11 @@ main (int argc, char *argv[])
   if (a_t_support)
     gsm_at_set_gtk_modules ();
 
+  goption_context = g_option_context_new(NULL);
+  g_option_context_add_main_entries(goption_context, options, GETTEXT_PACKAGE);
+
   gnome_program_init("gnome-session", VERSION, LIBGNOMEUI_MODULE, argc, argv, 
-		  GNOME_PARAM_POPT_TABLE, options,
+		  GNOME_PARAM_GOPTION_CONTEXT, goption_context,
 		  NULL);
 
  /* FIXME: it would be nice to skip this check if we're debugging the
Index: gnome-session/manager.c
===================================================================
RCS file: /cvs/gnome/gnome-session/gnome-session/manager.c,v
retrieving revision 1.81
diff -u -p -r1.81 manager.c
--- gnome-session/manager.c	15 Dec 2004 09:40:44 -0000	1.81
+++ gnome-session/manager.c	27 Mar 2006 03:41:16 -0000
@@ -668,7 +668,7 @@ start_client (Client* client)
   if (client->id || client->match_rule == MATCH_PROP)
     {
       APPEND (pending_list, client);
-      if (purge_delay)
+      if (purge_delay > 0)
 	{
 	  g_assert (client->purge_timeout_id == 0);
 	  client->purge_timeout_id = gtk_timeout_add (purge_delay, purge, client);
@@ -1274,7 +1274,7 @@ process_save_request (Client* client, in
       gint delay = client->handle ? warn_delay : purge_delay;
       save_state = SAVE_PHASE_1;
       save_state_changed ();
-      if (delay)
+      if (delay > 0)
 	{
 	  g_assert (warn_timeout_id == -1);
 	  warn_timeout_id = gtk_timeout_add (delay, no_response_warning, NULL);
@@ -1405,7 +1405,7 @@ update_save_state (void)
 	      gtk_timeout_remove (warn_timeout_id);
 	      warn_timeout_id = -1;
 	    }
-	  if (warn_delay)
+	  if (warn_delay > 0)
 	    {
 	      g_assert (warn_timeout_id == -1);
 	      warn_timeout_id = gtk_timeout_add (warn_delay, 
@@ -1462,7 +1462,7 @@ update_save_state (void)
 	  run_shutdown_commands (zombie_list);
 	  run_shutdown_commands (live_list);
 
-	  if (suicide_delay)
+	  if (suicide_delay > 0)
 	    {
 	      g_assert (warn_timeout_id == -1);
 	      warn_timeout_id = gtk_timeout_add (suicide_delay, 
Index: gnome-session/save-session.c
===================================================================
RCS file: /cvs/gnome/gnome-session/gnome-session/save-session.c,v
retrieving revision 1.25
diff -u -p -r1.25 save-session.c
--- gnome-session/save-session.c	19 May 2003 13:06:44 -0000	1.25
+++ gnome-session/save-session.c	27 Mar 2006 03:41:16 -0000
@@ -42,11 +42,11 @@ 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}
+static const GOptionEntry options[] = {
+  {"session-name", 's', 0, G_OPTION_ARG_STRING, &session_name, N_("Set the current session"), N_("NAME")},
+  {"kill", '\0', 0, G_OPTION_ARG_NONE, &zap, N_("Kill session"),     NULL},
+  {"gui",  '\0', 0, G_OPTION_ARG_NONE, &gui, N_("Use dialog boxes"), NULL},
+  {NULL}
 };
 
 static int exit_status = 0;
@@ -156,6 +156,7 @@ int
 main (int argc, char *argv[])
 {
   GnomeClient *client;
+  GOptionContext *goption_context;
 
   /* Initialize the i18n stuff */
   bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
@@ -165,9 +166,12 @@ main (int argc, char *argv[])
 
   IceAddConnectionWatch (ice_connection_watch, NULL);
 
+  goption_context = g_option_context_new(NULL);
+  g_option_context_add_main_entries(goption_context, options, GETTEXT_PACKAGE);
+
   gnome_program_init ("gnome-session-save", VERSION, LIBGNOMEUI_MODULE,
 		      argc, argv,
-		      GNOME_PARAM_POPT_TABLE, options,
+		      GNOME_PARAM_GOPTION_CONTEXT, goption_context,
 		      GNOME_PROGRAM_STANDARD_PROPERTIES,
 		      NULL);
 
Index: gnome-session/session-properties.c
===================================================================
RCS file: /cvs/gnome/gnome-session/gnome-session/session-properties.c,v
retrieving revision 1.44
diff -u -p -r1.44 session-properties.c
--- gnome-session/session-properties.c	24 Aug 2004 12:45:00 -0000	1.44
+++ gnome-session/session-properties.c	27 Mar 2006 03:41:16 -0000
@@ -98,13 +98,6 @@ create_table (void)
   return vbox;
 }
 
-static gboolean init_settings = FALSE;
-
-static const struct poptOption options[] = {
-  {"init-session-settings", '\0', POPT_ARG_NONE, &init_settings, 0, N_("Initialize session settings"), NULL},
-  {NULL, '\0', 0, NULL, 0}
-};
-
 GtkWidget *
 session_properties_create_page (DirtyCallbackFunc dcf)
 {
