3 files changed, 32 insertions, 0 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 193b262d5e..0e199f04b1 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,15 @@
 2002-09-11  Chris Toshok  <toshok@ximian.com>
 
+	[ fixes part of #17336 ]
+	* gui/contact-editor/e-contact-editor-fullname.c
+	(e_contact_editor_fullname_init): get the window title from the
+	.glade file, and supply a suitable wm icon.
+
+	* gui/contact-editor/e-contact-editor-address.c
+	(e_contact_editor_address_init): same.
+
+2002-09-11  Chris Toshok  <toshok@ximian.com>
+
 	[ fixes #30208 ]
 	* gui/component/addressbook.c (load_uri_auth_cb): if the user
 	clicked cancel in the password dialog, let them off the hook and
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c
index dfd89fc75d..dd9405816f 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-address.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-address.c
@@ -27,6 +27,8 @@
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-stock.h>
+#include <libgnomeui/gnome-window-icon.h>
+#include <libgnome/gnome-util.h>
 #include <gal/widgets/e-unicode.h>
 #include <gal/widgets/e-gui-utils.h>
 #include <gtk/gtkcombo.h>
@@ -404,6 +406,7 @@ e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address)
 {
 	GladeXML *gui;
 	GtkWidget *widget;
+	char *icon_path;
 
 	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),
 				     GNOME_STOCK_BUTTON_OK);
@@ -421,11 +424,19 @@ e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address)
 	setup_tab_order (gui);
 	fill_in_countries (gui);
 
+	widget = glade_xml_get_widget(gui, "dialog-checkaddress");
+	gtk_window_set_title (GTK_WINDOW (e_contact_editor_address),
+			      GTK_WINDOW (widget)->title);
+
 	widget = glade_xml_get_widget(gui, "table-checkaddress");
 	gtk_widget_ref(widget);
 	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
 	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0);
 	gtk_widget_unref(widget);
+
+	icon_path = g_concat_dir_and_file (EVOLUTION_ICONSDIR, "evolution-contacts-mini.png");
+	gnome_window_icon_set_from_file (GTK_WINDOW (e_contact_editor_address), icon_path);
+	g_free (icon_path);
 }
 
 void
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index 5ae8b36a9b..8d602657c0 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -23,6 +23,8 @@
 #include <libgnomeui/gnome-stock.h>
 #include <gal/widgets/e-unicode.h>
 #include "e-contact-editor-fullname.h"
+#include <libgnomeui/gnome-window-icon.h>
+#include <libgnome/gnome-util.h>
 #include <gtk/gtkcombo.h>
 
 static void e_contact_editor_fullname_init		(EContactEditorFullname		 *card);
@@ -95,6 +97,7 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam
 {
 	GladeXML *gui;
 	GtkWidget *widget;
+	char *icon_path;
 
 	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_fullname),
 				     GNOME_STOCK_BUTTON_OK);
@@ -108,11 +111,19 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam
 	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fullname.glade", NULL);
 	e_contact_editor_fullname->gui = gui;
 
+	widget = glade_xml_get_widget(gui, "dialog-checkfullname");
+	gtk_window_set_title (GTK_WINDOW (e_contact_editor_fullname),
+			      GTK_WINDOW (widget)->title);
+
 	widget = glade_xml_get_widget(gui, "table-checkfullname");
 	gtk_widget_ref(widget);
 	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
 	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0);
 	gtk_widget_unref(widget);
+
+	icon_path = g_concat_dir_and_file (EVOLUTION_ICONSDIR, "evolution-contacts-mini.png");
+	gnome_window_icon_set_from_file (GTK_WINDOW (e_contact_editor_fullname), icon_path);
+	g_free (icon_path);
 }
 
 void