From a674eab94dd55978a6fa8db1fbe57bf419377f43 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 10 Mar 2010 12:17:16 +0100 Subject: Update win32 directory relocation and some consistency cleanup --- widgets/misc/Makefile.am | 5 ++--- widgets/misc/e-map.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'widgets/misc') diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index eec4edf54b..daaf9717f2 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -83,7 +83,7 @@ libemiscwidgets_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/filter \ -I$(top_srcdir)/widgets \ - -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \ + -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DG_LOG_DOMAIN=__FILE__ \ $(EVOLUTION_MAIL_CFLAGS) \ @@ -175,8 +175,7 @@ test_widgets_misc_CPPFLAGS= \ -I$(top_srcdir) \ -I$(top_srcdir)/filter \ -I$(top_srcdir)/widgets \ - -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DG_LOG_DOMAIN=__FILE__ \ $(EVOLUTION_MAIL_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c index f59e33d5cd..ff13e41be8 100644 --- a/widgets/misc/e-map.c +++ b/widgets/misc/e-map.c @@ -198,7 +198,7 @@ static void e_map_init (EMap *view) { EMapPrivate *priv; - gchar *map_file_name = g_build_filename (EVOLUTION_IMAGES, "world_map-960.png", NULL); + gchar *map_file_name = g_build_filename (EVOLUTION_IMAGESDIR, "world_map-960.png", NULL); priv = g_new0 (EMapPrivate, 1); view->priv = priv; -- cgit