From c03e685846f21347e5a0e9943870e99162b0bae8 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 10 Aug 2005 10:06:41 +0000 Subject: Use privsolib instead of privlib. Link with SHELL_LIBS. Use NO_UNDEFINED. 2005-08-10 Tor Lillqvist * 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 --- shell/e-shell-utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'shell/e-shell-utils.c') diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c index 195b25b986..b5a8b9b25c 100644 --- a/shell/e-shell-utils.c +++ b/shell/e-shell-utils.c @@ -31,6 +31,8 @@ #include #include +#include "e-util/e-util-private.h" + #include "e-shell-constants.h" #include "e-shell-utils.h" @@ -43,7 +45,7 @@ get_icon_path (const char *icon_name) if (g_path_is_absolute (icon_name)) icon_path = g_strdup (icon_name); else - icon_path = g_build_filename (EVOLUTION_IMAGES, icon_name, NULL); + icon_path = g_build_filename (EVOLUTION_IMAGESDIR, icon_name, NULL); if (g_file_test (icon_path, G_FILE_TEST_EXISTS)) { return icon_path; -- cgit v1.2.3