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

5 files changed, 22 insertions, 32 deletions

diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 0b478a3479..c7f7acac71 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -7,10 +7,8 @@ INCLUDES =						\
 	-I$(top_srcdir)/widgets/e-table			\
 	-I$(top_builddir)/shell				\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DDATADIR=\""$(datadir)"\"			\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTIONDIR=\""$(evolutiondir)"\"		\
+	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
 	-DEVOLUTION_UIDIR=\""$(evolution_uidir)\""	\
 	-DG_LOG_DOMAIN=\"contact-editor\"		\
 	-DG_DISABLE_DEPRECATED				\
@@ -49,10 +47,7 @@ e-contact-editor-marshal.c: e-contact-editor-marshal.h
 
 MARSHAL_GENERATED = e-contact-editor-marshal.c e-contact-editor-marshal.h
 
-evolutiondir = $(datadir)/evolution-$(BASE_VERSION)
-evolution_DATA = arrow.png
-
-gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
+images_DATA = arrow.png
 
 glade_DATA = 				\
 	contact-editor.glade		\
@@ -62,6 +57,6 @@ glade_DATA = 				\
 BUILT_SOURCES = $(MARSHAL_GENERATED)
 CLEANFILES = $(BUILT_SOURCES)
 
-EXTRA_DIST=	$(evolution_DATA)		\
-		$(glade_DATA)			\
+EXTRA_DIST=	$(images_DATA)		\
+		$(glade_DATA)		\
 		e-contact-editor-marshal.list
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)) {
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index 08186d25b3..02cf3edd44 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -126,7 +126,7 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_fullname)->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_fullname), icon_path);
 	g_free (icon_path);
 }
@@ -190,12 +190,12 @@ e_contact_editor_fullname_set_property (GObject *object, guint prop_id,
 		for (i = 0; widget_names[i] != NULL; i ++) {
 			GtkWidget *w = glade_xml_get_widget(e_contact_editor_fullname->gui, widget_names[i]);
 			if (GTK_IS_ENTRY (w)) {
-				gtk_entry_set_editable (GTK_ENTRY (w),
-							e_contact_editor_fullname->editable);
+				gtk_editable_set_editable (GTK_EDITABLE (w),
+							   e_contact_editor_fullname->editable);
 			}
 			else if (GTK_IS_COMBO (w)) {
-				gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (w)->entry),
-							e_contact_editor_fullname->editable);
+				gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (w)->entry),
+							   e_contact_editor_fullname->editable);
 				gtk_widget_set_sensitive (GTK_COMBO (w)->button, e_contact_editor_fullname->editable);
 			}
 			else if (GTK_IS_LABEL (w)) {
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 3af7fa3ab6..1b726c04e3 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -23,6 +23,7 @@
 
 #include "e-contact-editor.h"
 
+#include <string.h>
 #include <time.h>
 #include <gtk/gtkcheckbutton.h>
 #include <gtk/gtkcheckmenuitem.h>
@@ -242,7 +243,7 @@ _replace_button(EContactEditor *editor, gchar *button_xml, gchar *image, GCallba
 	GtkWidget *pixmap;
 	gchar *image_temp;
 	if (button && GTK_IS_BUTTON(button)) {
-		image_temp = g_strdup_printf("%s/%s", EVOLUTIONDIR, image);
+		image_temp = g_strdup_printf("%s/%s", EVOLUTION_IMAGESDIR, image);
 		pixmap = e_create_image_widget(NULL, image_temp, NULL, 0, 0);
 		gtk_container_add(GTK_CONTAINER(button),
 				  pixmap);
@@ -1371,7 +1372,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor)
 			    GTK_SIGNAL_FUNC (app_delete_event_cb), e_contact_editor);
 
 	/* set the icon */
-	icon_path = g_build_filename (EVOLUTION_ICONSDIR, "evolution-contacts-mini.png", NULL);
+	icon_path = g_build_filename (EVOLUTION_IMAGESDIR, "evolution-contacts-mini.png", NULL);
 	gnome_window_icon_set_from_file (GTK_WINDOW (e_contact_editor->app), icon_path);
 	g_free (icon_path);
 }
@@ -1512,7 +1513,7 @@ e_contact_editor_new (EBook *book,
 	all_contact_editors = g_slist_prepend (all_contact_editors, ce);
 	g_object_weak_ref (G_OBJECT (ce), contact_editor_destroy_notify, ce);
 
-	gtk_object_ref (GTK_OBJECT (ce));
+	g_object_ref (ce);
 	gtk_object_sink (GTK_OBJECT (ce));
 
 	g_object_set (ce,
@@ -1857,8 +1858,6 @@ _phone_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor
 		checked = phone && phone->number && *phone->number;
 		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor->phone_info[i].widget),
 					       checked);
-		gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(editor->phone_info[i].widget),
-						    TRUE);
 	}
 	
 	result = _arrow_pressed (widget, button, editor, editor->phone_popup, &editor->phone_list, &editor->phone_info, label, entry, "Add new phone number type");
@@ -1888,8 +1887,6 @@ _email_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor
 		checked = string && *string;
 		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor->email_info[i].widget),
 					       checked);
-		gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(editor->email_info[i].widget),
-						    TRUE);
 	}
 	
 	result = _arrow_pressed (widget, button, editor, editor->email_popup, &editor->email_list, &editor->email_info, "label-email1", "entry-email1", "Add new Email type");
@@ -1919,8 +1916,6 @@ _address_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEdito
 		checked = address && address->data && *address->data;
 		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor->address_info[i].widget),
 					       checked);
-		gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(editor->address_info[i].widget),
-						    TRUE);
 	}
 
 	result = _arrow_pressed (widget, button, editor, editor->address_popup, &editor->address_list, &editor->address_info, "label-address", "text-address", "Add new Address type");
@@ -2033,7 +2028,6 @@ set_address_field(EContactEditor *editor, int result)
 	text = glade_xml_get_widget(editor->gui, "text-address");
 
 	if (text && GTK_IS_TEXT_VIEW(text)) {
-		GtkTextView *text_view = GTK_TEXT_VIEW (text);
 		GtkTextBuffer *buffer;
 		GtkTextIter start_iter, end_iter;
 		const ECardAddrLabel *address;
@@ -2663,14 +2657,14 @@ static void
 enable_widget (GtkWidget *widget, gboolean enabled)
 {
 	if (GTK_IS_ENTRY (widget)) {
-		gtk_entry_set_editable (GTK_ENTRY (widget), enabled);
+		gtk_editable_set_editable (GTK_EDITABLE (widget), enabled);
 	}
 	else if (GTK_IS_TEXT_VIEW (widget)) {
 		gtk_text_view_set_editable (GTK_TEXT_VIEW (widget), enabled);
 	}
 	else if (GTK_IS_COMBO (widget)) {
-		gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (widget)->entry),
-					enabled);
+		gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (widget)->entry),
+					   enabled);
 		gtk_widget_set_sensitive (GTK_COMBO (widget)->button, enabled);
 	}
 	else if (E_IS_DATE_EDIT (widget)) {
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index fc29fff1a6..d19ffb364f 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -26,6 +26,7 @@
 
 #include <config.h>
 #include <ctype.h>
+#include <string.h>
 #include <glib.h>
 #include <gtk/gtkentry.h>
 #include <gtk/gtklabel.h>