Set the proper parent class for window classes

[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 ea9a00d..984f160 100644 (file)
--- a/src/widgets/modest-msg-edit-window.c
+++ b/src/widgets/modest-msg-edit-window.c
@@ -354,7 +354,7 @@ struct _ModestMsgEditWindowPrivate {
                                                     MODEST_TYPE_MSG_EDIT_WINDOW, \
                                                     ModestMsgEditWindowPrivate))
 /* globals */
-static GtkWindowClass *parent_class = NULL;
+static ModestWindowParentClass *parent_class = NULL;
 
 /* uncomment the following if you have defined any signals */
 /* static guint signals[LAST_SIGNAL] = {0}; */
@@ -1081,12 +1081,6 @@ init_window (ModestMsgEditWindow *obj)
 
        gtk_box_pack_start (GTK_BOX (window_box), priv->scrollable, TRUE, TRUE, 0);
 
-       /* Set window icon */
-       window_icon = modest_platform_get_icon (MODEST_APP_MSG_EDIT_ICON, MODEST_ICON_SIZE_BIG);
-       if (window_icon) {
-               gtk_window_set_icon (GTK_WINDOW (obj), window_icon);
-               g_object_unref (window_icon);
-       }
 }
 
 static void
@@ -1402,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));
@@ -1537,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);
@@ -4747,41 +4747,54 @@ emit_open_addressbook (GtkButton *button,
 }
 
 static GtkWidget *
-_create_addressbook_box (GtkSizeGroup *title_size_group, GtkSizeGroup *value_size_group,
-                        const gchar *label, GtkWidget *control)
+_create_addressbook_box (GtkSizeGroup *title_size_group,
+                        GtkSizeGroup *value_size_group,
+                        const gchar *label,
+                        GtkWidget *control)
 {
        GtkWidget *abook_button;
        GtkWidget *align;
        GtkWidget *box;
-       GtkWidget *label_widget;
+       GtkWidget *label_widget;
 
        box = gtk_hbox_new (FALSE, 0);
 
-       align = gtk_alignment_new (0.0, 0.0, 1.0, 0.0);
+       align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+#ifndef MODEST_TOOLKIT_HILDON2
+       gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
+#else
        gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, 0, MODEST_MARGIN_DEFAULT);
+#endif
 
 #ifdef MODEST_TOOLKIT_HILDON2
-       abook_button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT);
+        abook_button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT);
 #else
-       abook_button = gtk_button_new ();
+        abook_button = gtk_button_new ();
 #endif
        label_widget = gtk_label_new (label);
        gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.5);
-       gtk_container_add (GTK_CONTAINER (abook_button), label_widget);
 
-       gtk_container_add (GTK_CONTAINER (align), abook_button);
-       gtk_widget_set_size_request (label_widget, 148 - MODEST_MARGIN_DOUBLE, -1);
+        gtk_container_add (GTK_CONTAINER (abook_button), label_widget);
+
+        gtk_container_add (GTK_CONTAINER (align), abook_button);
+#ifdef MODEST_TOOLKIT_HILDON2
+        gtk_widget_set_size_request (label_widget, 148 - MODEST_MARGIN_DOUBLE, -1);
+#endif
        gtk_box_pack_start (GTK_BOX (box), align, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (box), control, TRUE, TRUE, 0);
        if (title_size_group)
+#ifdef MODEST_TOOLKIT_HILDON2
                gtk_size_group_add_widget (title_size_group, label_widget);
+#else
+               gtk_size_group_add_widget (title_size_group, abook_button);
+#endif
        if (value_size_group)
                gtk_size_group_add_widget (value_size_group, control);
 
-       g_signal_connect (G_OBJECT (abook_button), "clicked",
-                         G_CALLBACK (emit_open_addressbook), control);
-  
-       return box;  
+        g_signal_connect (G_OBJECT (abook_button), "clicked",
+                          G_CALLBACK (emit_open_addressbook), control);
+
+       return box;
 }
 
 static void