X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-details-dialog.c;h=30757c2df30958cf29d224db88185c928773a457;hb=1582b0d179634d2e877641f8bd7e18ce1698ef52;hp=732c59fc557903e5c2f9c681f058850f11f9863e;hpb=14ceb689170405d1176e9916f6e3e03cf4bc4ab5;p=modest

diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c
index 732c59f..30757c2 100644
--- a/src/widgets/modest-details-dialog.c
+++ b/src/widgets/modest-details-dialog.c
@@ -46,11 +46,15 @@
 #include <string.h> /* for strlen */
 
 static void    modest_details_dialog_set_header_default          (ModestDetailsDialog *self,
-								  TnyHeader *header);
+								  TnyHeader *header,
+								  gboolean get_size);
 
 static void    modest_details_dialog_set_folder_default          (ModestDetailsDialog *self,
 								  TnyFolder *foler);
 
+static void    modest_details_dialog_set_message_size_default    (ModestDetailsDialog *self, 
+								  guint message_size);
+
 static void    modest_details_dialog_create_container_default    (ModestDetailsDialog *self);
 
 static void    modest_details_dialog_add_data_default            (ModestDetailsDialog *self,
@@ -90,6 +94,7 @@ modest_details_dialog_class_init (ModestDetailsDialogClass *klass)
 	klass->create_container_func = modest_details_dialog_create_container_default;
 	klass->add_data_func = modest_details_dialog_add_data_default;
 	klass->set_header_func = modest_details_dialog_set_header_default;
+	klass->set_message_size_func = modest_details_dialog_set_message_size_default;
 	klass->set_folder_func = modest_details_dialog_set_folder_default;
 }
 
@@ -100,7 +105,8 @@ modest_details_dialog_init (ModestDetailsDialog *self)
 
 GtkWidget*
 modest_details_dialog_new_with_header (GtkWindow *parent, 
-				       TnyHeader *header)
+				       TnyHeader *header,
+				       gboolean get_size)
 {
 	ModestDetailsDialog *dialog;
 
@@ -112,7 +118,7 @@ modest_details_dialog_new_with_header (GtkWindow *parent,
 							NULL));
 
 	MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->create_container_func (dialog);
-	MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->set_header_func (dialog, header);
+	MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->set_header_func (dialog, header, get_size);
 
 	/* Add close button */
 	gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_close"), GTK_RESPONSE_CLOSE);
@@ -150,6 +156,13 @@ modest_details_dialog_add_data (ModestDetailsDialog *self,
 	MODEST_DETAILS_DIALOG_GET_CLASS (self)->add_data_func (self, label, value);
 }
 
+void
+modest_details_dialog_set_message_size (ModestDetailsDialog *self,
+					guint size)
+{
+	MODEST_DETAILS_DIALOG_GET_CLASS (self)->set_message_size_func (self, size);
+}
+
 static void
 modest_details_dialog_add_data_default (ModestDetailsDialog *self,
 					const gchar *label,
@@ -158,6 +171,7 @@ modest_details_dialog_add_data_default (ModestDetailsDialog *self,
 	ModestDetailsDialogPrivate *priv;
 	guint n_rows = 0;
 	GtkWidget *label_w, *value_w;
+	gchar *secure_value;
 
 	priv = MODEST_DETAILS_DIALOG_GET_PRIVATE (self);
 
@@ -168,12 +182,15 @@ modest_details_dialog_add_data_default (ModestDetailsDialog *self,
 	gtk_misc_set_alignment (GTK_MISC (label_w), 1.0, 0.0);
 	gtk_label_set_justify (GTK_LABEL (label_w), GTK_JUSTIFY_RIGHT);
 
+	/* Create secure value */
+	secure_value = modest_text_utils_get_secure_header (value, "");
+
 	/* Create value */
-	value_w = gtk_label_new (value);
-	gtk_label_set_line_wrap (GTK_LABEL (value_w), TRUE);
-	gtk_label_set_line_wrap_mode (GTK_LABEL (value_w), PANGO_WRAP_WORD_CHAR);
+	value_w = gtk_label_new (secure_value);
+	gtk_label_set_line_wrap ((GtkLabel *) value_w, TRUE);
+	gtk_label_set_line_wrap_mode ((GtkLabel *) value_w, PANGO_WRAP_WORD_CHAR);
 	gtk_misc_set_alignment (GTK_MISC (value_w), 0.0, 0.0);
-	gtk_label_set_justify (GTK_LABEL (value_w), GTK_JUSTIFY_LEFT);
+	gtk_label_set_justify ((GtkLabel *) value_w, GTK_JUSTIFY_LEFT);
 
 	/* Attach label and value */
 	gtk_table_attach (GTK_TABLE (priv->props_table), 
@@ -188,12 +205,26 @@ modest_details_dialog_add_data_default (ModestDetailsDialog *self,
 			  GTK_EXPAND|GTK_FILL, 
 			  GTK_SHRINK|GTK_FILL, 
 			  0, 0);
+
+	g_free (secure_value);
 }
 
+static void 
+replace_recipients (gchar **recipients)
+{
+
+	gchar *result;
+
+	result = modest_text_utils_simplify_recipients (*recipients);
+
+	g_free (*recipients);
+	*recipients = result;
+}
 
 static void
 modest_details_dialog_set_header_default (ModestDetailsDialog *self,
-					  TnyHeader *header)
+					  TnyHeader *header,
+					  gboolean get_size)
 {
 	gchar *from = NULL, *subject = NULL, *to = NULL, *cc = NULL, *bcc = NULL;
 	time_t received, sent;
@@ -227,16 +258,17 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
 	bcc = tny_header_dup_bcc (header);
 	received = tny_header_get_date_received (header);
 	sent = tny_header_get_date_sent (header);
-	size = tny_header_get_message_size (header);
+	if (get_size) {
+		size = tny_header_get_message_size (header);
+	} else {
+		size = -1;
+	}
 
-	if (from == NULL)
-		from = g_strdup ("");
-	if (to == NULL)
-		to = g_strdup ("");
+	replace_recipients (&from);
+	replace_recipients (&to);
+	replace_recipients (&cc);
 	if (subject == NULL)
 		subject = g_strdup ("");
-	if (cc == NULL)
-		cc = g_strdup ("");
 
 	if (!strcmp (subject, "")) {
 		g_free (subject);
@@ -285,13 +317,17 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
 		modest_details_dialog_add_data (self, _("mcen_fi_message_properties_cc"), cc);
 
 	/* only show cc when it's there */
-	if (bcc && strlen(bcc) > 0)
+	if (bcc && strlen(bcc) > 0) {
+		replace_recipients (&bcc);
 		modest_details_dialog_add_data (self, _("mcen_fi_message_properties_bcc"), bcc);
+	}
 
 	/* Set size */
-	size_s = modest_text_utils_get_display_size (size);
-	modest_details_dialog_add_data (self, _("mcen_fi_message_properties_size"), size_s);
-	g_free (size_s);
+	if (get_size) {
+		size_s = modest_text_utils_get_display_size (size);
+		modest_details_dialog_add_data (self, _("mcen_fi_message_properties_size"), size_s);
+		g_free (size_s);
+	}
 
 	/* Frees */
 	g_object_unref (datetime_formatter);
@@ -303,6 +339,17 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
 }
 
 static void
+modest_details_dialog_set_message_size_default (ModestDetailsDialog *self,
+						guint size)
+{
+	gchar *size_s;
+	size_s = modest_text_utils_get_display_size (size);
+	modest_details_dialog_add_data (self, _("mcen_fi_message_properties_size"), size_s);
+	g_free (size_s);
+	gtk_widget_show_all (GTK_WIDGET (self));
+}
+
+static void
 modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
 					  TnyFolder *folder)
 {