goodwolf: Changed some switches to be more intuitive

1 files changed, 15 insertions, 14 deletions

diff --git a/goodwolf.c b/goodwolf.c
index 6563e6e..7767aae 100644
--- a/goodwolf.c
+++ b/goodwolf.c
@@ -1186,7 +1186,7 @@ Options:\n\
     -h         Prints this help message\n\
 \n\
   Visual changes:\n\
-    -s DD      Specifies a custom favicon size, where DD is a two digit number\n\
+    -fs DD     Specifies a custom favicon size, where DD is a two digit number\n\
     -cl        Enables tab context label (text that identifies every tab)\n\
     -nl        Disables tab label (page title)\n\
     -c         You won't be able to add or remove any tabs, other than those specified\n\
@@ -1197,10 +1197,11 @@ Options:\n\
     -t         Adds a tray icon. Clicking it toggles visibility of the browser window.\n\
 \n\
   Rendering engine changes:\n\
-    -u         All tabs will use an alternative UserAgent\n\
-    -p         Enables persistent storage, meaning non-session cookies will be stored on drive\n\
-    -g         Enables separated storage, meaning cookie storage will be separated between tabs by\n\
-               their context label. Doesn't do anything if the -p option isn't selected.\n");
+    -ua        All tabs will use an alternative UserAgent\n\
+    -ps        Enables persistent storage, meaning non-session cookies will be stored on drive\n\
+    -st        Enables separated storage, meaning cookie storage will be separated between tabs by\n\
+               their context label.\n\
+               Doesn't do anything if the -sp option isn't selected.\n");
 		return 0;
 	}
 
@@ -1311,23 +1312,23 @@ Options:\n\
 	g_signal_connect(window->notebook, "switch-page", G_CALLBACK(notebookCb_switch__page), window);
 
 	while (argc > 1 && argv[1][0] == '-') {
-		if (argv[1][1] == 'n' && argv[1][2] == 'l')
-			tabs_no_label = TRUE;
-		else if (argv[1][1] == 'c' && argv[1][2] == 'l')
+		if (argv[1][1] == 'c' && argv[1][2] == 'l')
 			tabs_context_label = TRUE;
+		else if (argv[1][1] == 'n' && argv[1][2] == 'l')
+			tabs_no_label = TRUE;
 		else if (argv[1][1] == 'c')
 			tabs_constant = TRUE;
+		else if (argv[1][1] == 'j')
+			enabled_javascript = TRUE;
 		else if (argv[1][1] == 't')
 			tray_enabled = TRUE;
-		else if (argv[1][1] == 'u')
+		else if (argv[1][1] == 'u' && argv[1][2] == 'a')
 			alt_useragent = TRUE;
-		else if (argv[1][1] == 'p')
+		else if (argv[1][1] == 'p' && argv[1][2] == 's')
 			persistent_storage = TRUE;
-		else if (argv[1][1] == 'g')
+		else if (argv[1][1] == 's' && argv[1][2] == 't')
 			separated_storage = TRUE;
-		else if (argv[1][1] == 'j')
-			enabled_javascript = TRUE;
-		else if (argv[1][1] == 's') {
+		else if (argv[1][1] == 'f' && argv[1][2] == 's') {
 			argv++;
 			argc--;
 			custom_favicon_size = (argv[1][0] - '0') * 10 + argv[1][1] - '0';