X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-recpt-editor.c;h=87aaf6d6dfbd25c202f0c8e799b23e511efe0851;hp=27c5b6aff8e73af9f6de6fe0a5f92b822f3e4460;hb=a2b8a442976d26eb939ee9b8d83e3101f48dece3;hpb=4101edcca626f2e9621bfea4c9893178f74d5d90 diff --git a/src/widgets/modest-recpt-editor.c b/src/widgets/modest-recpt-editor.c index 27c5b6a..87aaf6d 100644 --- a/src/widgets/modest-recpt-editor.c +++ b/src/widgets/modest-recpt-editor.c @@ -100,6 +100,8 @@ static GtkTextTag *prev_iter_has_recipient (GtkTextIter *iter); /* static GtkTextTag *next_iter_has_recipient (GtkTextIter *iter); */ static void select_tag_of_iter (GtkTextIter *iter, GtkTextTag *tag); static gboolean quote_opened (GtkTextIter *iter); +static gboolean is_valid_insert (const gchar *text, gint len); +static gchar *create_valid_text (const gchar *text, gint len); /** * modest_recpt_editor_new: @@ -122,14 +124,17 @@ modest_recpt_editor_set_recipients (ModestRecptEditor *recpt_editor, const gchar { ModestRecptEditorPrivate *priv; GtkTextBuffer *buffer = NULL; + gchar *valid_recipients = NULL; g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor)); priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor); buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->text_view)); + valid_recipients = create_valid_text (recipients, -1); g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor); - gtk_text_buffer_set_text (buffer, recipients, -1); + gtk_text_buffer_set_text (buffer, valid_recipients, -1); + g_free (valid_recipients); if (GTK_WIDGET_REALIZED (recpt_editor)) gtk_widget_queue_resize (GTK_WIDGET (recpt_editor)); g_signal_handlers_unblock_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor); @@ -324,12 +329,15 @@ modest_recpt_editor_instance_init (GTypeInstance *instance, gpointer g_class) gtk_button_set_focus_on_click (GTK_BUTTON (priv->abook_button), FALSE); GTK_WIDGET_UNSET_FLAGS (priv->abook_button, GTK_CAN_FOCUS); gtk_button_set_alignment (GTK_BUTTON (priv->abook_button), 1.0, 1.0); - abook_icon = gtk_image_new_from_icon_name ("qgn_list_gene_contacts", GTK_ICON_SIZE_BUTTON); + abook_icon = gtk_image_new_from_icon_name ("qgn_list_addressbook", GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (priv->abook_button), abook_icon); priv->text_view = gtk_text_view_new (); + priv->recipients = NULL; + priv->scrolled_window = modest_scroll_text_new (GTK_TEXT_VIEW (priv->text_view), 5); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scrolled_window), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scrolled_window), GTK_POLICY_NEVER, + GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->scrolled_window), GTK_SHADOW_IN); /* gtk_container_add (GTK_CONTAINER (priv->scrolled_window), priv->text_view); */ @@ -406,7 +414,6 @@ modest_recpt_editor_on_button_release_event (GtkWidget *widget, buffer = modest_recpt_editor_get_buffer (recpt_editor); mark = gtk_text_buffer_get_insert (buffer); gtk_text_buffer_get_iter_at_mark (buffer, &location, mark); - /* g_message ("RELEASE OFFSET %d", gtk_text_iter_get_offset (&location)); */ gtk_text_buffer_get_selection_bounds (buffer, &start, &end); @@ -438,6 +445,84 @@ modest_recpt_editor_on_focus_in (GtkTextView *text_view, gtk_text_view_place_cursor_onscreen (GTK_TEXT_VIEW (priv->text_view)); } +static gboolean +is_valid_insert (const gchar *text, gint len) +{ + gunichar c; + gunichar next_c; + gint i= 0; + gboolean quoted = FALSE; + const gchar *current, *next_current; + if (text == NULL) + return TRUE; + current = text; + + while (((len == -1)||(i < len)) && (*current != '\0')) { + c = g_utf8_get_char (current); + next_current = g_utf8_next_char (current); + if (next_current && *next_current != '\0') + next_c = g_utf8_get_char (g_utf8_next_char (current)); + else + next_c = 0; + if (!quoted && ((c == g_utf8_get_char(",") || c == g_utf8_get_char (";")))) { + if ((next_c != 0) && (next_c != g_utf8_get_char ("\n"))) + return FALSE; + else { + current = g_utf8_next_char (next_current); + continue; + } + } + if (c == 0x2022 || c == 0xfffc || + c == g_utf8_get_char ("\n") || + c == g_utf8_get_char ("\t")) + return FALSE; + if (c == g_utf8_get_char ("\"")) + quoted = !quoted; + current = g_utf8_next_char (current); + i = current - text; + } + return TRUE; +} + +static gchar * +create_valid_text (const gchar *text, gint len) +{ + gunichar c; + gunichar next_c; + gint i= 0; + GString *str; + gboolean quoted = FALSE; + const gchar *current, *next_current; + + if (text == NULL) + return NULL; + + str = g_string_new (""); + current = text; + + while (((len == -1)||(i < len)) && (*current != '\0')) { + c = g_utf8_get_char (current); + next_current = g_utf8_next_char (current); + if (next_current && *next_current != '\0') + next_c = g_utf8_get_char (g_utf8_next_char (current)); + else + next_c = 0; + if (c != 0x2022 && c != 0xfffc && + c != g_utf8_get_char ("\n") && + c != g_utf8_get_char ("\t")) + str = g_string_append_unichar (str, c); + if (!quoted && ((c == g_utf8_get_char(",") || c == g_utf8_get_char (";")))) { + if ((next_c != 0) && (next_c != g_utf8_get_char ("\n"))) + str = g_string_append_c (str, '\n'); + } + if (c == g_utf8_get_char ("\"")) + quoted = !quoted; + current = g_utf8_next_char (current); + i = current - text; + } + return g_string_free (str, FALSE); +} + static void modest_recpt_editor_on_insert_text (GtkTextBuffer *buffer, GtkTextIter *location, @@ -449,6 +534,14 @@ modest_recpt_editor_on_insert_text (GtkTextBuffer *buffer, gunichar prev_char; ModestRecptEditorPrivate *priv = MODEST_RECPT_EDITOR_GET_PRIVATE (editor); + 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"); + gtk_text_buffer_insert (buffer, location, new_text, -1); + g_free (new_text); + return; + } + if (iter_has_recipient (location)) { gtk_text_buffer_get_end_iter (buffer, location); gtk_text_buffer_place_cursor (buffer, location); @@ -614,7 +707,6 @@ modest_recpt_editor_on_key_press_event (GtkTextView *text_view, gboolean cursor_ready = FALSE; while (!cursor_ready) { if (iter_previous_char (&location) == '\n') { - /* g_message ("INTRO FOUND"); */ gtk_text_iter_backward_char (&location); } else { cursor_ready = TRUE; @@ -717,7 +809,6 @@ modest_recpt_editor_on_key_press_event (GtkTextView *text_view, if (tag != NULL) { GtkTextIter iter_in_tag; iter_in_tag = location; - /* g_message ("DELETE PREV SELECTION"); */ gtk_text_iter_backward_char (&iter_in_tag); select_tag_of_iter (&iter_in_tag, tag); gtk_text_buffer_delete_selection (buffer, TRUE, TRUE); @@ -759,6 +850,14 @@ modest_recpt_editor_grab_focus (ModestRecptEditor *recpt_editor) static void modest_recpt_editor_finalize (GObject *object) { + ModestRecptEditorPrivate *priv; + priv = MODEST_RECPT_EDITOR_GET_PRIVATE (object); + + if (priv->recipients) { + g_free (priv->recipients); + priv->recipients = NULL; + } + (*parent_class->finalize) (object); return;