[PATCH] rename recipient to address

[Guido Guenther <agx sigxcpu org>]

so setting either sender or recipient causes no confusion
---
 src/tmut-folder-view.c |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/tmut-folder-view.c b/src/tmut-folder-view.c
index acf5538..70eb025 100644
--- a/src/tmut-folder-view.c
+++ b/src/tmut-folder-view.c
@@ -522,17 +522,17 @@ header_view_compact_header_cell_data (GtkTreeViewColumn *column,  GtkCellRendere
 	gchar *subject = NULL;
 	gchar *header = NULL;
 	time_t date;
-	GtkCellRenderer *recipient_cell, *date_or_status_cell, *subject_cell,
-		*recipient_box, *subject_box = NULL;
+	GtkCellRenderer *address_cell, *date_or_status_cell, *subject_cell,
+		*address_box, *subject_box = NULL;
 	TnyHeader *msg_header = NULL;
 	gchar *display_date = NULL, *tmp_date = NULL;
 	TnyHeaderFlags prio = 0;
 
-	recipient_box = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (renderer), "recpt-box-renderer"));
+	address_box = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (renderer), "address-box-renderer"));
 	subject_box = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (renderer), "subject-box-renderer"));
 	subject_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (subject_box), "subject-renderer"));
-	recipient_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (recipient_box), "recipient-renderer"));
-	date_or_status_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (recipient_box), "date-renderer"));
+	address_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (address_box), "address-renderer"));
+	date_or_status_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (address_box), "date-renderer"));
 
 	gtk_tree_model_get (tree_model, iter,
 			TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
@@ -558,7 +558,7 @@ header_view_compact_header_cell_data (GtkTreeViewColumn *column,  GtkCellRendere
 			address);
 	g_free (address);
 
-	g_object_set (G_OBJECT (recipient_cell),
+	g_object_set (G_OBJECT (address_cell),
 			"markup", header, NULL);
 	g_free (header);
 
@@ -587,8 +587,8 @@ tmut_folder_view_instance_init (GTypeInstance *instance, gpointer g_class)
 	GtkTreeSelection *select;
 	GtkWidget *widget, *sw;
 
-	GtkCellRenderer *renderer_compact_header, *renderer_recpt_box, 
-		*renderer_subject, *renderer_subject_box, *renderer_recpt,
+	GtkCellRenderer *renderer_compact_header, *renderer_addr_box, 
+		*renderer_subject, *renderer_subject_box, *renderer_addr,
 		*renderer_compact_date_or_status;
 
 	priv->account_store = NULL;
@@ -621,31 +621,31 @@ tmut_folder_view_instance_init (GTypeInstance *instance, gpointer g_class)
 
 	renderer_compact_header = modest_vbox_cell_renderer_new ();
 	renderer_subject_box = modest_hbox_cell_renderer_new ();
-	renderer_recpt_box = modest_hbox_cell_renderer_new ();
-	renderer_recpt = gtk_cell_renderer_text_new ();
+	renderer_addr_box = modest_hbox_cell_renderer_new ();
+	renderer_addr = gtk_cell_renderer_text_new ();
 	renderer_subject = gtk_cell_renderer_text_new ();
 	renderer_compact_date_or_status  = gtk_cell_renderer_text_new ();
 
 	modest_vbox_cell_renderer_append (MODEST_VBOX_CELL_RENDERER (renderer_compact_header), renderer_subject_box, FALSE);
-	modest_vbox_cell_renderer_append (MODEST_VBOX_CELL_RENDERER (renderer_compact_header), renderer_recpt_box, FALSE);
+	modest_vbox_cell_renderer_append (MODEST_VBOX_CELL_RENDERER (renderer_compact_header), renderer_addr_box, FALSE);
 	modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_subject_box), renderer_subject, TRUE);
-	modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_recpt, TRUE);
-	modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_compact_date_or_status, FALSE);
+	modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_addr_box), renderer_addr, TRUE);
+	modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_addr_box), renderer_compact_date_or_status, FALSE);
 
 	g_object_set_data (G_OBJECT (renderer_compact_header), "subject-box-renderer", renderer_subject_box);
-	g_object_set_data (G_OBJECT (renderer_compact_header), "recpt-box-renderer", renderer_recpt_box);
+	g_object_set_data (G_OBJECT (renderer_compact_header), "address-box-renderer", renderer_addr_box);
 	g_object_set_data (G_OBJECT (renderer_subject_box), "subject-renderer", renderer_subject);
-	g_object_set_data (G_OBJECT (renderer_recpt_box), "recipient-renderer", renderer_recpt);
-	g_object_set_data (G_OBJECT (renderer_recpt_box), "date-renderer", renderer_compact_date_or_status);
+	g_object_set_data (G_OBJECT (renderer_addr_box), "address-renderer", renderer_addr);
+	g_object_set_data (G_OBJECT (renderer_addr_box), "date-renderer", renderer_compact_date_or_status);
 
 	g_object_set (G_OBJECT (renderer_subject_box), "yalign", 0.0, NULL);
 	gtk_cell_renderer_set_fixed_size (renderer_subject_box, -1, 15);
-	gtk_cell_renderer_set_fixed_size (renderer_recpt_box, -1, 15);
-	g_object_set (G_OBJECT (renderer_recpt_box), "yalign", 0.0, NULL);
+	gtk_cell_renderer_set_fixed_size (renderer_addr_box, -1, 15);
+	g_object_set (G_OBJECT (renderer_addr_box), "yalign", 0.0, NULL);
 
 	g_object_set (G_OBJECT (renderer_subject),
 		"ellipsize", PANGO_ELLIPSIZE_END, "yalign", 0.0, NULL);
-	g_object_set (G_OBJECT (renderer_recpt),
+	g_object_set (G_OBJECT (renderer_addr),
 		"ellipsize", PANGO_ELLIPSIZE_END, "yalign", 0.0, NULL);
 	g_object_set(G_OBJECT(renderer_compact_date_or_status),
 		"xalign", 0.0, "yalign", 0.0, NULL);
-- 
1.5.6.3


--bg08WKrSYDhXBjb5--