aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/contact-editor/Makefile.am10
-rw-r--r--addressbook/contact-editor/e-contact-editor.c2
-rw-r--r--addressbook/gui/contact-editor/Makefile.am10
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.c2
5 files changed, 24 insertions, 6 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 7003c407e7..181596a674 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-12 Christopher James Lahey <clahey@helixcode.com>
+
+ * contact-editor/Makefile.am: Added installation of arrow.png.
+
+ * contact-editor/e-contact-editor.c: Use EVOLUTIONDIR #define.
+
2000-07-11 Christopher James Lahey <clahey@helixcode.com>
* gui/component/addressbook.c: Removed an unused function
diff --git a/addressbook/contact-editor/Makefile.am b/addressbook/contact-editor/Makefile.am
index d7729421b1..b487f96fe2 100644
--- a/addressbook/contact-editor/Makefile.am
+++ b/addressbook/contact-editor/Makefile.am
@@ -1,6 +1,7 @@
CPPFLAGS = \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DDATADIR=\""$(datadir)"\"
+ -DDATADIR=\""$(datadir)"\" \
+ -DEVOLUTIONDIR=\""$(evolutiondir)"\"
INCLUDES = \
$(BONOBO_GNOME_CFLAGS) \
@@ -43,6 +44,10 @@ contact_editor_test_LDADD = \
$(top_builddir)/widgets/e-text/libetext.a \
$(EXTRA_GNOME_LIBS)
+evolutiondir = $(datadir)/evolution
+
+evolution_DATA = arrow.png
+
gladedir = $(datadir)/evolution/glade
glade_DATA = \
@@ -50,7 +55,8 @@ glade_DATA = \
fullname.glade \
categories.glade
-EXTRA_DIST = $(glade_DATA) \
+EXTRA_DIST = $(evolution_DATA) \
+ $(glade_DATA) \
e-contact-editor-strings.h \
fullname-strings.h \
categories-strings.h
diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c
index 6c28351c32..c3f6b00cd0 100644
--- a/addressbook/contact-editor/e-contact-editor.c
+++ b/addressbook/contact-editor/e-contact-editor.c
@@ -153,7 +153,7 @@ _replace_button(EContactEditor *editor, gchar *button_xml, gchar *image, GtkSign
GtkWidget *pixmap;
gchar *image_temp;
if (button && GTK_IS_BUTTON(button)) {
- image_temp = g_strdup_printf("%s%s", DATADIR "/evolution/", image);
+ image_temp = g_strdup_printf("%s/%s", EVOLUTIONDIR, image);
pixmap = e_create_image_widget(NULL, image_temp, NULL, 0, 0);
gtk_container_add(GTK_CONTAINER(button),
pixmap);
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index d7729421b1..b487f96fe2 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -1,6 +1,7 @@
CPPFLAGS = \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DDATADIR=\""$(datadir)"\"
+ -DDATADIR=\""$(datadir)"\" \
+ -DEVOLUTIONDIR=\""$(evolutiondir)"\"
INCLUDES = \
$(BONOBO_GNOME_CFLAGS) \
@@ -43,6 +44,10 @@ contact_editor_test_LDADD = \
$(top_builddir)/widgets/e-text/libetext.a \
$(EXTRA_GNOME_LIBS)
+evolutiondir = $(datadir)/evolution
+
+evolution_DATA = arrow.png
+
gladedir = $(datadir)/evolution/glade
glade_DATA = \
@@ -50,7 +55,8 @@ glade_DATA = \
fullname.glade \
categories.glade
-EXTRA_DIST = $(glade_DATA) \
+EXTRA_DIST = $(evolution_DATA) \
+ $(glade_DATA) \
e-contact-editor-strings.h \
fullname-strings.h \
categories-strings.h
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 6c28351c32..c3f6b00cd0 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -153,7 +153,7 @@ _replace_button(EContactEditor *editor, gchar *button_xml, gchar *image, GtkSign
GtkWidget *pixmap;
gchar *image_temp;
if (button && GTK_IS_BUTTON(button)) {
- image_temp = g_strdup_printf("%s%s", DATADIR "/evolution/", image);
+ image_temp = g_strdup_printf("%s/%s", EVOLUTIONDIR, image);
pixmap = e_create_image_widget(NULL, image_temp, NULL, 0, 0);
gtk_container_add(GTK_CONTAINER(button),
pixmap);