+ * 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

10 files changed, 54 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 235e370757..5b9f9cc554 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-04-12  Matt Loper  <matt@helixcode.com>
+
+	* 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.
+
 2000-04-12  Tuomas Kuosmanen  <tigert@gimp.org>
 
 	* art/house.png, art/malehead.png, art/cellphone.png, 
diff --git a/addressbook/contact-editor/Makefile.am b/addressbook/contact-editor/Makefile.am
index 2fb74b736d..0e8b924e5e 100644
--- a/addressbook/contact-editor/Makefile.am
+++ b/addressbook/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/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c
index cda77e4431..6f2431d110 100644
--- a/addressbook/contact-editor/e-contact-editor.c
+++ b/addressbook/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
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
diff --git a/art/Makefile.am b/art/Makefile.am
index 648cecf30a..eb35364cca 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -6,7 +6,12 @@ images_DATA = \
 	evolution-inbox.png \
 	evolution-notes.png \
 	evolution-tasks.png \
-	evolution-today.png
+	evolution-today.png \
+	cellphone.png       \
+	globe.png           \
+	house.png           \
+	envelope.png        \
+	malehead.png
 
 EXTRA_DIST = \
 	attachment.xpm \
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 67601b4095..5efc7eb404 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2000-04-12  Matt Loper  <matt@helixcode.com>
+
+	* camel-folder-pt-proxy.c (_folder_open_cb): Print warning message
+	for broken function.
+	(_folder_close_cb): Same.
+
 2000-04-12  Miguel de Icaza  <miguel@gnu.org>
 
 	* Makefile.am (pthread_SRC): Use correct names for the pthread
diff --git a/camel/camel-folder-pt-proxy.c b/camel/camel-folder-pt-proxy.c
index ac4caaa049..c8575d1dba 100644
--- a/camel/camel-folder-pt-proxy.c
+++ b/camel/camel-folder-pt-proxy.c
@@ -327,6 +327,11 @@ _folder_open_cb (CamelFolder *folder,
 	_ProxyCbUserData *pud;
 	CamelFuncDef *cb_def;
 
+	g_print ("%s: %s(): Bailing. This function is incredibly"
+		 " broken; the \"*pud\" pointer isn't allocated"
+		 " memory anywhere.\n");
+	return;
+	
 	/* transfer the exception information from "ex" to the 
 	 * client supplied exception (kept in pud->ex) */ 	 
 	camel_exception_xfer (pud->ex, ex);
@@ -411,6 +416,11 @@ _folder_close_cb (CamelFolder *folder,
 	_ProxyCbUserData *pud;
 	CamelFuncDef *cb_def;
 
+	g_print ("%s: %s(): Bailing. This function is incredibly"
+		 " broken; the \"*pud\" pointer isn't allocated"
+		 " memory anywhere.\n");
+	return;
+
 	camel_exception_xfer (pud->ex, ex);
 	cb_def = CAMEL_FOLDER_PT_PROXY_CLASS(pud->proxy_folder)->close_cb_def;
 	cb = camel_marshal_create_op (cb_def,
diff --git a/filter/ChangeLog b/filter/ChangeLog
index d31795348d..d1624ba2fe 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-12  Matt Loper  <matt@helixcode.com>
+
+	* filter-arg.c (filter_arg_edit_value): Return a value.
+
 2000-03-27  NotZed  <NotZed@HelixCode.com>
 
 	* filter-xml.c (tokenise_xmlfreeprop): Free a prop after
diff --git a/filter/filter-arg.c b/filter/filter-arg.c
index 1a1852fdf2..867afdc94e 100644
--- a/filter/filter-arg.c
+++ b/filter/filter-arg.c
@@ -255,7 +255,7 @@ filter_arg_edit_values(FilterArg *arg)
 int
 filter_arg_edit_value(FilterArg *arg, int index)
 {
-	((FilterArgClass *)(arg->object.klass))->edit_value(arg, index);
+	return ((FilterArgClass *)(arg->object.klass))->edit_value(arg, index);
 }
 
 xmlNodePtr