Remove some cruft. rename ICONSDIR to IMAGESDIR. (images_DATA): Install

	* gui/contact-editor/Makefile.am (INCLUDES): Remove some cruft.
	rename ICONSDIR to IMAGESDIR.
	(images_DATA): Install arrow.png in imagesdir instead of
	privdatadir.

	* gui/contact-editor/e-contact-quick-add.c: #include <string.h>

	* gui/contact-editor/e-contact-editor.c: #include <string.h>
	(e_contact_editor_init): s/EVOLUTION_ICONSDIR/EVOLUTION_IMAGESDIR/
	(e_contact_editor_new): s/gtk_object_ref/g_object_ref/
	(_replace_button): Look in imagesdir, not privdatadir
	(_phone_arrow_pressed): Remove call to deprecated
	gtk_check_menu_item_set_show_toggle.
	(_email_arrow_pressed): Likewise
	(_address_arrow_pressed): Likewise
	(set_address_field): Remove unused variable
	(enable_widget):
	s/gtk_entry_set_editable/gtk_editable_set_editable/

	* gui/contact-editor/e-contact-editor-address.c
	(e_contact_editor_address_init):
	s/EVOLUTION_ICONSDIR/EVOLUTION_IMAGESDIR
	(e_contact_editor_address_set_property):
	s/gtk_entry_set_editable/gtk_editable_set_editable/

	* gui/contact-editor/e-contact-editor-fullname.c
	(e_contact_editor_fullname_init):
	s/EVOLUTION_ICONSDIR/EVOLUTION_IMAGESDIR
	(e_contact_editor_fullname_set_property): Likewise.

svn path=/trunk/; revision=19781

1 files changed, 5 insertions, 5 deletions

diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c
index 1839083f27..202177935f 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-address.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-address.c
@@ -438,7 +438,7 @@ e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address)
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0);
 	g_object_unref(widget);
 
-	icon_path = g_concat_dir_and_file (EVOLUTION_ICONSDIR, "evolution-contacts-mini.png");
+	icon_path = g_concat_dir_and_file (EVOLUTION_IMAGESDIR, "evolution-contacts-mini.png");
 	gnome_window_icon_set_from_file (GTK_WINDOW (e_contact_editor_address), icon_path);
 	g_free (icon_path);
 }
@@ -506,12 +506,12 @@ e_contact_editor_address_set_property (GObject *object, guint prop_id,
 		for (i = 0; widget_names[i] != NULL; i ++) {
 			GtkWidget *w = glade_xml_get_widget(e_contact_editor_address->gui, widget_names[i]);
 			if (GTK_IS_ENTRY (w)) {
-				gtk_entry_set_editable (GTK_ENTRY (w),
-							e_contact_editor_address->editable);
+				gtk_editable_set_editable (GTK_EDITABLE (w),
+							   e_contact_editor_address->editable);
 			}
 			else if (GTK_IS_COMBO (w)) {
-				gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (w)->entry),
-							e_contact_editor_address->editable);
+				gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (w)->entry),
+							   e_contact_editor_address->editable);
 				gtk_widget_set_sensitive (GTK_COMBO (w)->button, e_contact_editor_address->editable);
 			}
 			else if (GTK_IS_LABEL (w)) {