diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-08-10 18:06:41 +0800 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-08-10 18:06:41 +0800 |
| commit | c03e685846f21347e5a0e9943870e99162b0bae8 (patch) | |
| tree | e91c0f0af1a19949c41413d4ab892a0947cb4808 /shell/e-shell-window.c | |
| parent | ac6b7634779ef3aa145b3e5da6b726ccaf288b00 (diff) | |
| download | gsoc2013-evolution-c03e685846f21347e5a0e9943870e99162b0bae8.tar.gz gsoc2013-evolution-c03e685846f21347e5a0e9943870e99162b0bae8.tar.zst gsoc2013-evolution-c03e685846f21347e5a0e9943870e99162b0bae8.zip | |
Use privsolib instead of privlib. Link with SHELL_LIBS. Use NO_UNDEFINED.
2005-08-10 Tor Lillqvist <tml@novell.com>
* Makefile.am: Use privsolib instead of privlib. Link with
SHELL_LIBS. Use NO_UNDEFINED. Use EXEEXT. Use hack to workaround
MSYS feature on Win32 when installing the schemas.
(INCLUDES): Define EVOLUTION_IMAGESDIR like in
../e-util/e-util-private.h, not EVOLUTION_IMAGES.
(idl_defines): Pass marker macro to IDL compiler, see below.
* Evolution-Component.idl: Don't generate duplicate code in skels
and stubs when including this file from other idl files (in
particular, ../mail/Evolution-Mail.idl). Use the include_defs and
inhibit pragmas unless IDL-compiling in this directory. See
lists.ximian.com/pipermail/evolution-patches/2005-June/010899.html
* e-shell-utils.c
* e-shell-windows.c: Ue EVOLUTION_IMAGESDIR in such a way that it
works even when it is a function call.
svn path=/trunk/; revision=30075
Diffstat (limited to 'shell/e-shell-window.c')
| -rw-r--r-- | shell/e-shell-window.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index cc05844668..cbb3bfc175 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -28,6 +28,8 @@ #include "Evolution.h" +#include "e-util/e-util-private.h" + #include "e-component-registry.h" #include "e-shell-window-commands.h" #include "e-shell-marshal.h" @@ -464,22 +466,27 @@ static void load_icons (void) { GdkPixbuf *pixbuf; + char *png_file_name; - pixbuf = gdk_pixbuf_new_from_file (EVOLUTION_IMAGES "/offline.png", NULL); + png_file_name = g_build_filename (EVOLUTION_IMAGESDIR, "offline.png", NULL); + pixbuf = gdk_pixbuf_new_from_file (png_file_name, NULL); if (pixbuf == NULL) { - g_warning ("Cannot load `%s'", EVOLUTION_IMAGES "/offline.png"); + g_warning ("Cannot load `%s'", png_file_name); } else { gdk_pixbuf_render_pixmap_and_mask (pixbuf, &offline_pixmap, &offline_mask, 128); g_object_unref (pixbuf); } + g_free (png_file_name); - pixbuf = gdk_pixbuf_new_from_file (EVOLUTION_IMAGES "/online.png", NULL); + png_file_name = g_build_filename (EVOLUTION_IMAGESDIR, "online.png", NULL); + pixbuf = gdk_pixbuf_new_from_file (png_file_name, NULL); if (pixbuf == NULL) { - g_warning ("Cannot load `%s'", EVOLUTION_IMAGES "/online.png"); + g_warning ("Cannot load `%s'", png_file_name); } else { gdk_pixbuf_render_pixmap_and_mask (pixbuf, &online_pixmap, &online_mask, 128); g_object_unref (pixbuf); } + g_free (png_file_name); } static void |