aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2005-12-18 17:47:33 +0800
committerTor Lillqvist <tml@src.gnome.org>2005-12-18 17:47:33 +0800
commit534410e7cdccc371ecb52160a301a83de70379ce (patch)
tree115946860f668cea304fa59a976dfc86e8e34205 /widgets
parent0ff898adb4dd311f7b1c34ece1b4717ea3d513eb (diff)
downloadgsoc2013-evolution-534410e7cdccc371ecb52160a301a83de70379ce.tar.gz
gsoc2013-evolution-534410e7cdccc371ecb52160a301a83de70379ce.tar.zst
gsoc2013-evolution-534410e7cdccc371ecb52160a301a83de70379ce.zip
Construct map file name at run-time.
2005-12-18 Tor Lillqvist <tml@novell.com> * e-map.c: Construct map file name at run-time. svn path=/trunk/; revision=30865
Diffstat (limited to 'widgets')
-rw-r--r--widgets/misc/ChangeLog2
-rw-r--r--widgets/misc/e-map.c6
2 files changed, 7 insertions, 1 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 98eb6178d0..df27004111 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -9,6 +9,8 @@
* e-attachment.c: Use gstdio wrappers. Construct glade file name
at run-time.
+ * e-map.c: Construct map file name at run-time.
+
2005-12-15 Srinivasa Ragavan <sragavan@novell.com>
* e-filter-bar.c: (rule_advanced_response), (option_changed),
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index f2a28f0dda..0d73ed3493 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -29,6 +29,8 @@
#include <libart_lgpl/art_filterlevel.h>
#include <libgnome/gnome-i18n.h>
+#include "e-util/e-util-private.h"
+
#include "e-map.h"
/* Scroll step increment */
@@ -203,11 +205,13 @@ static void
e_map_init (EMap *view)
{
EMapPrivate *priv;
+ char *map_file_name = g_build_filename (EVOLUTION_IMAGES, "world_map-960.png", NULL);
priv = g_new0 (EMapPrivate, 1);
view->priv = priv;
- load_map_background (view, MAP_DIR"/world_map-960.png");
+ load_map_background (view, map_file_name);
+ g_free (map_file_name);
priv->frozen = FALSE;
priv->smooth_zoom = TRUE;
priv->zoom_state = E_MAP_ZOOMED_OUT;