X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-edit-window.c;h=503739cf589353ade5a398417ab1d8dbca67dcc6;hp=2331b8c9549991f166567267955acec98a6fa01d;hb=ae6cc4558ea0f5afc82a06376200904ee7b061dd;hpb=94945a4ee31acfc11dbd1aedf0514ca833c708ee

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index 2331b8c..503739c 100644
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -384,6 +384,7 @@ init_window (ModestMsgEditWindow *obj)
 	priv->priority_icon = gtk_image_new ();
 	gtk_box_pack_start (GTK_BOX (subject_box), priv->priority_icon, FALSE, FALSE, 0);
 	priv->subject_field = gtk_entry_new_with_max_length (SUBJECT_MAX_LENGTH);
+	g_object_set (G_OBJECT (priv->subject_field), "truncate-multiline", TRUE, NULL);
 	hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->subject_field), 
 					 HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP);
 	gtk_box_pack_start (GTK_BOX (subject_box), priv->subject_field, TRUE, TRUE, 0);
@@ -429,9 +430,10 @@ init_window (ModestMsgEditWindow *obj)
 	priv->text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));
 	g_object_set (priv->text_buffer, "font_scale", DEFAULT_FONT_SCALE, NULL);
 	wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
+#if (GTK_MINOR_VERSION >= 10)
 	gtk_text_buffer_register_serialize_tagset(GTK_TEXT_BUFFER(priv->text_buffer), "wp-text-buffer");
 	gtk_text_buffer_register_deserialize_tagset(GTK_TEXT_BUFFER(priv->text_buffer), "wp-text-buffer");
-
+#endif
 	wp_text_buffer_reset_buffer (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
 
 	priv->find_toolbar = hildon_find_toolbar_new (NULL);
@@ -479,7 +481,8 @@ init_window (ModestMsgEditWindow *obj)
 	priv->scroll = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->scroll), GTK_SHADOW_NONE);
-	
+	modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->scroll), TRUE);
+
 	main_vbox = gtk_vbox_new  (FALSE, DEFAULT_MAIN_VBOX_SPACING);
 
 	gtk_box_pack_start (GTK_BOX(main_vbox), priv->header_box, FALSE, FALSE, 0);
@@ -1079,6 +1082,7 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
 	while (cursor) {
 		if (!(TNY_IS_MIME_PART(cursor->data))) {
 			g_warning ("strange data in attachment list");
+			cursor = g_list_next (cursor);
 			continue;
 		}
 		data->attachments = g_list_append (data->attachments,
@@ -2662,6 +2666,9 @@ modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboard,
 
 	priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
 	parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+
+	if (!GTK_WIDGET_VISIBLE (window))
+		return;
 	has_selection = gtk_clipboard_wait_for_targets (clipboard, NULL, NULL);
 	focused = gtk_window_get_focus (GTK_WINDOW (window));