[krb5-auth-dialog] Make always_run the default



commit 6c81e8cbf5c9a59f4412fcd96668ec192e7311bd
Author: Guido Günther <agx sigxcpu org>
Date:   Thu Feb 24 18:28:51 2011 +0100

    Make always_run the default
    
    Debian Bug: #582497

 src/ka-dialog.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/src/ka-dialog.c b/src/ka-dialog.c
index ce86367..1e2ef81 100644
--- a/src/ka-dialog.c
+++ b/src/ka-dialog.c
@@ -1056,9 +1056,10 @@ main (int argc, char *argv[])
 	const char *help_msg = "Run '" PACKAGE " --help' to see a full list of available command line options";
 	const GOptionEntry options [] = {
 		{"auto", 'a', 0, G_OPTION_ARG_NONE, &run_auto,
-			"Only run if an initialized ccache is found (default)", NULL},
+			"Only run if an initialized ccache is found", NULL},
+		/* accepted for compatibility only */
 		{"always", 'A', 0, G_OPTION_ARG_NONE, &run_always,
-			"Always run", NULL},
+			"Always run (default)", NULL},
 		{ NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
 	};
 	GFileMonitor *monitor = NULL;
@@ -1085,10 +1086,7 @@ main (int argc, char *argv[])
 	if (!ka_dbus_connect (&status))
 		exit(status);
 
-	if (run_always && !run_auto) {
-		always_run = TRUE;
-	}
-
+	always_run = !run_auto;
 	if (using_krb5 () || always_run) {
 		g_set_application_name (KA_NAME);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]