Revert "Add bottom send button in editor. It's only shown when the top button is"

[modest] / src / widgets / modest-msg-edit-window.c

diff --git a/src/widgets/modest-msg-edit-window.c b/src/widgets/modest-msg-edit-window.c
index e042b8d..f33c1f5 100644 (file)
--- a/src/widgets/modest-msg-edit-window.c
+++ b/src/widgets/modest-msg-edit-window.c
@@ -346,6 +346,8 @@ struct _ModestMsgEditWindowPrivate {
        GtkWidget   *brand_icon;
        GtkWidget   *brand_label;
        GtkWidget   *brand_container;
+
+       TnyList     *custom_header_pairs;
 };
 
 #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -475,6 +477,7 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj)
        priv->references = NULL;
        priv->in_reply_to = NULL;
        priv->max_chars_banner = NULL;
+       priv->custom_header_pairs = TNY_LIST (tny_simple_list_new ());
 
        if (!is_wp_text_buffer_started) {
                is_wp_text_buffer_started = TRUE;
@@ -1057,15 +1060,14 @@ init_window (ModestMsgEditWindow *obj)
                                                                               NULL);
        gtk_widget_set_no_show_all (priv->isearch_toolbar, TRUE);
 
-/*     g_signal_connect (G_OBJECT (obj), "key_pressed", G_CALLBACK (on_key_pressed), NULL) */
-
        priv->scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ());
 
        g_object_set (G_OBJECT (priv->scrollable), "horizontal-policy", GTK_POLICY_NEVER, NULL);
-       
+
        main_vbox = gtk_vbox_new  (FALSE, DEFAULT_MAIN_VBOX_SPACING);
        window_align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
-       gtk_alignment_set_padding (GTK_ALIGNMENT (window_align), 0, 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DEFAULT);
+       gtk_alignment_set_padding (GTK_ALIGNMENT (window_align), MODEST_MARGIN_HALF, 0,
+                                  MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DEFAULT);
 
        gtk_box_pack_start (GTK_BOX(main_vbox), priv->header_box, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX(main_vbox), priv->msg_body, TRUE, TRUE, 0);
@@ -1073,14 +1075,14 @@ init_window (ModestMsgEditWindow *obj)
 
        modest_scrollable_add_with_viewport (MODEST_SCROLLABLE (priv->scrollable), window_align);
        gtk_widget_show_all (GTK_WIDGET(priv->scrollable));
-       
+
        window_box = gtk_vbox_new (FALSE, 0);
        gtk_container_add (GTK_CONTAINER(obj), window_box);
 
        gtk_box_pack_start (GTK_BOX (window_box), priv->scrollable, TRUE, TRUE, 0);
 
 }
-       
+
 static void
 modest_msg_edit_window_disconnect_signals (ModestWindow *window)
 {
@@ -1109,6 +1111,8 @@ modest_msg_edit_window_finalize (GObject *obj)
 {
        ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (obj);
 
+       g_object_unref (priv->custom_header_pairs);
+
        if (priv->max_chars_banner) {
                g_object_weak_unref (G_OBJECT (priv->max_chars_banner), (GWeakNotify) max_chars_banner_unref, obj);
                priv->max_chars_banner = FALSE;
@@ -1392,6 +1396,7 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
        TnyFolder *msg_folder;
        gboolean is_html = FALSE;
        gboolean field_view_set;
+       TnyList *orig_header_pairs;
        
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self));
        g_return_if_fail (TNY_IS_MSG (msg));
@@ -1527,6 +1532,11 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
                g_object_unref (msg_folder);
        }
 
+       orig_header_pairs = TNY_LIST (tny_simple_list_new ());
+       tny_mime_part_get_header_pairs (TNY_MIME_PART (msg), orig_header_pairs);
+       modest_msg_edit_window_set_custom_header_pairs (self, orig_header_pairs);
+       g_object_unref (orig_header_pairs);
+
        g_free (to);
        g_free (subject);
        g_free (cc);
@@ -2030,6 +2040,7 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
        g_object_unref (att_iter);
        
        data->priority_flags = priv->priority_flags;
+       data->custom_header_pairs = tny_list_copy (priv->custom_header_pairs);
 
        return data;
 }
@@ -2062,6 +2073,8 @@ modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window,
        g_free (data->account_name);
        g_free (data->references);
        g_free (data->in_reply_to);
+
+       g_object_unref (data->custom_header_pairs);
        
        if (data->draft_msg != NULL) {
                g_object_unref (data->draft_msg);
@@ -4844,3 +4857,17 @@ modest_msg_edit_window_has_pending_addresses (ModestMsgEditWindow *self)
        else
                return TRUE;
 }
+
+void
+modest_msg_edit_window_set_custom_header_pairs (ModestMsgEditWindow *self,
+                                               TnyList *header_pairs)
+{
+       ModestMsgEditWindowPrivate *priv = NULL;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self));
+       g_return_if_fail (TNY_IS_LIST (header_pairs));
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+       g_object_unref (priv->custom_header_pairs);
+       priv->custom_header_pairs = tny_list_copy (header_pairs);
+}