Removed trailing whitespaces

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

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 27fbcc3..dd8050a 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -1335,6 +1335,7 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
 
        /* Toolbar */
        parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
+       gtk_toolbar_set_show_arrow (GTK_TOOLBAR (parent_priv->toolbar), FALSE);
        gtk_toolbar_set_icon_size (GTK_TOOLBAR (parent_priv->toolbar), HILDON_ICON_SIZE_FINGER);
        hildon_window_add_toolbar (HILDON_WINDOW (window), GTK_TOOLBAR (parent_priv->toolbar));
 
@@ -1345,6 +1346,7 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        /* font color */
        priv->font_color_toolitem = GTK_WIDGET (gtk_tool_item_new ());
        priv->font_color_button = hildon_color_button_new ();
+       gtk_widget_set_size_request (priv->font_color_button, -1, 48);
        GTK_WIDGET_UNSET_FLAGS (priv->font_color_toolitem, GTK_CAN_FOCUS);
        GTK_WIDGET_UNSET_FLAGS (priv->font_color_button, GTK_CAN_FOCUS);
        gtk_container_add (GTK_CONTAINER (priv->font_color_toolitem), priv->font_color_button);
@@ -1367,6 +1369,7 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
                              size_text,"</span>", NULL);
        gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup);
        g_free (markup);
+       hildon_helper_set_logical_font (priv->size_tool_button_label, "LargeSystemFont");
        gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), priv->size_tool_button_label);
        sizes_menu = gtk_menu_new ();
        priv->size_items_group = NULL;
@@ -1395,8 +1398,8 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (tool_item), sizes_menu);
        g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (menu_tool_button_clicked_popup), NULL);
        gtk_toolbar_insert (GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM (tool_item), insert_index);
-       gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE);
-       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
+       gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), FALSE);
+       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), FALSE);
        menu_tool_button_dont_expand (GTK_MENU_TOOL_BUTTON (tool_item));
        priv->font_size_toolitem = tool_item;
 
@@ -1406,6 +1409,7 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        markup = g_strconcat ("<span font_family='", wp_get_font_name(DEFAULT_FONT), "'>Tt</span>", NULL);
        gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup);
        g_free(markup);
+       hildon_helper_set_logical_font (priv->font_tool_button_label, "LargeSystemFont");
        gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), priv->font_tool_button_label);
        fonts_menu = gtk_menu_new ();
        priv->font_items_group = NULL;
@@ -1438,8 +1442,8 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (tool_item), fonts_menu);
        g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (menu_tool_button_clicked_popup), NULL);
        gtk_toolbar_insert (GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM (tool_item), insert_index);
-       gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE);
-       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
+       gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), FALSE);
+       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), FALSE);
        menu_tool_button_dont_expand (GTK_MENU_TOOL_BUTTON (tool_item));
        priv->font_face_toolitem = tool_item;
 
@@ -2434,7 +2438,12 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window,
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
 
        if (att_list == NULL) {
-               att_list = modest_attachments_view_get_selection (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
+               att_list = modest_attachments_view_get_attachments (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
+               if (!modest_maemo_utils_select_attachments (GTK_WINDOW (window), att_list)) {
+                       g_object_unref (att_list);
+                       return;
+               }
+               
        } else {
                g_object_ref (att_list);
        }
@@ -3146,22 +3155,27 @@ modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to
                return FALSE;
        }
 
+       g_object_ref (window);
        if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field),  add_to_addressbook)) {
                modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
+               g_object_unref (window);
                return FALSE;
        }
        if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field),  add_to_addressbook)) {
                modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->cc_field));
+               g_object_unref (window);
                return FALSE;
        }
        if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field), add_to_addressbook)) {
                modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->bcc_field));
+               g_object_unref (window);
                return FALSE;
        }
 
        if (!modest_recpt_editor_has_focus (MODEST_RECPT_EDITOR (priv->cc_field)) &&
            !modest_recpt_editor_has_focus (MODEST_RECPT_EDITOR (priv->bcc_field)))
                modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
+       g_object_unref (window);
 
        return TRUE;