From 1ce2b96680125ec034d68ac620ded2380ed95d86 Mon Sep 17 00:00:00 2001
From: Christian Dywan <christian@twotoasts.de>
Date: Wed, 29 Aug 2012 23:52:50 +0200
Subject: [PATCH] Move Win32 stdout work-around to the top
Otherwise Midori.Paths debugging won't be visible.
---
midori/midori-app.c | 46 ++++++++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/midori/midori-app.c b/midori/midori-app.c
index 8431a9b7..bd6590fa 100644
--- a/midori/midori-app.c
+++ b/midori/midori-app.c
@@ -1383,6 +1383,29 @@ midori_app_setup (gint *argc,
{ STOCK_FOLDER_NEW, N_("New _Folder") },
};
+ /* Print messages to stdout on Win32 console, cf. AbiWord
+ * http://svn.abisource.com/abiword/trunk/src/wp/main/win/Win32Main.cpp */
+ #ifdef _WIN32
+ if (fileno (stdout) != -1
+ && _get_osfhandle (fileno (stdout)) != -1)
+ {
+ /* stdout is already being redirected to a file */
+ }
+ else
+ {
+ typedef BOOL (WINAPI *AttachConsole_t) (DWORD);
+ AttachConsole_t p_AttachConsole =
+ (AttachConsole_t) GetProcAddress (GetModuleHandle ("kernel32.dll"), "AttachConsole");
+ if (p_AttachConsole != NULL && p_AttachConsole (ATTACH_PARENT_PROCESS))
+ {
+ freopen ("CONOUT$", "w", stdout);
+ dup2 (fileno (stdout), 1);
+ freopen ("CONOUT$", "w", stderr);
+ dup2 (fileno (stderr), 2);
+ }
+ }
+ #endif
+
/* libSoup uses threads, therefore if WebKit is built with libSoup
* or Midori is using it, we need to initialize threads. */
#if !GLIB_CHECK_VERSION (2, 32, 0)
@@ -1430,29 +1453,6 @@ midori_app_setup (gint *argc,
gtk_icon_factory_add_default (factory);
g_object_unref (factory);
- /* Print messages to stdout on Win32 console, cf. AbiWord
- * http://svn.abisource.com/abiword/trunk/src/wp/main/win/Win32Main.cpp */
- #ifdef _WIN32
- if (fileno (stdout) != -1
- && _get_osfhandle (fileno (stdout)) != -1)
- {
- /* stdout is already being redirected to a file */
- }
- else
- {
- typedef BOOL (WINAPI *AttachConsole_t) (DWORD);
- AttachConsole_t p_AttachConsole =
- (AttachConsole_t) GetProcAddress (GetModuleHandle ("kernel32.dll"), "AttachConsole");
- if (p_AttachConsole != NULL && p_AttachConsole (ATTACH_PARENT_PROCESS))
- {
- freopen ("CONOUT$", "w", stdout);
- dup2 (fileno (stdout), 1);
- freopen ("CONOUT$", "w", stderr);
- dup2 (fileno (stderr), 2);
- }
- }
- #endif
-
return success;
}
--
2.39.5