X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fmain.c;h=214e9c0e2ea77625e246411488cc946adac31d5e;hb=cc3f21efc8104182171c9300facc16d9a79177ef;hp=43fca484baf5d36662f17850ff28bc732fbeb924;hpb=2fc3dcecc52241f84e007306f04f7329870ebf70;p=evince.git

diff --git a/shell/main.c b/shell/main.c
index 43fca484..214e9c0e 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -37,10 +37,23 @@
 #include "ev-init.h"
 #include "ev-file-helpers.h"
 #include "ev-stock-icons.h"
+
+#ifdef WITH_SMCLIENT
 #include "eggsmclient.h"
-#ifndef G_OS_WIN32
+#ifdef GDK_WINDOWING_X11
 #include "eggdesktopfile.h"
 #endif
+#endif /* WITH_SMCLIENT */
+
+#ifdef G_OS_WIN32
+#ifdef DATADIR
+#undef DATADIR
+#endif
+#include <io.h>
+#include <conio.h>
+#define _WIN32_WINNT 0x0500
+#include <windows.h>
+#endif
 
 static gchar   *ev_page_label;
 static gchar   *ev_find_string;
@@ -384,6 +397,31 @@ main (int argc, char *argv[])
 	GHashTable *args;
 	GError *error = NULL;
 
+#ifdef G_OS_WIN32
+
+    if (fileno (stdout) != -1 &&
+ 	  _get_osfhandle (fileno (stdout)) != -1)
+	{
+	  /* stdout is fine, presumably redirected to a file or pipe */
+	}
+    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
+
 	/* Init glib threads asap */
 	if (!g_thread_supported ())
 		g_thread_init (NULL);
@@ -398,8 +436,11 @@ main (int argc, char *argv[])
 	context = g_option_context_new (N_("GNOME Document Viewer"));
 	g_option_context_set_translation_domain(context, GETTEXT_PACKAGE);
 	g_option_context_add_main_entries (context, goption_options, GETTEXT_PACKAGE);
-	
+
+#ifdef WITH_SMCLIENT
 	g_option_context_add_group (context, egg_sm_client_get_option_group ());
+#endif
+
 	g_option_context_add_group (context, gtk_get_option_group (TRUE));
 
 	if (!g_option_context_parse (context, &argc, &argv, &error)) {
@@ -436,13 +477,13 @@ main (int argc, char *argv[])
 
 	ev_stock_icons_init ();
 
-#ifdef G_OS_WIN32
-	/* Manually set name and icon in win32 */
-	g_set_application_name (_("Evince"));
-	gtk_window_set_default_icon_name ("evince");
-#else
+#if defined(WITH_SMCLIENT) && defined(GDK_WINDOWING_X11)
 	egg_set_desktop_file (GNOMEDATADIR "/applications/evince.desktop");
-#endif /* G_OS_WIN32 */
+#else
+	/* Manually set name and icon */
+	g_set_application_name (_("Document Viewer"));
+	gtk_window_set_default_icon_name ("evince");
+#endif /* WITH_SMCLIENT && GDK_WINDOWING_X11 */
 
 	ev_application_load_session (EV_APP);
 	load_files (file_arguments, args);