[ fixes #25038 ] need to have EVOLUTION_ICONSDIR defined.

2002-08-29  Chris Toshok  <toshok@ximian.com>

	[ fixes #25038 ]
	* gui/contact-editor/Makefile.am (INCLUDES): need to have
	EVOLUTION_ICONSDIR defined.

	* gui/contact-list-editor/Makefile.am (INCLUDES): same.

	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
	set the window icon to the contact mini icon.

	* gui/contact-list-editor/e-contact-list-editor.c
	(e_contact_list_editor_init): set the window icon to the new
	contact list icon.

	* gui/widgets/e-minicard.c (LIST_ICON_FILENAME): change to (the
	prettier, imo) "contact-list-16.png"

svn path=/trunk/; revision=17915

6 files changed, 39 insertions, 1 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 11e87b8868..e06621f8fa 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,21 @@
+2002-08-29  Chris Toshok  <toshok@ximian.com>
+
+	[ fixes #25038 ]
+	* gui/contact-editor/Makefile.am (INCLUDES): need to have
+	EVOLUTION_ICONSDIR defined.
+
+	* gui/contact-list-editor/Makefile.am (INCLUDES): same.
+
+	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
+	set the window icon to the contact mini icon.
+
+	* gui/contact-list-editor/e-contact-list-editor.c
+	(e_contact_list_editor_init): set the window icon to the new
+	contact list icon.
+	
+	* gui/widgets/e-minicard.c (LIST_ICON_FILENAME): change to (the
+	prettier, imo) "contact-list-16.png"
+
 2002-08-28  Chris Toshok  <toshok@ximian.com>
 
 	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_search): spew
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 8f8cb4c4f9..fe7295bfe6 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES =					\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
 	-DDATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"	\
+	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"	\
 	-DEVOLUTIONDIR=\""$(evolutiondir)"\"	\
 	-DG_LOG_DOMAIN=\"contact-editor\"	\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
@@ -32,6 +33,8 @@ evolutiondir = $(datadir)/evolution
 
 evolution_DATA = arrow.png
 
+iconsdir = $(datadir)/images/evolution
+
 gladedir   = $(datadir)/evolution/glade
 
 glade_DATA = 				\
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 0e606c1c91..f22aaa5487 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -30,6 +30,7 @@
 #include <gtk/gtktext.h>
 #include <libgnomeui/gnome-popup-menu.h>
 #include <libgnomeui/gnome-dialog-util.h>
+#include <libgnomeui/gnome-window-icon.h>
 #include <libgnomeui/gnome-stock.h>
 #include <libgnome/gnome-i18n.h>
 
@@ -1287,6 +1288,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor)
 	GtkWidget *bonobo_win;
 	GtkWidget *wants_html;
 	BonoboUIContainer *container;
+	char *icon_path;
 
 	e_contact_editor->email_info = NULL;
 	e_contact_editor->phone_info = NULL;
@@ -1407,6 +1409,11 @@ e_contact_editor_init (EContactEditor *e_contact_editor)
 
 	gtk_signal_connect (GTK_OBJECT (e_contact_editor->app), "delete_event",
 			    GTK_SIGNAL_FUNC (app_delete_event_cb), e_contact_editor);
+
+	/* set the icon */
+	icon_path = g_concat_dir_and_file (EVOLUTION_ICONSDIR, "evolution-contacts-mini.png");
+	gnome_window_icon_set_from_file (GTK_WINDOW (e_contact_editor->app), icon_path);
+	g_free (icon_path);
 }
 
 void
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index 34aea3a678..7349f2a821 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES =					\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
 	-DDATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"	\
+	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"	\
 	-DEVOLUTIONDIR=\""$(evolutiondir)"\"	\
 	-DG_LOG_DOMAIN=\"contact-list-editor\"	\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
@@ -22,6 +23,8 @@ libecontactlisteditor_a_SOURCES = 		\
 	e-contact-list-model.c			\
 	e-contact-list-model.h
 
+iconsdir = $(datadir)/images/evolution
+
 gladedir   = $(datadir)/evolution/glade
 
 glade_DATA = 					\
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 9c7ddb0d25..e75d8d35e8 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -25,6 +25,7 @@
 #include <glib.h>
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-window-icon.h>
 #include <bonobo/bonobo-ui-container.h>
 #include <bonobo/bonobo-ui-util.h>
 #include <gal/e-table/e-table-scrolled.h>
@@ -209,6 +210,7 @@ e_contact_list_editor_init (EContactListEditor *editor)
 	GladeXML *gui;
 	GtkWidget *bonobo_win;
 	BonoboUIContainer *container;
+	char *icon_path;
 
 	editor->card = NULL;
 	editor->changed = FALSE;
@@ -296,6 +298,11 @@ e_contact_list_editor_init (EContactListEditor *editor)
 
 	gtk_signal_connect (GTK_OBJECT (editor->app), "delete_event",
 			    GTK_SIGNAL_FUNC (app_delete_event_cb), editor);
+
+	/* set the icon */
+	icon_path = g_concat_dir_and_file (EVOLUTION_ICONSDIR, "contact-list-16.png");
+	gnome_window_icon_set_from_file (GTK_WINDOW (editor->app), icon_path);
+	g_free (icon_path);
 }
 
 static void
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 76761f9515..99e1d524fa 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -67,7 +67,7 @@ struct _EMinicardField {
 
 #define d(x)
 
-#define LIST_ICON_FILENAME "contact-is-a-list.png"
+#define LIST_ICON_FILENAME "contact-list-16.png"
 
 #define E_MINICARD_FIELD(field) ((EMinicardField *)(field))