From f8730610042229f275a5a294df4c2eb5f225118e Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 26 May 2009 09:18:54 -0400
Subject: Fix compiler warnings in addressbook.

---
 addressbook/gui/contact-editor/e-contact-editor-fullname.c |  9 ++++++---
 addressbook/gui/contact-editor/e-contact-editor.c          | 12 ++++++------
 addressbook/gui/contact-editor/e-contact-quick-add.c       |  4 ++--
 3 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'addressbook/gui/contact-editor')

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);
-- 
cgit v1.2.3