Remove autofocus handling with gtk_container in editor
[modest] / src / hildon2 / modest-msg-edit-window.c
index 5314544..4f77d83 100644 (file)
@@ -241,6 +241,9 @@ struct _ModestMsgEditWindowPrivate {
        GtkWidget   *from_field;
        gchar       *last_from_account;
        gchar       *original_account_name;
+
+       gchar       *references;
+       gchar       *in_reply_to;
        
        GtkWidget   *to_field;
        GtkWidget   *cc_field;
@@ -352,19 +355,10 @@ static void
 restore_settings (ModestMsgEditWindow *self)
 {
        ModestConf *conf = NULL;
-       GtkAction *action;
-       ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (self);
 
        conf = modest_runtime_get_conf ();
 
        /* Dim at start clipboard actions */
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CutMenu");
-       gtk_action_set_sensitive (action, FALSE);
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CopyMenu");
-       gtk_action_set_sensitive (action, FALSE);
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/RemoveAttachmentsMenu");
-       gtk_action_set_sensitive (action, FALSE);
-
        modest_widget_memory_restore (conf, G_OBJECT(self), MODEST_CONF_EDIT_WINDOW_KEY);
 }
 
@@ -434,6 +428,9 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj)
        priv->font_dialog = NULL;
        priv->app_menu = NULL;
 
+       priv->references = NULL;
+       priv->in_reply_to = NULL;
+
        if (!is_wp_text_buffer_started) {
                is_wp_text_buffer_started = TRUE;
                wp_text_buffer_library_init ();
@@ -494,6 +491,10 @@ scroll_drag_timeout (gpointer userdata)
        ModestMsgEditWindow *win = (ModestMsgEditWindow *) userdata;
        ModestMsgEditWindowPrivate *priv;
 
+       /* It could happen that the window was already closed */
+       if (!GTK_WIDGET_VISIBLE (win))
+               return FALSE;
+
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(win);
 
        correct_scroll_without_drag_check (win, TRUE);
@@ -514,6 +515,10 @@ correct_scroll_without_drag_check_idle (gpointer userdata)
        GtkTextMark *insert;
        GtkAdjustment *vadj;
 
+       /* It could happen that the window was already closed */
+       if (!GTK_WIDGET_VISIBLE (w))
+               return FALSE;
+
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w);
 
        insert = gtk_text_buffer_get_insert (priv->text_buffer);
@@ -547,8 +552,10 @@ correct_scroll_without_drag_check (ModestMsgEditWindow *w, gboolean only_if_focu
                return;
        }
 
-       priv->correct_scroll_idle = g_idle_add ((GSourceFunc) correct_scroll_without_drag_check_idle,
-                                               (gpointer) w);
+       priv->correct_scroll_idle = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
+                                                    (GSourceFunc) correct_scroll_without_drag_check_idle,
+                                                    g_object_ref (w),
+                                                    g_object_unref);
 }
 
 static void
@@ -559,8 +566,11 @@ correct_scroll (ModestMsgEditWindow *w)
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w);
        if (gtk_grab_get_current () == priv->msg_body) {
                if (priv->scroll_drag_timeout_id == 0) {
-                       priv->scroll_drag_timeout_id = g_timeout_add (500, (GSourceFunc) scroll_drag_timeout,
-                                                                     (gpointer) w);
+                       priv->scroll_drag_timeout_id = g_timeout_add_full (G_PRIORITY_DEFAULT,
+                                                                          500,
+                                                                          (GSourceFunc) scroll_drag_timeout,
+                                                                          g_object_ref (w),
+                                                                          g_object_unref);
                }
                return;
        }
@@ -878,8 +888,6 @@ init_window (ModestMsgEditWindow *obj)
        gtk_container_add (GTK_CONTAINER (window_align), main_vbox);
 
        hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (priv->pannable), window_align);
-       gtk_container_set_focus_vadjustment (GTK_CONTAINER (main_vbox), 
-                                            hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (priv->pannable)));
        gtk_widget_show_all (GTK_WIDGET(priv->pannable));
        
        window_box = gtk_vbox_new (FALSE, 0);
@@ -970,6 +978,8 @@ modest_msg_edit_window_finalize (GObject *obj)
                g_free (priv->original_account_name);
        g_free (priv->msg_uid);
        g_free (priv->last_search);
+       g_free (priv->references);
+       g_free (priv->in_reply_to);
        g_object_unref (priv->faces_model);
        g_object_unref (priv->sizes_model);
        g_object_unref (priv->attachments);
@@ -981,13 +991,38 @@ modest_msg_edit_window_finalize (GObject *obj)
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
+static void
+pixbuf_size_prepared (GdkPixbufLoader *loader,
+                     gint width,
+                     gint height,
+                     ModestMsgEditWindow *self)
+{
+       gint new_height, new_width;
+       gboolean set_size;
+       
+       new_height = height;
+       new_width = width;
+       set_size = FALSE;
+
+       if (width > IMAGE_MAX_WIDTH) {
+               new_height = height * IMAGE_MAX_WIDTH / width;
+               new_width = IMAGE_MAX_WIDTH;
+       }
+
+       gdk_pixbuf_loader_set_size (loader, new_width, new_height);
+}
+
 static GdkPixbuf *
-pixbuf_from_stream (TnyStream *stream, const gchar *mime_type, guint64 *stream_size)
+pixbuf_from_stream (TnyStream *stream,
+                   const gchar *mime_type,
+                   guint64 *stream_size,
+                   ModestMsgEditWindow *self)
 {
        GdkPixbufLoader *loader;
        GdkPixbuf *pixbuf;
        guint64 size;
-       
+       GError *error = NULL;
+
        size = 0;
 
        loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, NULL);
@@ -997,25 +1032,32 @@ pixbuf_from_stream (TnyStream *stream, const gchar *mime_type, guint64 *stream_s
                        *stream_size = 0;
                return NULL;
        }
+       g_signal_connect (G_OBJECT (loader), "size-prepared", G_CALLBACK (pixbuf_size_prepared), self);
+
+       hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), TRUE);
 
        tny_stream_reset (TNY_STREAM (stream));
        while (!tny_stream_is_eos (TNY_STREAM (stream))) {
-               GError *error = NULL;
                unsigned char read_buffer[128];
                gint readed;
                readed = tny_stream_read (TNY_STREAM (stream), (char *) read_buffer, 128);
                size += readed;
                if (!gdk_pixbuf_loader_write (loader, read_buffer, readed, &error)) {
-                       if (error)
-                               g_error_free (error);
                        break;
                }
+               /* Allow some UI responsiveness */
+               while (gtk_events_pending ())
+                       gtk_main_iteration ();
        }
+       hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), FALSE);
 
+       gdk_pixbuf_loader_close (loader, &error);
+
+       if (error)
+               g_error_free (error);
        pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
        if (pixbuf) 
                g_object_ref (pixbuf);
-       gdk_pixbuf_loader_close (loader, NULL);
        g_object_unref (loader);
 
        if (!pixbuf)
@@ -1045,6 +1087,7 @@ replace_with_images (ModestMsgEditWindow *self, TnyList *attachments)
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
 
+       g_object_ref (self);
        for (iter = tny_list_create_iterator (attachments);
             !tny_iterator_is_done (iter);
             tny_iterator_next (iter)) {
@@ -1054,7 +1097,7 @@ replace_with_images (ModestMsgEditWindow *self, TnyList *attachments)
                if ((cid != NULL)&&(mime_type != NULL)) {
                        guint64 stream_size;
                        TnyStream *stream = tny_mime_part_get_decoded_stream (part);
-                       GdkPixbuf *pixbuf = pixbuf_from_stream (stream, mime_type, &stream_size);
+                       GdkPixbuf *pixbuf = pixbuf_from_stream (stream, mime_type, &stream_size, self);
 
 
                        g_object_unref (stream);
@@ -1069,6 +1112,7 @@ replace_with_images (ModestMsgEditWindow *self, TnyList *attachments)
                g_object_unref (part);
        }
        g_object_unref (iter);
+       g_object_unref (self);
 }
 
 static void
@@ -1079,7 +1123,7 @@ get_related_images (ModestMsgEditWindow *self, TnyMsg *msg)
        ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
 
        content_type = tny_mime_part_get_content_type (TNY_MIME_PART (msg));
-       
+
        if (content_type && !g_strcasecmp (content_type, "multipart/related")) {
                parent = g_object_ref (msg);
        } else if (content_type && !g_strcasecmp (content_type, "multipart/mixed")) {
@@ -1174,6 +1218,8 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
        cc      = tny_header_dup_cc (header);
        bcc     = tny_header_dup_bcc (header);
        subject = tny_header_dup_subject (header);
+
+       modest_tny_msg_get_references (TNY_MSG (msg), NULL, &(priv->references), &(priv->in_reply_to));
        priority_flags = tny_header_get_priority (header);
 
        if (to)
@@ -1294,26 +1340,6 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
        g_free (bcc);
 }
 
-static void
-menu_tool_button_dont_expand (GtkMenuToolButton *item)
-{
-       GtkWidget *box;
-       GList *item_children, *node;
-
-       box = gtk_bin_get_child (GTK_BIN (item));
-       gtk_box_set_homogeneous (GTK_BOX (box), TRUE);
-       item_children = gtk_container_get_children (GTK_CONTAINER (box));
-       
-       for (node = item_children; node != NULL; node = g_list_next (node)) {
-               gtk_box_set_child_packing (GTK_BOX (box), GTK_WIDGET (node->data), TRUE, TRUE, 0, GTK_PACK_START);
-               if (GTK_IS_TOGGLE_BUTTON (node->data))
-                       gtk_button_set_alignment (GTK_BUTTON (node->data), 0.0, 0.5);
-               else if (GTK_IS_BUTTON (node->data))
-                       gtk_button_set_alignment (GTK_BUTTON (node->data), 1.0, 0.5);
-       }
-       g_list_free (item_children);
-}
-
 
 static void
 modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
@@ -1329,11 +1355,8 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        GtkWidget *sizes_menu;
        GtkWidget *fonts_menu;
        gchar *markup;
-       gchar ldots[8];
-       gint ldots_len;
-
-       ldots_len = g_unichar_to_utf8 (0x2026, ldots);
-       ldots[ldots_len] = '\0';
+       GtkWidget *arrow;
+       GtkWidget *hbox;
 
        /* Toolbar */
        parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
@@ -1366,17 +1389,20 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        /* font_size */
        tool_item = GTK_WIDGET (gtk_tool_button_new (NULL, NULL));
        priv->size_tool_button_label = gtk_label_new (NULL);
-       hildon_helper_set_logical_color (GTK_WIDGET (priv->size_tool_button_label), GTK_RC_TEXT,
-                                        GTK_STATE_INSENSITIVE, "SecondaryTextColor");
-       hildon_helper_set_logical_color (GTK_WIDGET (priv->size_tool_button_label), GTK_RC_FG,
-                                        GTK_STATE_INSENSITIVE, "SecondaryTextColor");
        snprintf(size_text, sizeof(size_text), "%d", wp_font_size[DEFAULT_FONT_SIZE]);
        markup = g_strconcat ("<span font_family='", DEFAULT_SIZE_BUTTON_FONT_FAMILY, "'>",
-                             size_text, ldots, "</span>", NULL);
+                             size_text, "</span>", NULL);
        gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup);
+       gtk_misc_set_alignment (GTK_MISC (priv->size_tool_button_label), 1.0, 0.5);
        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);
+       hbox = gtk_hbox_new (MODEST_MARGIN_DEFAULT, FALSE);
+       gtk_box_pack_start (GTK_BOX (hbox), priv->size_tool_button_label, TRUE, TRUE, 0);
+       arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
+       gtk_misc_set_alignment (GTK_MISC (arrow), 0.0, 0.5);
+       gtk_box_pack_start (GTK_BOX (hbox), arrow, TRUE, TRUE, 0);
+       gtk_widget_set_sensitive (arrow, FALSE);
+       gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), hbox);
        sizes_menu = gtk_menu_new ();
        priv->sizes_model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
        for (size_index = 0; size_index < WP_FONT_SIZE_COUNT; size_index++) {
@@ -1396,23 +1422,25 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
 
        g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (font_size_clicked), window);
        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), FALSE);
-       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), FALSE);
-       menu_tool_button_dont_expand (GTK_MENU_TOOL_BUTTON (tool_item));
+       gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE);
+       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
        priv->font_size_toolitem = tool_item;
 
        /* font face */
        tool_item = GTK_WIDGET (gtk_tool_button_new (NULL, NULL));
        priv->font_tool_button_label = gtk_label_new (NULL);
-       hildon_helper_set_logical_color (GTK_WIDGET (priv->font_tool_button_label), GTK_RC_TEXT,
-                                        GTK_STATE_INSENSITIVE, "SecondaryTextColor");
-       hildon_helper_set_logical_color (GTK_WIDGET (priv->font_tool_button_label), GTK_RC_FG,
-                                        GTK_STATE_INSENSITIVE, "SecondaryTextColor");
-       markup = g_strconcat ("<span font_family='", wp_get_font_name(DEFAULT_FONT), "'>Tt",ldots,"</span>", NULL);
+       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);
+       gtk_misc_set_alignment (GTK_MISC (priv->font_tool_button_label), 1.0, 0.5);
        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);
+       hbox = gtk_hbox_new (MODEST_MARGIN_DEFAULT, FALSE);
+       gtk_box_pack_start (GTK_BOX (hbox), priv->font_tool_button_label, TRUE, TRUE, 0);
+       arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
+       gtk_misc_set_alignment (GTK_MISC (arrow), 0.0, 0.5);
+       gtk_box_pack_start (GTK_BOX (hbox), arrow, TRUE, TRUE, 0);
+       gtk_widget_set_sensitive (arrow, FALSE);
+       gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), hbox);
        fonts_menu = gtk_menu_new ();
        priv->faces_model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
        for (font_index = 0; font_index < wp_get_font_count (); font_index++) {
@@ -1429,9 +1457,8 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        }
        g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (font_face_clicked), window);
        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), FALSE);
-       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), FALSE);
-       menu_tool_button_dont_expand (GTK_MENU_TOOL_BUTTON (tool_item));
+       gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE);
+       gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
        priv->font_face_toolitem = tool_item;
 
        /* Set expand and homogeneous for remaining items */
@@ -1609,6 +1636,8 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
        data->cc      =  g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->cc_field)));
        data->bcc     =  g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->bcc_field)));
        data->subject =  g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->subject_field)));
+       data->references = g_strdup (priv->references);
+       data->in_reply_to = g_strdup (priv->in_reply_to);
        if (priv->draft_msg) {
                data->draft_msg = g_object_ref (priv->draft_msg);
        } else if (priv->outbox_msg) {
@@ -1708,6 +1737,8 @@ modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window,
        g_free (data->plain_body);
        g_free (data->html_body);
        g_free (data->account_name);
+       g_free (data->references);
+       g_free (data->in_reply_to);
        
        if (data->draft_msg != NULL) {
                g_object_unref (data->draft_msg);
@@ -1781,9 +1812,11 @@ modest_msg_edit_window_get_format_state (ModestMsgEditWindow *self)
 {
        ModestMsgEditFormatState *format_state = NULL;
        ModestMsgEditWindowPrivate *priv;
-       WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1);
+       WPTextBufferFormat *buffer_format;
 
        g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self), NULL);
+
+       buffer_format = g_new0 (WPTextBufferFormat, 1);
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
 
        wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), buffer_format, TRUE);
@@ -1807,11 +1840,15 @@ modest_msg_edit_window_set_format_state (ModestMsgEditWindow *self,
                                         const ModestMsgEditFormatState *format_state)
 {
        ModestMsgEditWindowPrivate *priv;
-       WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1);
-       WPTextBufferFormat *current_format = g_new0 (WPTextBufferFormat, 1);
+       WPTextBufferFormat *buffer_format;
+       WPTextBufferFormat *current_format;
+
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self));
        g_return_if_fail (format_state != NULL);
 
+       buffer_format = g_new0 (WPTextBufferFormat, 1);
+       current_format = g_new0 (WPTextBufferFormat, 1);
+
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
        gtk_widget_grab_focus (priv->msg_body);
        buffer_format->bold = (format_state->bold != FALSE);
@@ -1896,15 +1933,10 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo
        GtkAction *action;
        ModestWindowPrivate *parent_priv;
        ModestMsgEditWindowPrivate *priv;
-       gchar ldots[8];
-       gint ldots_len;
        
        parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
 
-       ldots_len = g_unichar_to_utf8 (0x2026, ldots);
-       ldots[ldots_len] = '\0';
-
        if (wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer))) {
                action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatFormattedTextMenu");
                if (!gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
@@ -1966,7 +1998,7 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo
 
                        gtk_tree_model_get (priv->sizes_model, &iter, 0, &size_text, -1);
                        markup = g_strconcat ("<span font_family='Sans'>", 
-                                             size_text, ldots, "</span>", NULL);
+                                             size_text, "</span>", NULL);
                        
                        gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup);
                        g_free (markup);
@@ -1986,7 +2018,7 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo
 
                        priv->current_face_index = buffer_format->font;
                        gtk_tree_model_get (priv->faces_model, &iter, 0, &face_name, -1);
-                       markup = g_strconcat ("<span font_family='", face_name, "'>Tt", ldots, "</span>", NULL);
+                       markup = g_strconcat ("<span font_family='", face_name, "'>Tt</span>", NULL);
                        gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup);
                        g_free (face_name);
                        g_free (markup);
@@ -2145,9 +2177,9 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
        gint response = 0;
        GSList *uris = NULL;
        GSList *uri_node = NULL;
-       
+
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       
+
        dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_OPEN);
        gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ia_select_inline_image_title"));
        gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
@@ -2167,6 +2199,11 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
        }
        gtk_widget_destroy (dialog);
 
+       g_object_ref (window);
+       /* The operation could take some time so allow the dialog to be closed */
+       while (gtk_events_pending ())
+               gtk_main_iteration ();
+
        for (uri_node = uris; uri_node != NULL; uri_node = g_slist_next (uri_node)) {
                const gchar *uri;
                GnomeVFSHandle *handle = NULL;
@@ -2209,7 +2246,7 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
 
                                modest_platform_information_banner (NULL, NULL, 
                                                                    _FM("sfil_ib_opening_not_allowed"));
-
+                               g_free (filename);
                                g_object_unref (mime_part);
                                gnome_vfs_file_info_unref (info);
                                continue;
@@ -2226,27 +2263,31 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
                        tny_mime_part_set_filename (mime_part, basename);
                        g_free (basename);
 
-                       pixbuf = pixbuf_from_stream (stream, mime_type, &stream_size);
+                       pixbuf = pixbuf_from_stream (stream, mime_type, &stream_size, window);
 
                        if (pixbuf != NULL) {
                                priv->images_size += stream_size;
                                priv->images_count ++;
                                insert_mark = gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (priv->text_buffer));
                                gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (priv->text_buffer), &position, insert_mark);
-                               wp_text_buffer_insert_image (WP_TEXT_BUFFER (priv->text_buffer), &position, g_strdup (tny_mime_part_get_content_id (mime_part)), pixbuf);
+                               wp_text_buffer_insert_image (WP_TEXT_BUFFER (priv->text_buffer), &position, 
+                                                            tny_mime_part_get_content_id (mime_part), pixbuf);
                                g_object_unref (pixbuf);
-                       } 
 
-                       tny_list_prepend (priv->images, (GObject *) mime_part);
-                       gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
+                               tny_list_prepend (priv->images, (GObject *) mime_part);
+                               gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
+                       } else {
+                               modest_platform_information_banner (NULL, NULL,
+                                                                   _("mail_ib_file_operation_failed"));
+                       }
+
                        g_free (filename);
                        g_object_unref (mime_part);
                        gnome_vfs_file_info_unref (info);
 
                }
        }
-
-
+       g_object_unref (window);
 }
 
 static void
@@ -2380,6 +2421,7 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window,
                        if (size > allowed_size) {
                                modest_platform_information_banner (NULL, NULL, 
                                                                    _FM("sfil_ib_opening_not_allowed"));
+                               g_free (filename);
                                return 0;
                        }
                } else
@@ -2392,6 +2434,7 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window,
                        modest_platform_information_banner (NULL, NULL, _FM("sfil_ib_opening_not_allowed"));
 
                        g_object_unref (mime_part);
+                       g_free (filename);
                        gnome_vfs_file_info_unref (info);
                        return 0;
                }
@@ -2551,14 +2594,13 @@ font_size_clicked (GtkToolButton *button,
 
        dialog = hildon_picker_dialog_new (GTK_WINDOW (window));
        hildon_picker_dialog_set_selector (HILDON_PICKER_DIALOG (dialog), HILDON_TOUCH_SELECTOR (selector));
+       gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_font_size"));
 
        if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
                gint new_index;
                gchar *size_text;
                gchar *markup;
                WPTextBufferFormat format;
-               gchar ldots[8];
-               gint ldots_len;
 
                new_index = hildon_touch_selector_get_active (HILDON_TOUCH_SELECTOR (selector), 0);
 
@@ -2577,10 +2619,8 @@ font_size_clicked (GtkToolButton *button,
                
                text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window));
                size_text = hildon_touch_selector_get_current_text (HILDON_TOUCH_SELECTOR (selector));
-               ldots_len = g_unichar_to_utf8 (0x2026, ldots);
-               ldots[ldots_len] = '\0';
                markup = g_strconcat ("<span font_family='", DEFAULT_SIZE_BUTTON_FONT_FAMILY, "'>", 
-                                     size_text, ldots, "</span>", NULL);
+                                     size_text, "</span>", NULL);
                g_free (size_text);
                gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup);
                g_free (markup);
@@ -2610,6 +2650,7 @@ font_face_clicked (GtkToolButton *button,
 
        dialog = hildon_picker_dialog_new (GTK_WINDOW (window));
        hildon_picker_dialog_set_selector (HILDON_PICKER_DIALOG (dialog), HILDON_TOUCH_SELECTOR (selector));
+       gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_font_face"));
 
        if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
                gint new_font_index;
@@ -2621,8 +2662,6 @@ font_face_clicked (GtkToolButton *button,
                if (gtk_tree_model_get_iter (priv->faces_model, &iter, path)) {
                        gchar *face_name;
                        gchar *markup;
-                       gchar ldots[8];
-                       gint ldots_len;
 
                        gtk_tree_model_get (priv->faces_model, &iter, 0, &face_name, -1);
 
@@ -2630,9 +2669,7 @@ font_face_clicked (GtkToolButton *button,
                                                           GINT_TO_POINTER(new_font_index)))
                                wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body));
 
-                       ldots_len = g_unichar_to_utf8 (0x2026, ldots);
-                       ldots[ldots_len] = '\0';
-                       markup = g_strconcat ("<span font_family='", face_name, "'>Tt", ldots, "</span>", NULL);
+                       markup = g_strconcat ("<span font_family='", face_name, "'>Tt</span>", NULL);
                        gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup);
 
                        text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window));
@@ -3242,6 +3279,8 @@ modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboard,
        ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
        GtkClipboard *selection_clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
        gchar *text = NULL;
+
+       /* It could happen that the window was already closed */
        if (!GTK_WIDGET_VISIBLE (window))
                return;
 
@@ -3253,9 +3292,8 @@ modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboard,
        }
        priv->clipboard_text = text;
 
-       if (GTK_WIDGET_VISIBLE (window)) {
-               modest_window_check_dimming_rules_group (MODEST_WINDOW (window), MODEST_DIMMING_RULES_CLIPBOARD);
-       }
+       modest_window_check_dimming_rules_group (MODEST_WINDOW (window), MODEST_DIMMING_RULES_CLIPBOARD);
+
        g_object_unref (window);
 }
 
@@ -3280,7 +3318,10 @@ modest_msg_edit_window_clipboard_owner_handle_change_in_idle (ModestMsgEditWindo
 {
        ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
        if (priv->clipboard_owner_idle == 0) {
-               priv->clipboard_owner_idle = g_idle_add (clipboard_owner_change_idle, window);
+               priv->clipboard_owner_idle = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
+                                                             clipboard_owner_change_idle, 
+                                                             g_object_ref (window),
+                                                             g_object_unref);
        }
 }
 
@@ -3291,6 +3332,7 @@ subject_field_move_cursor (GtkEntry *entry,
                           gboolean a2,
                           gpointer window)
 {
+       /* It could happen that the window was already closed */
        if (!GTK_WIDGET_VISIBLE (window))
                return;
 
@@ -3432,8 +3474,10 @@ gtk_text_iter_forward_search_insensitive (const GtkTextIter *iter,
                if (!g_utf8_collate (range_subtext, str_casefold)) {
                        gchar *found_text = g_strndup (range_text + offset, str_chars_n);
                        result = TRUE;
-                       gtk_text_iter_forward_search (iter, found_text, GTK_TEXT_SEARCH_VISIBLE_ONLY|GTK_TEXT_SEARCH_TEXT_ONLY,
-                                                     match_start, match_end, NULL);
+                       if (!gtk_text_iter_forward_search (iter, found_text, GTK_TEXT_SEARCH_VISIBLE_ONLY|GTK_TEXT_SEARCH_TEXT_ONLY,
+                                                          match_start, match_end, NULL)) {
+                               g_warning ("Matched string with collate, but not matched in model");
+                       }
                        g_free (found_text);
                }
                g_free (range_subtext);
@@ -3547,7 +3591,6 @@ modest_msg_edit_window_set_draft (ModestMsgEditWindow *window,
        g_return_if_fail ((draft == NULL)||(TNY_IS_MSG (draft)));
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
 
        if (priv->draft_msg != NULL) {
                g_object_unref (priv->draft_msg);
@@ -3561,12 +3604,6 @@ modest_msg_edit_window_set_draft (ModestMsgEditWindow *window,
                        priv->msg_uid = NULL;
                }
                priv->msg_uid = modest_tny_folder_get_header_unique_id (header);
-               if (GTK_WIDGET_REALIZED (window)) {
-                       if (!modest_window_mgr_register_window (mgr, MODEST_WINDOW (window), NULL)) {
-                               gtk_widget_destroy (GTK_WIDGET (window));
-                               return;
-                       }
-               }
        }
 
        priv->draft_msg = draft;