X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-recpt-editor.c;h=4ef9fc9a077cd0177d0fa59c44c7094a0f304ceb;hp=5e66325d9842e0a1f99e92d7ac5a8a0fb12d25f0;hb=e45958deaf9701399c552ea0d84c2447efacd4ca;hpb=e8aad45ec1a2effcce0d858a0ea66fb0b34ba988

diff --git a/src/widgets/modest-recpt-editor.c b/src/widgets/modest-recpt-editor.c
index 5e66325..4ef9fc9 100644
--- a/src/widgets/modest-recpt-editor.c
+++ b/src/widgets/modest-recpt-editor.c
@@ -44,6 +44,12 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
+/* FIXNE: we should have no maemo-deps in widgets/ */
+#ifndef MODEST_TOOLKIT_GTK
+#include "maemo/modest-hildon-includes.h"
+#endif /*!MODEST_TOOLKIT_GTK*/
+
+
 static GObjectClass *parent_class = NULL;
 
 #define RECIPIENT_TAG_ID "recpt-id"
@@ -147,7 +153,7 @@ modest_recpt_editor_add_recipients (ModestRecptEditor *recpt_editor, const gchar
 	ModestRecptEditorPrivate *priv;
 	GtkTextBuffer *buffer = NULL;
 	GtkTextIter iter;
-	gchar * string_to_add;
+	gchar *string_to_add;
 
 	g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor));
 	priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
@@ -167,13 +173,14 @@ modest_recpt_editor_add_recipients (ModestRecptEditor *recpt_editor, const gchar
 
 	g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor);
 
-	gtk_text_buffer_insert (buffer, &iter, recipients, -1);
+	gtk_text_buffer_insert (buffer, &iter, string_to_add, -1);
 	
 	g_signal_handlers_unblock_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor);
 
 	if (GTK_WIDGET_REALIZED (recpt_editor))
 		gtk_widget_queue_resize (GTK_WIDGET (recpt_editor));
 
+	g_free (string_to_add);
 }
 
 void 
@@ -334,8 +341,10 @@ modest_recpt_editor_instance_init (GTypeInstance *instance, gpointer g_class)
 
 	priv->text_view = gtk_text_view_new ();
 	/* Auto-capitalization is the default, so let's turn it off: */
+#ifdef MAEMO_CHANGES
 	hildon_gtk_text_view_set_input_mode (GTK_TEXT_VIEW (priv->text_view), 
 		HILDON_GTK_INPUT_MODE_FULL);
+#endif
 	
 	priv->recipients = NULL;
 
@@ -435,7 +444,11 @@ modest_recpt_editor_on_button_release_event (GtkWidget *widget,
 			selection_changed = TRUE;
 		}
 
-	gtk_text_buffer_select_range (buffer, &start, &end);
+	if (selection_changed) {
+		gtk_text_buffer_select_range (buffer, &start, &end);
+	} else {
+		GTK_TEXT_VIEW (priv->text_view)->pending_place_cursor_button = 0;
+	}
 
 	return FALSE;
 }
@@ -544,7 +557,12 @@ modest_recpt_editor_on_insert_text (GtkTextBuffer *buffer,
 	if (!is_valid_insert (text, len)) {
 		gchar *new_text = create_valid_text (text, len);
 		g_signal_stop_emission_by_name (G_OBJECT (buffer), "insert-text");
+		g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text, 
+						 editor);
 		gtk_text_buffer_insert (buffer, location, new_text, -1);
+		g_signal_handlers_unblock_by_func (buffer, 
+						   modest_recpt_editor_on_insert_text, 
+						   editor);
 		g_free (new_text);
 		return;
 	}
@@ -679,12 +697,14 @@ modest_recpt_editor_on_key_press_event (GtkTextView *text_view,
 					  ModestRecptEditor *editor)
 {
 	GtkTextMark *insert;
+	GtkTextMark *selection;
 	GtkTextBuffer * buffer;
-	GtkTextIter location;
+	GtkTextIter location, selection_loc;
 	GtkTextTag *tag;
      
 	buffer = gtk_text_view_get_buffer (text_view);
 	insert = gtk_text_buffer_get_insert (buffer);
+	selection = gtk_text_buffer_get_selection_bound (buffer);
 
 	/* cases to cover:
 	 *    * cursor is on resolved recipient:
@@ -706,6 +726,7 @@ modest_recpt_editor_on_key_press_event (GtkTextView *text_view,
 	 */
 
 	gtk_text_buffer_get_iter_at_mark (buffer, &location, insert);
+	gtk_text_buffer_get_iter_at_mark (buffer, &selection_loc, selection);
 
 	switch (key->keyval) {
 	case GDK_Left:
@@ -775,7 +796,12 @@ modest_recpt_editor_on_key_press_event (GtkTextView *text_view,
 	case GDK_Return:
 	case GDK_KP_Enter:
 	{
+		gint insert_offset, selection_offset;
+		insert_offset = gtk_text_iter_get_offset (&location);
+		selection_offset = gtk_text_iter_get_offset (&selection_loc);
 		g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text, editor);
+		if (selection_offset > insert_offset)
+			location = selection_loc;
 		tag = iter_has_recipient (&location);
 		if (tag != NULL) {
 			gtk_text_buffer_get_end_iter (buffer, &location);