gtk_size_group_add_widget (priv->labels_size_group, label_field);
gtk_box_pack_start (GTK_BOX (priv->headers_vbox), hbox, FALSE, FALSE, 0);
+
gtk_widget_show (hbox);
}
folder = tny_header_get_folder (priv->header);
if (folder) {
- TnyFolderType folder_type;
- folder_type = tny_folder_get_folder_type (folder);
- if (folder_type == TNY_FOLDER_TYPE_NORMAL || folder_type == TNY_FOLDER_TYPE_UNKNOWN) {
- const gchar *fname = tny_folder_get_name (folder);
- folder_type = modest_tny_folder_guess_folder_type_from_name (fname);
- }
+ TnyFolderType folder_type = tny_folder_get_folder_type (folder);
switch (folder_type) {
case TNY_FOLDER_TYPE_DRAFTS:
if (header && G_IS_OBJECT (header))
{
- const gchar *to, *from, *subject, *bcc, *cc;
+ gchar *to, *from, *subject, *bcc, *cc;
GtkWidget *subject_label;
g_object_ref (G_OBJECT (header));
modest_mail_header_view_update_is_outgoing (self);
- to = tny_header_get_to (header);
- from = tny_header_get_from (header);
- subject = tny_header_get_subject (header);
- cc = tny_header_get_cc (header);
- bcc = tny_header_get_bcc (header);
+ to = tny_header_dup_to (header);
+ from = tny_header_dup_from (header);
+ subject = tny_header_dup_subject (header);
+ cc = tny_header_dup_cc (header);
+ bcc = tny_header_dup_bcc (header);
priv->subject_box = gtk_hbox_new (FALSE, 0);
subject_label = gtk_label_new (NULL);
- if (subject)
+ if (subject && (subject[0] != '\0'))
gtk_label_set_text (GTK_LABEL (subject_label), subject);
else
gtk_label_set_text (GTK_LABEL (subject_label), _("mail_va_no_subject"));
gtk_misc_set_alignment (GTK_MISC (subject_label), 0.0, 0.0);
/* TODO: code disabled until we can get real priority information from message */
-/* if (tny_header_get_flags (header) & TNY_HEADER_FLAG_PRIORITY) { */
+/* if (tny_header_get_priority (header)) { */
/* GtkWidget *priority_icon = gtk_image_new_from_icon_name ("qgn_list_messaging_high", GTK_ICON_SIZE_MENU); */
/* gtk_box_pack_start (GTK_BOX (subject_box), priority_icon, FALSE, FALSE, 0); */
/* } */
add_recpt_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_hotfix1"), bcc);
if (priv->is_draft&& from)
add_recpt_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_from"), from);
- modest_mail_header_view_add_custom_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_subject"), priv->subject_box, TRUE, TRUE);
+ modest_mail_header_view_add_custom_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_subject"),
+ priv->subject_box, TRUE, TRUE);
if (priv->is_draft)
- add_date_time_header (MODEST_MAIL_HEADER_VIEW (self), _("fixme_Last saved:"), tny_header_get_date_sent (header));
+ add_date_time_header (MODEST_MAIL_HEADER_VIEW (self), _("mcen_fi_message_properties_created"),
+ tny_header_get_date_sent (header));
else
- add_date_time_header (MODEST_MAIL_HEADER_VIEW (self), _("fixme_Sent:"), tny_header_get_date_sent (header));
+ add_date_time_header (MODEST_MAIL_HEADER_VIEW (self), _("mcen_fi_message_properties_sent"),
+ tny_header_get_date_sent (header));
} else {
gtk_label_set_markup (GTK_LABEL (priv->fromto_label), _("mail_va_from"));
if (from)
modest_recpt_view_set_recipients (MODEST_RECPT_VIEW (priv->fromto_contents), from);
+ if (to)
+ add_recpt_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_to"), to);
if (cc)
add_recpt_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_cc"), cc);
if (bcc)
add_recpt_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_hotfix1"), bcc);
- if (to)
- add_recpt_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_to"), to);
- modest_mail_header_view_add_custom_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_subject"), priv->subject_box, TRUE, TRUE);
- add_date_time_header (MODEST_MAIL_HEADER_VIEW (self), _("fixme_Received:"), tny_header_get_date_received (header));
+ modest_mail_header_view_add_custom_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_subject"),
+ priv->subject_box, TRUE, TRUE);
+ add_date_time_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_date"),
+ tny_header_get_date_received (header));
}
+ g_free (subject);
+ g_free (to);
+ g_free (from);
+ g_free (cc);
+ g_free (bcc);
}
gtk_widget_show_all (GTK_WIDGET (self));
gtk_size_group_add_widget (priv->labels_size_group, priv->fromto_label);
priv->headers_vbox = gtk_vbox_new (FALSE, 0);
+ gtk_container_set_focus_chain (GTK_CONTAINER (priv->headers_vbox), NULL);
g_object_ref (priv->headers_vbox);
expander_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
{
TnyHeaderViewIface *klass = (TnyHeaderViewIface *)g;
- klass->set_header_func = modest_mail_header_view_set_header;
- klass->clear_func = modest_mail_header_view_clear;
+ klass->set_header = modest_mail_header_view_set_header;
+ klass->clear = modest_mail_header_view_clear;
return;
}
g_return_if_fail (MODEST_IS_MAIL_HEADER_VIEW (headers_view));
priv = MODEST_MAIL_HEADER_VIEW_GET_PRIVATE (headers_view);
- priv->priority_flags = flags & (TNY_HEADER_FLAG_HIGH_PRIORITY);
+ priv->priority_flags = flags & TNY_HEADER_FLAG_PRIORITY_MASK ;
- if (priv->priority_flags == 0) {
+ if (priv->priority_flags == TNY_HEADER_FLAG_NORMAL_PRIORITY) {
if (priv->priority_icon != NULL) {
gtk_widget_destroy (priv->priority_icon);
priv->priority_icon = NULL;