X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-edit-window.c;h=10f1572dae3d70c06c7deb84cbeb48a71af81bd5;hb=180a6c986b177f0818ca0e25d35da5bb702d2039;hp=7a893bb014e8c7e34ceb1ddce396618a52f48ee3;hpb=aa030218771ad53bf01c092b1b689c28e340202f;p=modest diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c index 7a893bb..10f1572 100644 --- a/src/maemo/modest-msg-edit-window.c +++ b/src/maemo/modest-msg-edit-window.c @@ -141,6 +141,13 @@ static void modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, ModestMsgEditWindow *window); static void modest_msg_edit_window_find_toolbar_close (GtkWidget *widget, ModestMsgEditWindow *window); +static gboolean gtk_text_iter_forward_search_insensitive (const GtkTextIter *iter, + const gchar *str, + GtkTextIter *match_start, + GtkTextIter *match_end); + + + static void edit_menu_activated (GtkAction *action, gpointer userdata); static void view_menu_activated (GtkAction *action, @@ -184,6 +191,7 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *size_tool_button_label; GtkWidget *find_toolbar; + gchar *last_search; GtkWidget *scroll; GtkWidget *scroll_area; @@ -199,6 +207,7 @@ struct _ModestMsgEditWindowPrivate { gulong system_clipboard_change_handler_id; TnyMsg *draft_msg; + gboolean sent; }; #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -296,10 +305,12 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj) priv->priority_flags = 0; priv->find_toolbar = NULL; + priv->last_search = NULL; priv->draft_msg = NULL; priv->clipboard_change_handler_id = 0; priv->system_clipboard_change_handler_id = 0; + priv->sent = FALSE; } @@ -519,6 +530,11 @@ modest_msg_edit_window_finalize (GObject *obj) priv->system_clipboard_change_handler_id = 0; } + if (priv->draft_msg != NULL) { + g_object_unref (priv->draft_msg); + priv->draft_msg = NULL; + } + /* This had to stay alive for as long as the combobox that used it: */ modest_pair_list_free (priv->from_field_protos); @@ -647,7 +663,7 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg) update_dimmed (self); text_buffer_can_undo (priv->text_buffer, FALSE, self); - priv->draft_msg = msg; + priv->draft_msg = g_object_ref(msg); } static void @@ -1484,9 +1500,9 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window) loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, NULL); while (!tny_stream_is_eos (TNY_STREAM (stream))) { - char read_buffer[128]; + unsigned char read_buffer[128]; gint readed; - readed = tny_stream_read (TNY_STREAM (stream), read_buffer, 128); + readed = tny_stream_read (TNY_STREAM (stream), (char *) read_buffer, 128); if (!gdk_pixbuf_loader_write (loader, read_buffer, readed, NULL)) break; } @@ -1600,7 +1616,7 @@ modest_msg_edit_window_attach_file_noninteractive ( priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - if (file_uri) { + if (file_uri && strlen(file_uri)) { gint file_id = 0; /* TODO: We should probably try to use only the URI, @@ -1608,7 +1624,7 @@ modest_msg_edit_window_attach_file_noninteractive ( */ gchar* filename = g_filename_from_uri (file_uri, NULL, NULL); if (!filename) { - g_warning("%s: g_filename_from_uri(%s) failed.\n", __FUNCTION__, file_uri); + g_warning("%s: g_filename_from_uri('%s') failed.\n", __FUNCTION__, file_uri); } file_id = g_open (filename, O_RDONLY, 0); @@ -2675,6 +2691,63 @@ modest_msg_edit_window_toggle_find_toolbar (ModestMsgEditWindow *window, } +static gboolean +gtk_text_iter_forward_search_insensitive (const GtkTextIter *iter, + const gchar *str, + GtkTextIter *match_start, + GtkTextIter *match_end) +{ + GtkTextIter end_iter; + gchar *str_casefold; + gint str_chars_n; + gchar *range_text; + gchar *range_casefold; + gint offset; + gint range_chars_n; + gboolean result = FALSE; + + if (str == NULL) + return TRUE; + + /* get end iter */ + end_iter = *iter; + gtk_text_iter_forward_to_end (&end_iter); + + str_casefold = g_utf8_casefold (str, -1); + str_chars_n = strlen (str); + + range_text = gtk_text_iter_get_visible_text (iter, &end_iter); + range_casefold = g_utf8_casefold (range_text, -1); + range_chars_n = strlen (range_casefold); + + if (range_chars_n < str_chars_n) { + g_free (str_casefold); + g_free (range_text); + g_free (range_casefold); + return FALSE; + } + + for (offset = 0; offset <= range_chars_n - str_chars_n; offset++) { + gchar *range_subtext = g_strndup (range_casefold + offset, str_chars_n); + 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); + g_free (found_text); + } + g_free (range_subtext); + if (result) + break; + } + g_free (str_casefold); + g_free (range_text); + g_free (range_casefold); + + return result; +} + + static void modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, ModestMsgEditWindow *window) @@ -2684,25 +2757,47 @@ modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, gboolean result; GtkTextIter selection_start, selection_end; GtkTextIter match_start, match_end; + gboolean continue_search = FALSE; g_object_get (G_OBJECT (widget), "prefix", ¤t_search, NULL); - if ((current_search == NULL) && (strcmp (current_search, "") == 0)) { + if ((current_search == NULL) || (strcmp (current_search, "") == 0)) { g_free (current_search); + g_free (priv->last_search); + priv->last_search = NULL; + /* Information banner about empty search */ + hildon_banner_show_information (NULL, NULL, dgettext ("hildon-common-strings", "ecdg_ib_find_rep_enter_text")); return; } - gtk_text_buffer_get_selection_bounds (priv->text_buffer, &selection_start, &selection_end); - result = gtk_text_iter_forward_search (&selection_end, current_search, GTK_TEXT_SEARCH_VISIBLE_ONLY, &match_start, &match_end, NULL); - if (!result) { + if ((priv->last_search != NULL)&&(!strcmp (current_search, priv->last_search))) { + continue_search = TRUE; + } else { + g_free (priv->last_search); + priv->last_search = g_strdup (current_search); + } + + if (continue_search) { + gtk_text_buffer_get_selection_bounds (priv->text_buffer, &selection_start, &selection_end); + result = gtk_text_iter_forward_search_insensitive (&selection_end, current_search, + &match_start, &match_end); + if (!result) + hildon_banner_show_information (NULL, NULL, dgettext ("hildon-libs", "ckct_ib_find_search_complete")); + } else { GtkTextIter buffer_start; gtk_text_buffer_get_start_iter (priv->text_buffer, &buffer_start); - result = gtk_text_iter_forward_search (&buffer_start, current_search, GTK_TEXT_SEARCH_VISIBLE_ONLY, &match_start, &match_end, &selection_start); + result = gtk_text_iter_forward_search_insensitive (&buffer_start, current_search, + &match_start, &match_end); + if (!result) + hildon_banner_show_information (NULL, NULL, dgettext ("hildon-libs", "ckct_ib_find_no_matches")); } + + /* Mark as selected the string found in search */ if (result) { gtk_text_buffer_select_range (priv->text_buffer, &match_start, &match_end); gtk_text_view_scroll_to_iter (GTK_TEXT_VIEW (priv->msg_body), &match_start, 0.0, TRUE, 0.0, 0.0); } else { - /* TODO: warning about non succesful search */ + g_free (priv->last_search); + priv->last_search = NULL; } g_free (current_search); } @@ -2818,3 +2913,22 @@ view_menu_activated (GtkAction *action, update_zoom_dimming (window); } + +gboolean +modest_msg_edit_window_get_sent (ModestMsgEditWindow *window) +{ + ModestMsgEditWindowPrivate *priv; + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(window); + return priv->sent; +} + +void +modest_msg_edit_window_set_sent (ModestMsgEditWindow *window, + gboolean sent) +{ + ModestMsgEditWindowPrivate *priv; + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(window); + priv->sent = sent; +}