[evolution/gnome-2-30] [win32] Don't call glib functions before g_thread_init was called and register evolution as capable

[Fridrich Strba <strba src gnome org>]

commit ba5a33b6f19d2cdb747757408b08c5ae4ade3d86
Author: Fridrich Å trba <fridrich strba bluewin ch>
Date:   Mon May 17 09:07:50 2010 +0200

    [win32] Don't call glib functions before g_thread_init was called and
    register evolution as capable to handle mailto: protocol on startup

 shell/main.c |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/shell/main.c b/shell/main.c
index 3ab0e9a..b3fdc7a 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -60,6 +60,9 @@
 #include "e-util/e-profile-event.h"
 #include "e-util/e-util-private.h"
 #include "e-util/e-util.h"
+#ifdef G_OS_WIN32
+#include "e-util/e-win32-defaults.h"
+#endif
 
 #include <fcntl.h>
 #include <signal.h>
@@ -453,13 +456,6 @@ main (gint argc, gchar **argv)
 			dup2 (fileno (stderr), 2);
 		}
 	}
-	
-	path = g_build_path (";", _e_get_bindir (), g_getenv ("PATH"), NULL);
-
-	if (!g_setenv ("PATH", path, TRUE))
-		g_warning ("Could not set PATH for Evolution and its child processes");
-
-	g_free (path);	
 #endif
 
 	/* Make ElectricFence work.  */
@@ -485,6 +481,15 @@ main (gint argc, gchar **argv)
 	dbus_g_thread_init ();
 
 #ifdef G_OS_WIN32
+	path = g_build_path (";", _e_get_bindir (), g_getenv ("PATH"), NULL);
+
+	if (!g_setenv ("PATH", path, TRUE))
+		g_warning ("Could not set PATH for Evolution and its child processes");
+
+	g_free (path);
+	
+	_e_win32_register_mailer ();
+	
 	if (strcmp (gettext (""), "") == 0) {
 		/* No message catalog installed for the current locale
 		 * language, so don't bother with the localisations