Commit e94d9526 authored by Vincent Untz's avatar Vincent Untz Committed by Vincent Untz

hide deprecated command-line options from --help, but still accept them.

2009-03-25  Vincent Untz  <vuntz@gnome.org>

	* tools/gnome-session-save.c: hide deprecated command-line options from
	--help, but still accept them.
	(main): return 0 instead of a variable that is always set to 0

svn path=/trunk/; revision=5364
parent 987bb630
2009-03-25 Vincent Untz <vuntz@gnome.org>
* tools/gnome-session-save.c: hide deprecated command-line options from
--help, but still accept them.
(main): return 0 instead of a variable that is always set to 0
2009-03-25 Vincent Untz <vuntz@gnome.org>
Create a END_SESSION_LAST phase during which we handle the clients
......
......@@ -62,19 +62,18 @@ static gboolean no_interaction = FALSE;
static char *session_name = NULL;
static GOptionEntry options[] = {
{"session-name", 's', 0, G_OPTION_ARG_STRING, &session_name, N_("Set the current session name"), N_("NAME")},
{"logout", '\0', 0, G_OPTION_ARG_NONE, &logout, N_("Log out"), NULL},
{"force-logout", '\0', 0, G_OPTION_ARG_NONE, &force_logout, N_("Log out, ignoring any existing inhibitors"), NULL},
{"logout-dialog", '\0', 0, G_OPTION_ARG_NONE, &logout_dialog, N_("Show logout dialog"), NULL},
{"shutdown-dialog", '\0', 0, G_OPTION_ARG_NONE, &shutdown_dialog, N_("Show shutdown dialog"), NULL},
{"kill", '\0', 0, G_OPTION_ARG_NONE, &kill_session, N_("Kill session"), NULL},
{"gui", '\0', 0, G_OPTION_ARG_NONE, &show_error_dialogs, N_("Use dialog boxes for errors"), NULL},
{"silent", '\0', 0, G_OPTION_ARG_NONE, &no_interaction, N_("Do not require confirmation"), NULL},
/* deprecated options */
{"session-name", 's', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &session_name, N_("Set the current session name"), N_("NAME")},
{"kill", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &kill_session, N_("Kill session"), NULL},
{"silent", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &no_interaction, N_("Do not require confirmation"), NULL},
{NULL}
};
static int exit_status = 0;
static void
display_error (const char *message)
{
......@@ -290,5 +289,5 @@ main (int argc, char *argv[])
do_shutdown_dialog ();
}
return exit_status;
return 0;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment