* Fixes NB#64997, Modest is now able to send an email after removing the trailing...

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

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index cd535c7..5ba8351 100644 (file)
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -743,19 +743,9 @@ init_window (ModestMsgEditWindow *obj)
        gtk_container_add (GTK_CONTAINER (frame), priv->scroll_area);
 
        /* Set window icon */
-       window_icon = modest_platform_get_icon (MODEST_APP_MSG_EDIT_ICON); 
+       window_icon = modest_platform_get_icon (MODEST_APP_MSG_EDIT_ICON, MODEST_ICON_SIZE_BIG); 
        if (window_icon) {
-               /* scale the icon, because it won't be shown unless it's
-                * 64 x 54 -- hildon quirk. this looks a bit ugly now,
-                * so waiting for correctly sized icons, then this scaling
-                * code can disappear -- djcb
-                */
-               GdkPixbuf *scaled =
-                       gdk_pixbuf_scale_simple (window_icon, 64, 54, GDK_INTERP_BILINEAR);
-               if (scaled) {
-                       gtk_window_set_icon (GTK_WINDOW (obj), scaled);
-                       g_object_unref (scaled);
-               }
+               gtk_window_set_icon (GTK_WINDOW (obj), window_icon);
                g_object_unref (window_icon);
        }       
 }
@@ -1737,7 +1727,7 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo
                gchar *markup;
 
                label = gtk_bin_get_child (GTK_BIN (new_size_menuitem));
-               markup = g_strconcat ("<span font_family='Serif'>", gtk_label_get_text (GTK_LABEL (label)), "</span>", NULL);
+               markup = g_strconcat ("<span font_family='Sans'>", gtk_label_get_text (GTK_LABEL (label)), "</span>", NULL);
                gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup);
                g_free (markup);
                g_signal_handlers_block_by_func (G_OBJECT (new_size_menuitem),
@@ -2051,8 +2041,7 @@ modest_msg_edit_window_attach_file_one (
                
                if (gnome_vfs_get_file_info (uri, 
                                             &info, 
-                                            GNOME_VFS_FILE_INFO_GET_MIME_TYPE |
-                                            GNOME_VFS_FILE_INFO_FORCE_SLOW_MIME_TYPE)
+                                            GNOME_VFS_FILE_INFO_GET_MIME_TYPE)
                    == GNOME_VFS_OK)
                        mime_type = gnome_vfs_file_info_get_mime_type (&info);
                mime_part = tny_platform_factory_new_mime_part