aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--my-evolution/ChangeLog16
-rw-r--r--my-evolution/Makefile.am41
-rw-r--r--my-evolution/e-summary-factory.c3
-rw-r--r--my-evolution/e-summary-weather.c4
-rw-r--r--my-evolution/e-summary.c6
5 files changed, 44 insertions, 26 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index 606b84b702..81d9681dbf 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,19 @@
+2003-01-22 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-summary-factory.c (control_activate): Get my-evolution.xml
+ from EVOLUTION_UI_DIRECTORY.
+
+ * e-summary.c (e_pixmap_file): Use EVOLUTION_IMAGEDIR.
+ (e_pixmap_file): Use EVOLUTION_BUTTONSDIR.
+
+ * e-summary-weather.c (e_summary_weather_init_locations): Use
+ LOCATIONDIR.
+ (e_summary_weather_fill_etable): Likewise.
+
+ * Makefile.am (Locationdir): Version using $(BASE_VERSION).
+ (gladedir): Likewise.
+ (INCLUDES): Define EVOLUTION_IMAGEDIR.
+
2003-01-20 Ettore Perazzoli <ettore@ximian.com>
* Locations: Updated locations for EU_FI, contributed by Pekka
diff --git a/my-evolution/Makefile.am b/my-evolution/Makefile.am
index 9d05e2503d..b33d0adc94 100644
--- a/my-evolution/Makefile.am
+++ b/my-evolution/Makefile.am
@@ -1,19 +1,23 @@
-INCLUDES = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/shell \
- -I$(top_builddir)/shell \
- -I$(top_srcdir)/calendar \
- -I$(top_builddir)/calendar/cal-client \
- -I$(top_srcdir)/libical/src/libical \
- -I$(top_builddir)/libical/src/libical \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
- -DPREFIX=\"$(prefix)\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DLIBDIR=\""$(datadir)"\" \
- -DG_LOG_DOMAIN=\"evolution-executive-summary\" \
+INCLUDES = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/shell \
+ -I$(top_builddir)/shell \
+ -I$(top_srcdir)/calendar \
+ -I$(top_builddir)/calendar/cal-client \
+ -I$(top_srcdir)/libical/src/libical \
+ -I$(top_builddir)/libical/src/libical \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
+ -DEVOLUTION_DATADIR=\""$(datadir)"\" \
+ -DEVOLUTION_IMAGEDIR=\""$(datadir)/evolution-$(BASE_VERSION)/images"\" \
+ -DEVOLUTION_BUTTONSDIR=\""$(datadir)/evolution-$(BASE_VERSION)/images/buttons"\" \
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
+ -DLOCATIONDIR=\""$(Locationdir)"\" \
+ -DPREFIX=\"$(prefix)\" \
+ -DSYSCONFDIR=\""$(sysconfdir)"\" \
+ -DDATADIR=\""$(datadir)"\" \
+ -DLIBDIR=\""$(datadir)"\" \
+ -DG_LOG_DOMAIN=\"evolution-executive-summary\" \
$(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS)
IDLS = \
@@ -80,10 +84,9 @@ libevolution_executive_summary_la_SOURCES = $(summary_sources)
libevolution_executive_summary_la_LIBADD = $(summary_libs)
libevolution_executive_summary_la_LDFLAGS = -module -avoid-version
-Locationdir = $(datadir)/evolution
+Locationdir = $(datadir)/evolution-$(BASE_VERSION)
Location_DATA = Locations
-
# .server files
server_in_files = GNOME_Evolution_Summary.server.in.in
@@ -98,7 +101,7 @@ $(server_in_files:.server.in.in=.server.in): $(server_in_files)
# Glade
-gladedir = $(datadir)/evolution/glade
+gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
glade_DATA = my-evolution.glade
# GConf schemas
diff --git a/my-evolution/e-summary-factory.c b/my-evolution/e-summary-factory.c
index 9d9fe3c78f..01f6186ffd 100644
--- a/my-evolution/e-summary-factory.c
+++ b/my-evolution/e-summary-factory.c
@@ -64,7 +64,8 @@ control_activate (BonoboControl *control,
bonobo_ui_component_add_verb_list_with_data (ui_component, verbs, summary);
bonobo_ui_component_freeze (ui_component, NULL);
- bonobo_ui_util_set_ui (ui_component, EVOLUTION_DATADIR, "my-evolution.xml", "my-evolution", NULL);
+ bonobo_ui_util_set_ui (ui_component, EVOLUTION_DATADIR,
+ EVOLUTION_UIDIR "/my-evolution.xml", "my-evolution", NULL);
e_pixmaps_update (ui_component, pixmaps);
bonobo_ui_component_thaw (ui_component, NULL);
diff --git a/my-evolution/e-summary-weather.c b/my-evolution/e-summary-weather.c
index 4628d3edbc..3bafa212e9 100644
--- a/my-evolution/e-summary-weather.c
+++ b/my-evolution/e-summary-weather.c
@@ -377,7 +377,7 @@ e_summary_weather_init_locations (void)
}
locations_hash = g_hash_table_new (g_str_hash, g_str_equal);
- path = g_strdup (EVOLUTION_DATADIR "/evolution/Locations");
+ path = g_strdup (LOCATIONDIR);
key = g_strdup_printf ("=%s=/", path);
g_free (path);
@@ -659,7 +659,7 @@ e_summary_weather_fill_etable (ESummaryShown *ess)
int nregions, iregions;
char **regions;
- path = g_strdup (EVOLUTION_DATADIR "/evolution/Locations");
+ path = g_strdup (LOCATIONDIR);
key = g_strdup_printf ("=%s=/", path);
g_free (path);
diff --git a/my-evolution/e-summary.c b/my-evolution/e-summary.c
index 4e37b5eef2..414e94d73a 100644
--- a/my-evolution/e-summary.c
+++ b/my-evolution/e-summary.c
@@ -290,8 +290,7 @@ e_pixmap_file (const char *filename)
}
/* Try the evolution images dir */
- edir = g_concat_dir_and_file (EVOLUTION_DATADIR "/evolution/images",
- filename);
+ edir = g_concat_dir_and_file (EVOLUTION_IMAGEDIR, filename);
if (g_file_exists (edir)) {
ret = g_strdup (edir);
@@ -302,8 +301,7 @@ e_pixmap_file (const char *filename)
g_free (edir);
/* Try the evolution button images dir */
- edir = g_concat_dir_and_file (EVOLUTION_DATADIR "/evolution/images/buttons",
- filename);
+ edir = g_concat_dir_and_file (EVOLUTION_BUTTONSDIR, filename);
if (g_file_exists (edir)) {
ret = g_strdup (edir);