diff options
| author | Milan Crha <mcrha@redhat.com> | 2014-07-11 03:01:42 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2014-07-11 03:01:42 +0800 |
| commit | fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231 (patch) | |
| tree | f315f05c15fd4973a30f8dff1a29477ac8c2f803 /shell | |
| parent | 1690e6760f23f95f245d4acde8c768ccdedfc3b8 (diff) | |
| download | gsoc2013-evolution-fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231.tar gsoc2013-evolution-fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231.tar.gz gsoc2013-evolution-fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231.tar.bz2 gsoc2013-evolution-fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231.tar.lz gsoc2013-evolution-fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231.tar.xz gsoc2013-evolution-fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231.tar.zst gsoc2013-evolution-fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231.zip | |
Bug 722068 - Make Evolution build under Win32
This also makes gnome-desktop an optional dependency, which can
be avoided with --disable-gnome-desktop configure option.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/e-shell-window-private.c | 2 | ||||
| -rw-r--r-- | shell/main.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c index 67612063e6..7a84b2e118 100644 --- a/shell/e-shell-window-private.c +++ b/shell/e-shell-window-private.c @@ -260,9 +260,9 @@ e_shell_window_private_constructed (EShellWindow *shell_window) GtkWindow *window; guint merge_id; const gchar *id; + GSettings *settings; #ifndef G_OS_WIN32 - GSettings *settings; GtkActionGroup *action_group; #endif diff --git a/shell/main.c b/shell/main.c index 3125cd55b2..62d24561f3 100644 --- a/shell/main.c +++ b/shell/main.c @@ -38,7 +38,9 @@ #ifdef DATADIR #undef DATADIR #endif +#ifndef _WIN32_WINNT #define _WIN32_WINNT 0x0601 +#endif #include <windows.h> #include <conio.h> #include <io.h> @@ -48,6 +50,9 @@ #ifndef PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION #define PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION 0x00000002 #endif + +#include "e-util/e-util-private.h" + #endif #include <libxml/xmlmemory.h> |