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 /e-util/e-spinner.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 'e-util/e-spinner.c')
| -rw-r--r-- | e-util/e-spinner.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/e-util/e-spinner.c b/e-util/e-spinner.c index cb4303c467..032280319c 100644 --- a/e-util/e-spinner.c +++ b/e-util/e-spinner.c @@ -22,6 +22,8 @@ #include <gtk/gtk.h> +#include "e-util/e-util-private.h" + #include "e-spinner.h" #define MAIN_IMAGE_FILENAME "working.png" @@ -112,7 +114,15 @@ e_spinner_constructed (GObject *object) spinner = E_SPINNER (object); +#ifdef G_OS_WIN32 + { + gchar *filename = g_strconcat (EVOLUTION_IMAGESDIR, G_DIR_SEPARATOR_S, MAIN_IMAGE_FILENAME, NULL); + main_pixbuf = gdk_pixbuf_new_from_file (filename, &error); + g_free (filename); + } +#else main_pixbuf = gdk_pixbuf_new_from_file (EVOLUTION_IMAGESDIR G_DIR_SEPARATOR_S MAIN_IMAGE_FILENAME, &error); +#endif if (!main_pixbuf) { g_warning ("%s: Failed to load image: %s", error ? error->message : "Unknown error", G_STRFUNC); g_clear_error (&error); |