From 73b0317b1fabbb29ae06841c4692a79b80436262 Mon Sep 17 00:00:00 2001
From: Matthew Loper <mloper@src.gnome.org>
Date: Wed, 12 Apr 2000 13:46:10 +0000
Subject: +	* art/Makefile.am: Add tigert's contact-dlg-related images. +
 +	* addressbook/contact-editor/e-contact-editor.c (_add_images): Add +
 tigert's images. + +	* addressbook/contact-editor/Makefile.am: add
 EVOLUTION_IMAGES. + +	* camel-folder-pt-proxy.c (_folder_open_cb): Print
 warning message +	for broken function. +	(_folder_close_cb): Same. + +
 * filter-arg.c (filter_arg_edit_value): Return a value.

svn path=/trunk/; revision=2408
---
 addressbook/gui/contact-editor/Makefile.am        |  4 +++-
 addressbook/gui/contact-editor/e-contact-editor.c | 11 ++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'addressbook/gui')

diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 2fb74b736d..0e8b924e5e 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -1,3 +1,4 @@
+imagesdir = $(datadir)/images/evolution
 
 images = email.png head.png phone.png snailmail.png web.png arrow.png briefcase.png netmeeting.png netfreebusy.png
 
@@ -10,7 +11,8 @@ CPPFLAGS = \
 
 INCLUDES =					\
 	$(GNOME_INCLUDEDIR)			\
-	-I$(top_srcdir)/addressbook/backend/ebook
+	-I$(top_srcdir)/addressbook/backend/ebook \
+	-DEVOLUTION_IMAGES=\""$(imagesdir)"\"
 
 noinst_LIBRARIES =				\
 	libecontacteditor.a
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index cda77e4431..6f2431d110 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -134,11 +134,12 @@ _add_image(GtkTable *table, gchar *image, int left, int right, int top, int bott
 static void
 _add_images(GtkTable *table)
 {
-	_add_image(table, DATADIR "/evolution/head.png", 0, 1, 0, 4);
-	_add_image(table, DATADIR "/evolution/phone.png", 4, 5, 0, 4);
-	_add_image(table, DATADIR "/evolution/email.png", 0, 1, 5, 7);
-	_add_image(table, DATADIR "/evolution/web.png", 0, 1, 8, 10);
-	_add_image(table, DATADIR "/evolution/snailmail.png", 4, 5, 5, 10);
+	_add_image(table, EVOLUTION_IMAGES "/malehead.png", 0, 1, 0, 4);
+	_add_image(table, EVOLUTION_IMAGES "/cellphone.png", 4, 5, 0, 4);
+	_add_image(table, EVOLUTION_IMAGES "/envelope.png", 0, 1, 5, 7);
+	_add_image(table, EVOLUTION_IMAGES "/globe.png",
+		   0, 1, 8, 10);
+	_add_image(table, EVOLUTION_IMAGES "/house.png", 4, 5, 5, 10);
 }
 
 static void
-- 
cgit