[evolution/gnome-2-30] [win32] Try to get the default application registration right

[Fridrich Strba <strba src gnome org>]

commit 38711248e319902e7396e41e1c64c732b1645bec
Author: Fridrich Å trba <fridrich strba bluewin ch>
Date:   Wed May 19 10:20:36 2010 +0200

    [win32] Try to get the default application registration right

 e-util/e-win32-defaults.c |    3 ++-
 shell/main.c              |    6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/e-util/e-win32-defaults.c b/e-util/e-win32-defaults.c
index be494bf..8fb2bc3 100644
--- a/e-util/e-win32-defaults.c
+++ b/e-util/e-win32-defaults.c
@@ -146,6 +146,7 @@ _e_win32_register_mailer_impl (WINBOOL system)
 	if ((returnValue = RegCreateKeyExA (reg_key, "shell\\open\\command", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &reg_subkey, &dwDisposition)))
 		goto cleanup;
 
+	openCommand = g_strconcat("\"", evolutionBinary, "\" --component=mail", NULL);
 	if ((returnValue = RegSetValueExA (reg_subkey, NULL, 0, REG_SZ, (const BYTE *)openCommand, strlen (openCommand) + 1)))
 		goto cleanup;
 	
@@ -201,7 +202,7 @@ cleanup:
 	g_free (openCommand);
 	g_free (reinstallCommand);
 	g_free (showIconsCommand);
-	g_free (showIconsCommand);
+	g_free (hideIconsCommand);
 }
 
 void
diff --git a/shell/main.c b/shell/main.c
index 0ee9478..41ca79e 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -327,11 +327,11 @@ setup_segv_redirect (void)
 
 static GOptionEntry entries[] = {
 #ifdef G_OS_WIN32
-	{ "--reinstall", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &reinstall,
+	{ "reinstall", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &reinstall,
 	  NULL, NULL },
-	{ "--show-icons", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &show_icons,
+	{ "show-icons", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &show_icons,
 	  NULL, NULL },
-	{ "--hide-icons", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &hide_icons,
+	{ "hide-icons", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &hide_icons,
 	  NULL, NULL },
 #endif /* G_OS_WIN32 */
 	{ "component", 'c', 0, G_OPTION_ARG_STRING, &requested_view,