From 7348cf1e4e3ef512d32007931c5fb144784db9e2 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Thu, 21 Nov 2013 23:41:17 +0100 Subject: reorder header file includes. Because glibmm depends on a deprecated/threads.h of glib, it has to be included first. (bzr r12830) --- src/main.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index c6427dc6f..9f5a95ffe 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -26,12 +26,13 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include "path-prefix.h" // This has to be included prior to anything that includes setjmp.h, it croaks otherwise #include -#include "ui/widget/panel.h" +#include "ui/widget/panel.h" // This has to be the first to include because of Glibmm's dependence on a deprecated feature... + +#include "path-prefix.h" #ifdef HAVE_IEEEFP_H #include -- cgit v1.2.3 From a13410f14b3bc2acafe48d07e4c53d16fd6be594 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Thu, 2 Jan 2014 09:29:29 +0100 Subject: Fix for Bug #950781 (There is no disk in drive error when opening Inkscape in Windows 7) by Max Gaukler. Fixed bugs: - https://launchpad.net/bugs/950781 (bzr r12866) --- src/main.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 9f5a95ffe..079944af6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -584,11 +584,14 @@ static void _win32_set_inkscape_env(gchar const *exe) } else { printf("python not found\n\n"); }*/ - + // INKSCAPE_LOCALEDIR is needed by Python/Gettext gchar *localepath = g_build_filename(exe, PACKAGE_LOCALE_DIR, NULL); g_setenv("INKSCAPE_LOCALEDIR", localepath, TRUE); - + + // prevent "please insert disk" messages. fixes bug #950781 + SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX); + g_free(python); g_free(scripts); g_free(perl); -- cgit v1.2.3