Remove some more unnecessary windows workarounds.

1 files changed, 1 insertions, 50 deletions

diff --git a/shell/main.c b/shell/main.c
index 4848ef92b8..ecb8e1b73d 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -349,51 +349,6 @@ static GOptionEntry entries[] = {
 	{ NULL }
 };
 
-#ifdef G_OS_WIN32
-static void
-set_paths (void)
-{
-	/* Set PATH to include the Evolution executable's folder
-	 * and the lib/evolution/$(BASE_VERSION)/components folder. */
-	wchar_t exe_filename[MAX_PATH];
-	wchar_t *p;
-	gchar *exe_folder_utf8;
-	gchar *components_folder_utf8;
-	gchar *top_folder_utf8;
-	gchar *path;
-
-	GetModuleFileNameW (NULL, exe_filename, G_N_ELEMENTS (exe_filename));
-
-	p = wcsrchr (exe_filename, L'\\');
-	g_assert (p != NULL);
-
-	*p = L'\0';
-	exe_folder_utf8 = g_utf16_to_utf8 (exe_filename, -1, NULL, NULL, NULL);
-
-	p = wcsrchr (exe_filename, L'\\');
-	g_assert (p != NULL);
-
-	*p = L'\0';
-	top_folder_utf8 = g_utf16_to_utf8 (exe_filename, -1, NULL, NULL, NULL);
-	components_folder_utf8 = g_strconcat (
-		top_folder_utf8, "/lib/evolution/"
-		BASE_VERSION "/components", NULL);
-
-	path = g_build_path (
-		";", exe_folder_utf8,
-		components_folder_utf8, 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);
-	g_free (exe_folder_utf8);
-	g_free (components_folder_utf8);
-
-	g_free (top_folder_utf8);
-}
-#endif
-
 static void G_GNUC_NORETURN
 shell_force_shutdown (void)
 {
@@ -486,7 +441,7 @@ main (gint argc, gchar **argv)
 			(AttachConsole_t) GetProcAddress (
 			GetModuleHandle ("kernel32.dll"), "AttachConsole");
 
-		if (p_AttachConsole != NULL && p_AttachConsole (ATTACH_PARENT_PROCESS)) {
+		if (p_AttachConsole && p_AttachConsole (ATTACH_PARENT_PROCESS)) {
 			freopen ("CONOUT$", "w", stdout);
 			dup2 (fileno (stdout), 1);
 			freopen ("CONOUT$", "w", stderr);
@@ -502,10 +457,6 @@ main (gint argc, gchar **argv)
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-#ifdef G_OS_WIN32
-	set_paths ();
-#endif
-
 	gtk_init_with_args (
 		&argc, &argv,
 		_("- The Evolution PIM and Email Client"),