#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,
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;
}
GtkWidget*
modest_details_dialog_new_with_header (GtkWindow *parent,
- TnyHeader *header)
+ TnyHeader *header,
+ gboolean get_size)
{
ModestDetailsDialog *dialog;
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);
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,
0, 0);
}
+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, *subject, *to, *cc;
+ gchar *from = NULL, *subject = NULL, *to = NULL, *cc = NULL, *bcc = NULL;
time_t received, sent;
guint size;
gchar *size_s;
const gchar *date_time_str;
datetime_formatter = modest_datetime_formatter_new ();
-
+
/* Set window title */
gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_message_properties"));
folder = tny_header_get_folder (header);
- folder_type = modest_tny_folder_guess_folder_type (folder);
- g_object_unref (folder);
+ if (folder) {
+ folder_type = modest_tny_folder_guess_folder_type (folder);
+ g_object_unref (folder);
+ } else {
+ folder_type = TNY_FOLDER_TYPE_NORMAL;
+ }
g_return_if_fail (folder_type != TNY_FOLDER_TYPE_INVALID);
-
+
/* Get header data */
from = tny_header_dup_from (header);
to = tny_header_dup_to (header);
subject = tny_header_dup_subject (header);
cc = tny_header_dup_cc (header);
+ 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);
+ subject = g_strdup (_("mail_va_no_subject"));
+ }
/* Add from and subject for all folders */
modest_details_dialog_add_data (self, _("mcen_fi_message_properties_from"), from);
(folder_type != TNY_FOLDER_TYPE_OUTBOX)) {
date_time_str = modest_datetime_formatter_display_long_datetime (datetime_formatter,
received);
-
+
modest_details_dialog_add_data (self, _("mcen_fi_message_properties_received"),
date_time_str);
}
modest_details_dialog_add_data (self, _("mcen_fi_message_properties_sent"),
date_time_str);
}
-
+
/* Set To and CC */
modest_details_dialog_add_data (self, _("mcen_fi_message_properties_to"), to);
if (cc && strlen(cc) > 0)
modest_details_dialog_add_data (self, _("mcen_fi_message_properties_cc"), cc);
+ /* only show cc when it's there */
+ if (bcc && strlen(bcc) > 0) {
+ replace_recipients (&bcc);
+ modest_details_dialog_add_data (self, _("mcen_fi_message_properties_bcc"), bcc);
+ }
+
/* Set size */
- if (size <= 0)
- size_s = g_strdup (_("mcen_va_message_properties_size_noinfo"));
- else
+ 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);
+ modest_details_dialog_add_data (self, _("mcen_fi_message_properties_size"), size_s);
+ g_free (size_s);
+ }
/* Frees */
g_object_unref (datetime_formatter);
g_free (from);
g_free (subject);
g_free (cc);
+ g_free (bcc);
+}
+
+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
{
gchar *count_s, *size_s, *name = NULL;
gchar *tmp = NULL;
- gint size, count;
+ guint size, count;
g_return_if_fail (folder && TNY_IS_FOLDER (folder));
g_return_if_fail (modest_tny_folder_guess_folder_type (folder)
!= TNY_FOLDER_TYPE_INVALID);
-
+
/* Set window title */
gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_folder_properties"));
/* Format count and size */
count_s = g_strdup_printf ("%d", count);
- if (size <= 0)
- size_s = g_strdup (_("mcen_va_message_properties_size_noinfo"));
- else
- size_s = modest_text_utils_get_display_size (size);
+ size_s = modest_text_utils_get_display_size (size);
/* Different names for the local folders */
if (modest_tny_folder_is_local_folder (folder) ||
projects / modest / blobdiff