diff options
| author | Milan Crha <mcrha@redhat.com> | 2014-09-06 01:13:56 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2014-09-06 01:13:56 +0800 |
| commit | 1dc1cf0b81b4e7f16fdd8f27bd3971d6c4ab4606 (patch) | |
| tree | 9ca3a2bb4b70a35359d04d1382be197e998f30b6 /addressbook/tools/evolution-addressbook-export.c | |
| parent | f863aa6d6c6728f7c66d6531c971b09ad4f10932 (diff) | |
| download | gsoc2013-evolution-1dc1cf0b81b4e7f16fdd8f27bd3971d6c4ab4606.tar gsoc2013-evolution-1dc1cf0b81b4e7f16fdd8f27bd3971d6c4ab4606.tar.gz gsoc2013-evolution-1dc1cf0b81b4e7f16fdd8f27bd3971d6c4ab4606.tar.bz2 gsoc2013-evolution-1dc1cf0b81b4e7f16fdd8f27bd3971d6c4ab4606.tar.lz gsoc2013-evolution-1dc1cf0b81b4e7f16fdd8f27bd3971d6c4ab4606.tar.xz gsoc2013-evolution-1dc1cf0b81b4e7f16fdd8f27bd3971d6c4ab4606.tar.zst gsoc2013-evolution-1dc1cf0b81b4e7f16fdd8f27bd3971d6c4ab4606.zip | |
Miscellaneous Win32 related changes
* use e_util_win32_initialize() in main() to avoid code duplication
* e-spinner - correct image path build under win32
* export WIN32_SERVICELIBEXECDIR when building eds, which relies on it now
* update D-Bus patch and session-local.conf creation, thus D-Bus
can actually autostart services
Diffstat (limited to 'addressbook/tools/evolution-addressbook-export.c')
| -rw-r--r-- | addressbook/tools/evolution-addressbook-export.c | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/addressbook/tools/evolution-addressbook-export.c b/addressbook/tools/evolution-addressbook-export.c index 3d7510107f..8aa9e732cd 100644 --- a/addressbook/tools/evolution-addressbook-export.c +++ b/addressbook/tools/evolution-addressbook-export.c @@ -29,20 +29,15 @@ #include <libebook/libebook.h> +#include "e-util/e-util-private.h" + #include "evolution-addressbook-export.h" #ifdef G_OS_WIN32 #ifdef DATADIR #undef DATADIR #endif -#include <windows.h> -#include <conio.h> -#ifndef PROCESS_DEP_ENABLE -#define PROCESS_DEP_ENABLE 0x00000001 -#endif -#ifndef PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION -#define PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION 0x00000002 -#endif +#include <libedataserver/libedataserver.h> #endif /* Command-Line Options */ @@ -82,25 +77,7 @@ main (gint argc, gint IsVCard = FALSE; #ifdef G_OS_WIN32 - /* Reduce risks */ - { - typedef BOOL (WINAPI *t_SetDllDirectoryA) (LPCSTR lpPathName); - t_SetDllDirectoryA p_SetDllDirectoryA; - - p_SetDllDirectoryA = GetProcAddress (GetModuleHandle ("kernel32.dll"), "SetDllDirectoryA"); - if (p_SetDllDirectoryA) - (*p_SetDllDirectoryA) (""); - } -#ifndef _WIN64 - { - typedef BOOL (WINAPI *t_SetProcessDEPPolicy) (DWORD dwFlags); - t_SetProcessDEPPolicy p_SetProcessDEPPolicy; - - p_SetProcessDEPPolicy = GetProcAddress (GetModuleHandle ("kernel32.dll"), "SetProcessDEPPolicy"); - if (p_SetProcessDEPPolicy) - (*p_SetProcessDEPPolicy) (PROCESS_DEP_ENABLE | PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION); - } -#endif + e_util_win32_initialize (); #endif /*i18n-lize */ |