Fix compiler warnings in addressbook.

21 files changed, 106 insertions, 106 deletions

diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index c939b9cd27..ec89c9a34f 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -718,7 +718,7 @@ e_addr_context_destroy (EAddrConduitContext *ctxt)
 }
 
 /* Debug routines */
-static char *
+static const gchar *
 print_local (EAddrLocalRecord *local)
 {
 	static char buff[ 4096 ];
@@ -1532,12 +1532,12 @@ addressbook_authenticate (EBook *book,
 			  gpointer data)
 {
 	gchar *auth;
-	gchar *user;
+	const gchar *user;
 	gchar *passwd;
 	gchar *str_uri;
 	gchar *pass_key;
 	gchar *auth_domain;
-	gchar *component_name;
+	const gchar *component_name;
 	EUri *e_uri;
 
 	ESource *source = (ESource *)data;
@@ -1547,9 +1547,9 @@ addressbook_authenticate (EBook *book,
 	component_name = auth_domain ? auth_domain : "Addressbook";
 
 	if (auth && !strcmp ("plain/password", auth))
-		user = (gchar *)e_source_get_property (source, "user");
+		user = e_source_get_property (source, "user");
 	else
-		user = (gchar *)e_source_get_property (source, "email_addr");
+		user = e_source_get_property (source, "email_addr");
 	if (!user)
 		user = "";
 
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index 3ec3f5ca08..e580fb2844 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -204,28 +204,28 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	CORBA_sequence_set_release (list, FALSE);
 
-	list->_buffer[0].id = "contact";
+	list->_buffer[0].id = (char *) "contact";
 	list->_buffer[0].description = _("New Contact");
 	list->_buffer[0].menuDescription = (char *) C_("New", "_Contact");
 	list->_buffer[0].tooltip = _("Create a new contact");
 	list->_buffer[0].menuShortcut = 'c';
-	list->_buffer[0].iconName = "contact-new";
+	list->_buffer[0].iconName = (char *) "contact-new";
 	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
 
-	list->_buffer[1].id = "contact_list";
+	list->_buffer[1].id = (char *) "contact_list";
 	list->_buffer[1].description = _("New Contact List");
 	list->_buffer[1].menuDescription = (char *) C_("New", "Contact _List");
 	list->_buffer[1].tooltip = _("Create a new contact list");
 	list->_buffer[1].menuShortcut = 'l';
-	list->_buffer[1].iconName = "stock_contact-list";
+	list->_buffer[1].iconName = (char *) "stock_contact-list";
 	list->_buffer[1].type = GNOME_Evolution_CREATABLE_OBJECT;
 
-	list->_buffer[2].id = "address_book";
+	list->_buffer[2].id = (char *) "address_book";
 	list->_buffer[2].description = _("New Address Book");
 	list->_buffer[2].menuDescription = (char *) C_("New", "Address _Book");
 	list->_buffer[2].tooltip = _("Create a new address book");
 	list->_buffer[2].menuShortcut = '\0';
-	list->_buffer[2].iconName = "address-book-new";
+	list->_buffer[2].iconName = (char *) "address-book-new";
 	list->_buffer[2].type = GNOME_Evolution_CREATABLE_FOLDER;
 
 	return list;
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index 1f0fa57847..87e018796b 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -136,7 +136,7 @@ struct _AddressbookSourceDialog {
 
 #ifdef HAVE_LDAP
 
-static char *
+static const gchar *
 ldap_unparse_auth (AddressbookLDAPAuthType auth_type)
 {
 	switch (auth_type) {
@@ -165,7 +165,7 @@ ldap_parse_auth (const char *auth)
 		return ADDRESSBOOK_LDAP_AUTH_NONE;
 }
 
-static char *
+static const gchar *
 ldap_unparse_scope (AddressbookLDAPScopeType scope_type)
 {
 	switch (scope_type) {
@@ -180,7 +180,7 @@ ldap_unparse_scope (AddressbookLDAPScopeType scope_type)
 	}
 }
 
-static char *
+static const gchar *
 ldap_unparse_ssl (AddressbookLDAPSSLType ssl_type)
 {
 	switch (ssl_type) {
@@ -308,7 +308,7 @@ addressbook_ldap_auth (GtkWidget *window, LDAP *ldap)
 
 static int
 addressbook_root_dse_query (AddressbookSourceDialog *dialog, LDAP *ldap,
-			    char **attrs, LDAPMessage **resp)
+			    const gchar **attrs, LDAPMessage **resp)
 {
 	int ldap_error;
 	struct timeval timeout;
@@ -319,7 +319,7 @@ addressbook_root_dse_query (AddressbookSourceDialog *dialog, LDAP *ldap,
 	ldap_error = ldap_search_ext_s (ldap,
 					LDAP_ROOT_DSE, LDAP_SCOPE_BASE,
 					"(objectclass=*)",
-					attrs, 0, NULL, NULL, &timeout, LDAP_NO_LIMIT, resp);
+					(gchar **) attrs, 0, NULL, NULL, &timeout, LDAP_NO_LIMIT, resp);
 	if (LDAP_SUCCESS != ldap_error)
 		e_error_run (GTK_WINDOW (dialog->window), "addressbook:ldap-search-base", NULL);
 
@@ -358,7 +358,7 @@ static gboolean
 do_ldap_root_dse_query (AddressbookSourceDialog *sdialog, GtkListStore *model, ESource *source)
 {
 	LDAP *ldap;
-	char *attrs[2];
+	const gchar *attrs[2];
 	int ldap_error;
 	char **values;
 	LDAPMessage *resp;
@@ -1018,29 +1018,29 @@ eabc_details_limit(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, st
 #endif
 
 static EConfigItem eabc_items[] = {
-	{ E_CONFIG_BOOK, "", },
-	{ E_CONFIG_PAGE, "00.general", N_("General") },
-	{ E_CONFIG_SECTION, "00.general/10.display", N_("Address Book") },
-	{ E_CONFIG_ITEM, "00.general/10.display/10.name", "hbox122", eabc_general_name },
-	{ E_CONFIG_ITEM, "00.general/10.display/20.offline", NULL, eabc_general_offline },
+	{ E_CONFIG_BOOK, (gchar *) (gchar *) "", },
+	{ E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) N_("General") },
+	{ E_CONFIG_SECTION, (gchar *) "00.general/10.display", (gchar *) N_("Address Book") },
+	{ E_CONFIG_ITEM, (gchar *) "00.general/10.display/10.name", (gchar *) "hbox122", eabc_general_name },
+	{ E_CONFIG_ITEM, (gchar *) "00.general/10.display/20.offline", NULL, eabc_general_offline },
 #ifdef HAVE_LDAP
-	{ E_CONFIG_SECTION, "00.general/20.server", N_("Server Information") },
-	{ E_CONFIG_ITEM, "00.general/20.server/00.host", "table31", eabc_general_host },
-	{ E_CONFIG_SECTION, "00.general/30.auth", N_("Authentication") },
-	{ E_CONFIG_ITEM, "00.general/30.auth/00.auth", "table32", eabc_general_auth },
-
-	{ E_CONFIG_PAGE, "10.details", N_("Details") },
-	{ E_CONFIG_SECTION, "10.details/00.search", N_("Searching") },
-	{ E_CONFIG_ITEM, "10.details/00.search/00.search", "table33", eabc_details_search },
-	{ E_CONFIG_SECTION, "10.details/10.limit", N_("Downloading") },
-	{ E_CONFIG_ITEM, "10.details/10.limit/00.limit", "table34", eabc_details_limit },
+	{ E_CONFIG_SECTION, (gchar *) "00.general/20.server", (gchar *) N_("Server Information") },
+	{ E_CONFIG_ITEM, (gchar *) "00.general/20.server/00.host", (gchar *) "table31", eabc_general_host },
+	{ E_CONFIG_SECTION, (gchar *) "00.general/30.auth", (gchar *) N_("Authentication") },
+	{ E_CONFIG_ITEM, (gchar *) "00.general/30.auth/00.auth", (gchar *) "table32", eabc_general_auth },
+
+	{ E_CONFIG_PAGE, (gchar *) "10.details", (gchar *) N_("Details") },
+	{ E_CONFIG_SECTION, (gchar *) "10.details/00.search", (gchar *) N_("Searching") },
+	{ E_CONFIG_ITEM, (gchar *) "10.details/00.search/00.search", (gchar *) "table33", eabc_details_search },
+	{ E_CONFIG_SECTION, (gchar *) "10.details/10.limit", (gchar *) N_("Downloading") },
+	{ E_CONFIG_ITEM, (gchar *) "10.details/10.limit/00.limit", (gchar *) "table34", eabc_details_limit },
 #endif
 	{ 0 },
 };
 
 /* items needed for the 'new addressbook' window */
 static EConfigItem eabc_new_items[] = {
-	{ E_CONFIG_ITEM, "00.general/10.display/00.type", NULL, eabc_general_type },
+	{ E_CONFIG_ITEM, (gchar *) "00.general/10.display/00.type", NULL, eabc_general_type },
 	{ 0 },
 };
 
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index 756c6bf96e..9759b3fdf2 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -96,8 +96,8 @@ enum DndTargetType {
 #define VCARD_TYPE        "text/x-vcard"
 #define SOURCE_VCARD_TYPE "text/x-source-vcard"
 static GtkTargetEntry drag_types[] = {
-	{ SOURCE_VCARD_TYPE, 0, DND_TARGET_TYPE_SOURCE_VCARD_LIST },
-	{ VCARD_TYPE, 0, DND_TARGET_TYPE_VCARD_LIST }
+	{ (gchar *) SOURCE_VCARD_TYPE, 0, DND_TARGET_TYPE_SOURCE_VCARD_LIST },
+	{ (gchar *) VCARD_TYPE, 0, DND_TARGET_TYPE_VCARD_LIST }
 };
 static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]);
 
@@ -946,15 +946,15 @@ primary_source_selection_changed_callback (ESourceSelector *selector,
 }
 
 static EPopupItem abv_source_popups[] = {
-	{ E_POPUP_ITEM, "10.new", N_("_New Address Book"), new_addressbook_cb, NULL, "address-book-new", 0, 0 },
- 	{ E_POPUP_ITEM, "20.saveasvcard", N_("Save As vCard..."), save_addressbook_cb, NULL,"document-save-as", 0, EAB_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_ITEM, "25.rename", N_("_Rename..."), rename_addressbook_cb, NULL, NULL, 0, EAB_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, (gchar *) "10.new", (gchar *) N_("_New Address Book"), new_addressbook_cb, NULL, (gchar *) "address-book-new", 0, 0 },
+ 	{ E_POPUP_ITEM, (gchar *) "20.saveasvcard", (gchar *) N_("Save As vCard..."), save_addressbook_cb, NULL, (gchar *) "document-save-as", 0, EAB_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, (gchar *) "25.rename", (gchar *) N_("_Rename..."), rename_addressbook_cb, NULL, NULL, 0, EAB_POPUP_SOURCE_PRIMARY },
 
-	{ E_POPUP_BAR,  "30.bar" },
-	{ E_POPUP_ITEM, "30.delete", N_("_Delete"), delete_addressbook_cb, NULL, "edit-delete", 0, EAB_POPUP_SOURCE_USER|EAB_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_BAR,  (gchar *) "30.bar" },
+	{ E_POPUP_ITEM, (gchar *) "30.delete", (gchar *) N_("_Delete"), delete_addressbook_cb, NULL, (gchar *) "edit-delete", 0, EAB_POPUP_SOURCE_USER|EAB_POPUP_SOURCE_PRIMARY },
 
-	{ E_POPUP_BAR,  "99.bar" },
-	{ E_POPUP_ITEM, "99.properties", N_("_Properties"), edit_addressbook_cb, NULL,"document-properties", 0, EAB_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_BAR,  (gchar *) "99.bar" },
+	{ E_POPUP_ITEM, (gchar *) "99.properties", (gchar *) N_("_Properties"), edit_addressbook_cb, NULL, (gchar *) "document-properties", 0, EAB_POPUP_SOURCE_PRIMARY },
 };
 
 static void
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index c8285d8171..9bb726e17e 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -200,7 +200,7 @@ addressbook_authenticate (EBook *book, gboolean previous_failure, ESource *sourc
 		char *prompt;
 		char *password_prompt;
 		gboolean remember;
-		char *failed_auth;
+		const gchar *failed_auth;
 		guint32 flags = E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET|E_PASSWORDS_ONLINE;
 
 		if (previous_failure) {
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index bbe9ece7ba..c2194e8b8c 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -190,7 +190,7 @@ e_contact_editor_fullname_set_property (GObject *object, guint prop_id,
 		break;
 	case PROP_EDITABLE: {
 		int i;
-		char *widget_names[] = {
+		const gchar *widget_names[] = {
 			"comboentry-title",
 			"comboentry-suffix",
 			"entry-first",
@@ -250,7 +250,9 @@ e_contact_editor_fullname_get_property (GObject *object, guint prop_id,
 }
 
 static void
-fill_in_field(EContactEditorFullname *editor, char *field, char *string)
+fill_in_field (EContactEditorFullname *editor,
+               const gchar *field,
+               const gchar *string)
 {
 	GtkWidget *widget = glade_xml_get_widget (editor->gui, field);
 	GtkEntry *entry = NULL;
@@ -282,7 +284,8 @@ fill_in_info(EContactEditorFullname *editor)
 }
 
 static char *
-extract_field(EContactEditorFullname *editor, char *field)
+extract_field (EContactEditorFullname *editor,
+               const gchar *field)
 {
 	GtkWidget *widget = glade_xml_get_widget(editor->gui, field);
 	GtkEntry *entry = NULL;
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index e3c149ac85..c8a427a253 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -164,8 +164,8 @@ static const gchar *address_name [] = {
 };
 
 static struct {
-	EContactField  field;
-	gchar         *pretty_name;
+	EContactField field;
+	const gchar *pretty_name;
 }
 im_service [] =
 {
@@ -183,8 +183,8 @@ im_service [] =
 static const gint im_service_default [] = { 0, 2, 4, 5 };
 
 static struct {
-	gchar *name;
-	gchar *pretty_name;
+	const gchar *name;
+	const gchar *pretty_name;
 }
 common_location [] =
 {
@@ -2032,7 +2032,7 @@ sensitize_address (EContactEditor *editor)
 }
 
 typedef struct {
-	char          *widget_name;
+	const gchar   *widget_name;
 	gint           field_id;      /* EContactField or -1 */
 	gboolean       process_data;  /* If we should extract/fill in contents */
 	gboolean       desensitize_for_read_only;
@@ -3237,7 +3237,7 @@ show_help_cb (GtkWidget *widget, gpointer data)
 }
 
 static GList *
-add_to_tab_order(GList *list, GladeXML *gui, char *name)
+add_to_tab_order(GList *list, GladeXML *gui, const gchar *name)
 {
 	GtkWidget *widget = glade_xml_get_widget(gui, name);
 	return g_list_prepend(list, widget);
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index 418bdbc1ae..926d369b5a 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -250,8 +250,8 @@ clicked_cb (GtkWidget *w, gint button, gpointer closure)
 			email = tmp;
 		}
 
-		e_contact_set (qa->contact, E_CONTACT_FULL_NAME, (char *) name ? name : "");
-		e_contact_set (qa->contact, E_CONTACT_EMAIL_1,   (char *) email ? email : "");
+		e_contact_set (qa->contact, E_CONTACT_FULL_NAME, (gpointer) (name ? name : ""));
+		e_contact_set (qa->contact, E_CONTACT_EMAIL_1,   (gpointer) (email ? email : ""));
 
 		g_free (name);
 		g_free (email);
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 80fb7514a1..212c1bbd7a 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -130,7 +130,7 @@ enum {
 };
 
 static GtkTargetEntry targets[] = {
-	{ VCARD_TYPE, 0, TARGET_TYPE_VCARD },
+	{ (gchar *) VCARD_TYPE, 0, TARGET_TYPE_VCARD },
 };
 
 static gpointer parent_class;
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c
index adc6938c8d..7747669f24 100644
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ b/addressbook/gui/merging/eab-contact-compare.c
@@ -46,7 +46,7 @@ combine_comparisons (EABContactMatchType prev,
    sucky way like this.  But it can be fixed later. */
 
 /* This is very Anglocentric. */
-static gchar *name_synonyms[][2] = {
+static const gchar *name_synonyms[][2] = {
 	{ "jon", "john" },   /* Ah, the hacker's perogative */
 	{ "joseph", "joe" },
 	{ "robert", "bob" },
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 9fdb15eac9..fe39c029e0 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -135,8 +135,8 @@ typedef struct EABSearchBarItem {
 }EABSearchBarItem;
 
 static GtkTargetEntry drag_types[] = {
-	{ SOURCE_VCARD_TYPE, 0, DND_TARGET_TYPE_SOURCE_VCARD },
-	{ VCARD_TYPE, 0, DND_TARGET_TYPE_VCARD }
+	{ (gchar *) SOURCE_VCARD_TYPE, 0, DND_TARGET_TYPE_SOURCE_VCARD },
+	{ (gchar *) VCARD_TYPE, 0, DND_TARGET_TYPE_VCARD }
 };
 static const int num_drag_types = sizeof (drag_types) / sizeof (drag_types[0]);
 
@@ -929,29 +929,29 @@ new_list (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static EPopupItem eabv_popup_items[] = {
-	{ E_POPUP_ITEM, "05.open", N_("_Open"), open_contact, NULL, NULL, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_BAR, "10.bar" },
-	{ E_POPUP_ITEM, "10.new",  N_("_New Contact..."), new_card, NULL, "contact-new", 0, EAB_POPUP_SELECT_EDITABLE},
-	{ E_POPUP_ITEM, "15.newlist", N_("New Contact _List..."), new_list, NULL, "stock_contact-list", 0, EAB_POPUP_SELECT_EDITABLE },
-
-	{ E_POPUP_BAR, "20.bar" },
-	{ E_POPUP_ITEM, "30.saveas", N_("_Save as vCard..."), save_as, NULL, "document-save-as", 0, EAB_POPUP_SELECT_ANY },
-	{ E_POPUP_ITEM, "40.forward", N_("_Forward Contact"), send_as, NULL, "mail-forward", EAB_POPUP_SELECT_ONE },
-	{ E_POPUP_ITEM, "40.forward", N_("_Forward Contacts"), send_as, NULL, "mail-forward", EAB_POPUP_SELECT_MANY },
-	{ E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contact"), send_to, NULL, "mail-message-new", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_CONTACT },
-	{ E_POPUP_ITEM, "50.mailto", N_("Send _Message to List"), send_to, NULL, "mail-message-new", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_LIST },
-	{ E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contacts"), send_to, NULL, "mail-message-new", EAB_POPUP_SELECT_MANY|EAB_POPUP_SELECT_EMAIL },
-	{ E_POPUP_ITEM, "60.print", N_("_Print"), print, NULL, "document-print", 0, EAB_POPUP_SELECT_ANY },
-
-	{ E_POPUP_BAR, "70.bar" },
-	{ E_POPUP_ITEM, "80.copyto", N_("Cop_y to Address Book..."), copy_to_folder, NULL, NULL, 0, EAB_POPUP_SELECT_ANY },
-	{ E_POPUP_ITEM, "90.moveto", N_("Mo_ve to Address Book..."), move_to_folder, NULL, NULL, 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE },
-
-	{ E_POPUP_BAR, "a0.bar" },
-	{ E_POPUP_ITEM, "b0.cut", N_("Cu_t"), cut, NULL, "edit-cut", 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "c0.copy", N_("_Copy"), copy, NULL, "edit-copy", 0, EAB_POPUP_SELECT_ANY },
-	{ E_POPUP_ITEM, "d0.paste", N_("P_aste"), paste, NULL, "edit-paste", 0, EAB_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "e0.delete", N_("_Delete"), delete, NULL, "edit-delete", 0, EAB_POPUP_SELECT_EDITABLE|EAB_POPUP_SELECT_ANY },
+	{ E_POPUP_ITEM, (gchar *) "05.open", (gchar *) N_("_Open"), open_contact, NULL, NULL, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_BAR, (gchar *) "10.bar" },
+	{ E_POPUP_ITEM, (gchar *) "10.new",  (gchar *) N_("_New Contact..."), new_card, NULL, (gchar *) "contact-new", 0, EAB_POPUP_SELECT_EDITABLE},
+	{ E_POPUP_ITEM, (gchar *) "15.newlist", (gchar *) N_("New Contact _List..."), new_list, NULL, (gchar *) "stock_contact-list", 0, EAB_POPUP_SELECT_EDITABLE },
+
+	{ E_POPUP_BAR, (gchar *) "20.bar" },
+	{ E_POPUP_ITEM, (gchar *) "30.saveas", (gchar *) N_("_Save as vCard..."), save_as, NULL, (gchar *) "document-save-as", 0, EAB_POPUP_SELECT_ANY },
+	{ E_POPUP_ITEM, (gchar *) "40.forward", (gchar *) N_("_Forward Contact"), send_as, NULL, (gchar *) "mail-forward", EAB_POPUP_SELECT_ONE },
+	{ E_POPUP_ITEM, (gchar *) "40.forward", (gchar *) N_("_Forward Contacts"), send_as, NULL, (gchar *) "mail-forward", EAB_POPUP_SELECT_MANY },
+	{ E_POPUP_ITEM, (gchar *) "50.mailto", (gchar *) N_("Send _Message to Contact"), send_to, NULL, (gchar *) "mail-message-new", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_CONTACT },
+	{ E_POPUP_ITEM, (gchar *) "50.mailto", (gchar *) N_("Send _Message to List"), send_to, NULL, (gchar *) "mail-message-new", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_LIST },
+	{ E_POPUP_ITEM, (gchar *) "50.mailto", (gchar *) N_("Send _Message to Contacts"), send_to, NULL, (gchar *) "mail-message-new", EAB_POPUP_SELECT_MANY|EAB_POPUP_SELECT_EMAIL },
+	{ E_POPUP_ITEM, (gchar *) "60.print", (gchar *) N_("_Print"), print, NULL, (gchar *) "document-print", 0, EAB_POPUP_SELECT_ANY },
+
+	{ E_POPUP_BAR, (gchar *) "70.bar" },
+	{ E_POPUP_ITEM, (gchar *) "80.copyto", (gchar *) N_("Cop_y to Address Book..."), copy_to_folder, NULL, NULL, 0, EAB_POPUP_SELECT_ANY },
+	{ E_POPUP_ITEM, (gchar *) "90.moveto", (gchar *) N_("Mo_ve to Address Book..."), move_to_folder, NULL, NULL, 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE },
+
+	{ E_POPUP_BAR, (gchar *) "a0.bar" },
+	{ E_POPUP_ITEM, (gchar *) "b0.cut", (gchar *) N_("Cu_t"), cut, NULL, (gchar *) "edit-cut", 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, (gchar *) "c0.copy", (gchar *) N_("_Copy"), copy, NULL, (gchar *) "edit-copy", 0, EAB_POPUP_SELECT_ANY },
+	{ E_POPUP_ITEM, (gchar *) "d0.paste", (gchar *) N_("P_aste"), paste, NULL, (gchar *) "edit-paste", 0, EAB_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, (gchar *) "e0.delete", (gchar *) N_("_Delete"), delete, NULL, (gchar *) "edit-delete", 0, EAB_POPUP_SELECT_EDITABLE|EAB_POPUP_SELECT_ANY },
 };
 
 static void
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index ccf3ecc6f9..756a019d9f 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -69,8 +69,8 @@ enum DndTargetType {
 #define VCARD_LIST_TYPE "text/x-vcard"
 #define SOURCE_VCARD_LIST_TYPE "text/x-source-vcard"
 static GtkTargetEntry drag_types[] = {
-	{ SOURCE_VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_SOURCE_VCARD_LIST },
-	{ VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_VCARD_LIST }
+	{ (gchar *) SOURCE_VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_SOURCE_VCARD_LIST },
+	{ (gchar *) VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_VCARD_LIST }
 };
 static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]);
 
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index c2cf1d7a41..10a406edbf 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -91,8 +91,8 @@ enum {
 };
 
 static struct {
-	gchar *name;
-	gchar *pretty_name;
+	const gchar *name;
+	const gchar *pretty_name;
 }
 common_location [] =
 {
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index cb605ecf05..6cec0b9eb7 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -49,8 +49,8 @@ struct _EABContactDisplayPrivate {
 };
 
 static struct {
-	gchar *name;
-	gchar *pretty_name;
+	const gchar *name;
+	const gchar *pretty_name;
 }
 common_location [] =
 {
@@ -166,10 +166,10 @@ eab_selection_clear_event(GtkWidget *widget, GdkEventSelection *event, EABContac
 }
 
 static EPopupItem eab_uri_popups[] = {
-	{ E_POPUP_ITEM, "05.open", N_("_Open Link in Browser"), eab_uri_popup_link_open, NULL, NULL, EAB_POPUP_URI_NOT_MAILTO },
-        { E_POPUP_ITEM, "10.copy", N_("_Copy Link Location"), eab_uri_popup_link_copy, NULL, "edit-copy", EAB_POPUP_URI_NOT_MAILTO },
-        { E_POPUP_ITEM, "15.send", N_("_Send New Message To..."), eab_uri_popup_address_send, NULL, "mail-message-new", EAB_POPUP_URI_MAILTO},
-	{ E_POPUP_ITEM, "20.copy", N_("Copy _Email Address"), eab_uri_popup_email_address_copy, NULL, "edit-copy", EAB_POPUP_URI_MAILTO},
+	{ E_POPUP_ITEM, (gchar *) "05.open", (gchar *) N_("_Open Link in Browser"), eab_uri_popup_link_open, NULL, NULL, EAB_POPUP_URI_NOT_MAILTO },
+        { E_POPUP_ITEM, (gchar *) "10.copy", (gchar *) N_("_Copy Link Location"), eab_uri_popup_link_copy, NULL, (gchar *) "edit-copy", EAB_POPUP_URI_NOT_MAILTO },
+        { E_POPUP_ITEM, (gchar *) "15.send", (gchar *) N_("_Send New Message To..."), eab_uri_popup_address_send, NULL, (gchar *) "mail-message-new", EAB_POPUP_URI_MAILTO},
+	{ E_POPUP_ITEM, (gchar *) "20.copy", (gchar *) N_("Copy _Email Address"), eab_uri_popup_email_address_copy, NULL, (gchar *) "edit-copy", EAB_POPUP_URI_MAILTO},
         };
 
 
@@ -528,7 +528,8 @@ render_contact (GtkHTMLStream *html_stream, EContact *contact)
 #ifdef HANDLE_MAILTO_INTERNALLY
 	int email_num = 0;
 #endif
-	char *nl, *nick=NULL;
+	const gchar *nl;
+	char *nick=NULL;
 
 	gtk_html_stream_printf (html_stream, "<table border=\"0\">");
 
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 15f03c6c8b..14285cf9b1 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -85,7 +85,7 @@ eab_error_dialog (const char *msg, EBookStatus status)
 {
 	const char *status_str;
 
-	if (status < 0 || status >= G_N_ELEMENTS (status_to_string))
+	if (status >= G_N_ELEMENTS (status_to_string))
 		status_str = "Other error";
 	else
 		status_str = status_to_string [status];
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c
index c699662b5c..b5c9f7f8ce 100644
--- a/addressbook/importers/evolution-csv-importer.c
+++ b/addressbook/importers/evolution-csv-importer.c
@@ -68,7 +68,7 @@ static char delimiter;
 static void csv_import_done(CSVImporter *gci);
 
 typedef struct {
-	char *csv_attribute;
+	const gchar *csv_attribute;
 	EContactField contact_field;
 #define FLAG_HOME_ADDRESS  0x01
 #define FLAG_WORK_ADDRESS  0x02
@@ -704,7 +704,7 @@ csv_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
 	return vbox;
 }
 
-static char *supported_extensions[4] = {
+static const gchar *supported_extensions[4] = {
 	".csv", ".tab" , ".txt", NULL
 };
 
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
index 2f7b2cced9..b0380cf227 100644
--- a/addressbook/importers/evolution-ldif-importer.c
+++ b/addressbook/importers/evolution-ldif-importer.c
@@ -73,7 +73,7 @@ static void ldif_import_done(LDIFImporter *gci);
 
 
 static struct {
-	char *ldif_attribute;
+	const gchar *ldif_attribute;
 	EContactField contact_field;
 #define FLAG_HOME_ADDRESS	0x01
 #define FLAG_WORK_ADDRESS 	0x02
@@ -556,7 +556,7 @@ ldif_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
 	return vbox;
 }
 
-static char *supported_extensions[2] = {
+static const gchar *supported_extensions[2] = {
 	".ldif", NULL
 };
 
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index c194f2705e..cd22b43380 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -7,8 +7,6 @@ ecps_DATA  =				\
 INCLUDES =					\
 	-DG_LOG_DOMAIN=\"addressbook-printing\"	\
 	-I$(top_srcdir)/addressbook		\
-	-I$(top_srcdir)/addressbook/backend	\
-	-I$(top_builddir)/addressbook/backend	\
 	-I$(top_srcdir)				\
         -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
 	-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\"	\
diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c
index 3c02834de3..e871eb6270 100644
--- a/addressbook/printing/test-print.c
+++ b/addressbook/printing/test-print.c
@@ -36,10 +36,10 @@ main (int argc, char *argv[])
 
 	glade_init ();
 
-	shown_fields = g_list_append (shown_fields, "First field");
-	shown_fields = g_list_append (shown_fields, "Second field");
-	shown_fields = g_list_append (shown_fields, "Third field");
-	shown_fields = g_list_append (shown_fields, "Fourth field");
+	shown_fields = g_list_append (shown_fields, (gpointer) "First field");
+	shown_fields = g_list_append (shown_fields, (gpointer) "Second field");
+	shown_fields = g_list_append (shown_fields, (gpointer) "Third field");
+	shown_fields = g_list_append (shown_fields, (gpointer) "Fourth field");
 
 	/* does nothing */
 	e_contact_print (NULL, NULL, NULL, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG);
diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c
index 417214691b..b7ccf7c643 100644
--- a/addressbook/tools/evolution-addressbook-export-list-cards.c
+++ b/addressbook/tools/evolution-addressbook-export-list-cards.c
@@ -146,7 +146,7 @@ struct _EContactCSVFieldData
 {
 	gint csv_field;
 	gint contact_field;
-	gchar *csv_name;
+	const gchar *csv_name;
 	EContactCSVDataType data_type;
 };
 
@@ -245,7 +245,6 @@ gchar *escape_string (gchar * orig);
 int output_n_cards_file (FILE * outputfile, GList *contacts, int size, int begin_no, CARD_FORMAT format);
 static void fork_to_background (void);
 void set_pre_defined_field (GSList ** pre_defined_fields);
-guint action_list_cards_init (ActionContext * p_actctx);
 
 
 /* function declarations*/
diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am
index 0966284060..ce5d6c35d7 100644
--- a/addressbook/util/Makefile.am
+++ b/addressbook/util/Makefile.am
@@ -5,7 +5,6 @@ INCLUDES =						\
 	-DLIBDIR=\"$(libdir)\"				\
 	-DG_LOG_DOMAIN=\"EBook\"			\
 	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/camel				\
 	-I$(top_builddir)/shell				\
 	-I$(top_srcdir)/shell				\
         $(EVOLUTION_ADDRESSBOOK_CFLAGS)