gint last_vadj_upper;
gint last_cid;
- GList *attachments;
- GList *images;
+ TnyList *attachments;
+ TnyList *images;
TnyHeaderFlags priority_flags;
priv->cc_field = NULL;
priv->bcc_field = NULL;
priv->subject_field = NULL;
- priv->attachments = NULL;
- priv->images = NULL;
+ priv->attachments = TNY_LIST (tny_simple_list_new ());
+ priv->images = TNY_LIST (tny_simple_list_new ());
priv->last_cid = 0;
priv->cc_caption = NULL;
priv->last_vadj_upper = adj->upper;
}
+static void window_focus (GtkWindow *window,
+ GtkWidget *widget,
+ gpointer userdata)
+{
+ modest_window_check_dimming_rules_group (MODEST_WINDOW (userdata), MODEST_DIMMING_RULES_CLIPBOARD);
+}
+
static void
connect_signals (ModestMsgEditWindow *obj)
G_CALLBACK (msg_body_focus), obj);
g_signal_connect (G_OBJECT (priv->msg_body), "focus-out-event",
G_CALLBACK (msg_body_focus), obj);
+ g_signal_connect (G_OBJECT (obj), "set-focus", G_CALLBACK (window_focus), obj);
g_signal_connect (G_OBJECT (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field))),
"changed", G_CALLBACK (recpt_field_changed), obj);
g_signal_connect (G_OBJECT (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->cc_field))),
g_free (priv->last_search);
g_slist_free (priv->font_items_group);
g_slist_free (priv->size_items_group);
- g_list_foreach (priv->attachments, (GFunc) g_object_unref, NULL);
- g_list_free (priv->attachments);
- g_list_foreach (priv->images, (GFunc) g_object_unref, NULL);
- g_list_free (priv->images);
+ g_object_unref (priv->attachments);
+ g_object_unref (priv->images);
/* This had to stay alive for as long as the combobox that used it: */
modest_pair_list_free (priv->from_field_protos);
}
static void
-replace_with_images (ModestMsgEditWindow *self, GList *attachments)
+replace_with_images (ModestMsgEditWindow *self, TnyList *attachments)
{
ModestMsgEditWindowPrivate *priv;
- GList *node;
+ TnyIterator *iter;
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
- for (node = attachments; node != NULL; node = g_list_next (node)) {
- TnyMimePart *part = (TnyMimePart *) node->data;
+ for (iter = tny_list_create_iterator (attachments);
+ !tny_iterator_is_done (iter);
+ tny_iterator_next (iter)) {
+ TnyMimePart *part = (TnyMimePart *) tny_iterator_get_current (iter);
const gchar *cid = tny_mime_part_get_content_id (part);
const gchar *mime_type = tny_mime_part_get_content_type (part);
if ((cid != NULL)&&(mime_type != NULL)) {
g_object_unref (pixbuf);
}
}
+ g_object_unref (part);
}
}
part = TNY_MIME_PART (tny_iterator_get_current (iter));
content_type = tny_mime_part_get_content_type (part);
if (content_type && g_str_has_prefix (content_type, "image/")) {
- priv->images = g_list_prepend (priv->images, part);
- } else {
- g_object_unref (part);
- }
+ tny_list_prepend (priv->images, (GObject *) part);
+ }
+ g_object_unref (part);
tny_iterator_next (iter);
}
g_object_unref (iter);
}
static void
-update_last_cid (ModestMsgEditWindow *self, GList *attachments)
+update_last_cid (ModestMsgEditWindow *self, TnyList *attachments)
{
- GList *node;
+ TnyIterator *iter;
ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
- for (node = attachments; node != NULL; node = g_list_next (node)) {
- TnyMimePart *part = (TnyMimePart *) node->data;
+ for (iter = tny_list_create_iterator (attachments) ;
+ !tny_iterator_is_done (iter);
+ tny_iterator_next (iter)) {
+ TnyMimePart *part = (TnyMimePart *) tny_iterator_get_current (iter);
const gchar *cid = tny_mime_part_get_content_id (part);
if (cid != NULL) {
char *invalid = NULL;
priv->last_cid = int_cid;
}
}
-
+ g_object_unref (part);
}
}
/* Add attachments to the view */
modest_attachments_view_set_message (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), msg);
priv->attachments = modest_attachments_view_get_attachments (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
- if (priv->attachments == NULL) {
+ if (tny_list_get_length (priv->attachments) == 0) {
gtk_widget_hide (priv->attachments_caption);
} else {
gtk_widget_set_no_show_all (priv->attachments_caption, FALSE);
modest_msg_edit_window_reset_modified (self);
modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (self));
+ modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self));
text_buffer_can_undo (priv->text_buffer, FALSE, self);
text_buffer_can_redo (priv->text_buffer, FALSE, self);
modest_combo_box_set_active_id (MODEST_COMBO_BOX (priv->from_field), account_pair->first);
parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new ();
- menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules", FALSE);
- toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules", TRUE);
- clipboard_rules_group = modest_dimming_rules_group_new ("ModestClipboardDimmingRules", FALSE);
+ menu_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_MENU, FALSE);
+ toolbar_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_TOOLBAR, TRUE);
+ clipboard_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_CLIPBOARD, FALSE);
/* Add common dimming rules */
modest_dimming_rules_group_add_rules (menu_rules_group,
modest_msg_edit_window_menu_dimming_entries,
g_object_unref (menu_rules_group);
g_object_unref (toolbar_rules_group);
g_object_unref (clipboard_rules_group);
+ gtk_widget_show_all (GTK_WIDGET (obj));
set_msg (MODEST_MSG_EDIT_WINDOW (obj), msg, preserve_is_rich);
text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (obj));
- modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (obj));
- modest_window_check_dimming_rules_group (MODEST_WINDOW (obj), "ModestClipboardDimmingRules");
+ modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (obj));
+ modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (obj));
+ modest_window_check_dimming_rules_group (MODEST_WINDOW (obj), MODEST_DIMMING_RULES_CLIPBOARD);
priv->update_caption_visibility = TRUE;
modest_msg_edit_window_reset_modified (MODEST_MSG_EDIT_WINDOW (obj));
MsgData *data;
const gchar *account_name;
ModestMsgEditWindowPrivate *priv;
+ TnyIterator *att_iter;
g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (edit_window), NULL);
data->html_body = NULL;
/* deep-copy the data */
- GList *cursor = priv->attachments;
+ att_iter = tny_list_create_iterator (priv->attachments);
data->attachments = NULL;
- while (cursor) {
- if (!(TNY_IS_MIME_PART(cursor->data))) {
+ while (!tny_iterator_is_done (att_iter)) {
+ TnyMimePart *part = (TnyMimePart *) tny_iterator_get_current (att_iter);
+ if (!(TNY_IS_MIME_PART(part))) {
g_warning ("strange data in attachment list");
- cursor = g_list_next (cursor);
+ g_object_unref (part);
+ tny_iterator_next (att_iter);
continue;
}
data->attachments = g_list_append (data->attachments,
- g_object_ref (cursor->data));
- cursor = g_list_next (cursor);
+ part);
+ tny_iterator_next (att_iter);
}
+ g_object_unref (att_iter);
GtkTextTagTable *tag_table = gtk_text_buffer_get_tag_table (GTK_TEXT_BUFFER (priv->text_buffer));
- cursor = priv->images;
+ att_iter = tny_list_create_iterator (priv->images);
data->images = NULL;
- while (cursor) {
+ while (!tny_iterator_is_done (att_iter)) {
+ TnyMimePart *part = (TnyMimePart *) tny_iterator_get_current (att_iter);
const gchar *cid;
- if (!(TNY_IS_MIME_PART(cursor->data))) {
+ if (!(TNY_IS_MIME_PART(part))) {
g_warning ("strange data in attachment list");
- cursor = g_list_next (cursor);
+ g_object_unref (part);
+ tny_iterator_next (att_iter);
continue;
}
- cid = tny_mime_part_get_content_id (cursor->data);
+ cid = tny_mime_part_get_content_id (part);
if (cid) {
gchar *image_tag_id;
GtkTextTag *image_tag;
((gtk_text_iter_has_tag (&iter, image_tag))||
(gtk_text_iter_forward_to_tag_toggle (&iter, image_tag))))
data->images = g_list_append (data->images,
- g_object_ref (cursor->data));
+ g_object_ref (part));
}
- cursor = g_list_next (cursor);
+ g_object_unref (part);
+ tny_iterator_next (att_iter);
}
data->priority_flags = priv->priority_flags;
}
/* wp_text_buffer_set_format (WP_TEXT_BUFFER (priv->text_buffer), buffer_format); */
+ text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), self);
+
g_free (current_format);
}
/* action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/BulletedListMenu"); */
/* modest_utils_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->bullet); */
+ action = NULL;
+ switch (buffer_format->justification)
+ {
+ case GTK_JUSTIFY_LEFT:
+ action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentLeftMenu");
+ break;
+ case GTK_JUSTIFY_CENTER:
+ action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentCenterMenu");
+ break;
+ case GTK_JUSTIFY_RIGHT:
+ action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentRightMenu");
+ break;
+ default:
+ break;
+ }
+
+ if (action != NULL)
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
+
g_signal_handlers_block_by_func (G_OBJECT (priv->font_color_button),
G_CALLBACK (modest_msg_edit_window_color_button_change),
window);
(modest_runtime_get_platform_factory ());
TnyStream *stream = create_stream_for_uri (uri);
- tny_mime_part_construct_from_stream (mime_part, stream, mime_type);
+ tny_mime_part_construct (mime_part, stream, mime_type, "base64");
content_id = g_strdup_printf ("%d", priv->last_cid);
tny_mime_part_set_content_id (mime_part, content_id);
wp_text_buffer_insert_image (WP_TEXT_BUFFER (priv->text_buffer), &position, g_strdup (tny_mime_part_get_content_id (mime_part)), pixbuf);
}
- priv->images = g_list_prepend (priv->images, mime_part);
+ tny_list_prepend (priv->images, (GObject *) mime_part);
gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
g_free (filename);
+ g_object_unref (mime_part);
}
}
(modest_runtime_get_platform_factory ());
stream = TNY_STREAM (tny_vfs_stream_new (handle));
- tny_mime_part_construct_from_stream (mime_part, stream, mime_type);
+ tny_mime_part_construct (mime_part, stream, mime_type, "base64");
+
+ g_object_unref (stream);
content_id = g_strdup_printf ("%d", priv->last_cid);
tny_mime_part_set_content_id (mime_part, content_id);
tny_mime_part_set_filename (mime_part, basename);
g_free (basename);
- priv->attachments = g_list_prepend (priv->attachments, g_object_ref(mime_part));
+ tny_list_prepend (priv->attachments, (GObject *) mime_part);
modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
mime_part);
gtk_widget_set_no_show_all (priv->attachments_caption, FALSE);
gtk_widget_show_all (priv->attachments_caption);
gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
g_free (filename);
+ g_object_unref (mime_part);
}
}
void
modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window,
- GList *att_list)
+ TnyList *att_list)
{
ModestMsgEditWindowPrivate *priv;
- gboolean clean_list = FALSE;
+ TnyIterator *iter;
g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
if (att_list == NULL) {
att_list = modest_attachments_view_get_selection (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
- clean_list = TRUE;
+ } else {
+ g_object_ref (att_list);
}
- if (att_list == NULL) {
+ if (tny_list_get_length (att_list) == 0) {
hildon_banner_show_information (NULL, NULL, _("TODO: no attachments selected to remove"));
} else {
GtkWidget *confirmation_dialog = NULL;
gboolean dialog_response;
- GList *node;
gchar *message = NULL;
gchar *filename = NULL;
- if (att_list->next == NULL) {
- if (TNY_IS_MSG (att_list->data)) {
- TnyHeader *header = tny_msg_get_header (TNY_MSG (att_list->data));
+ if (tny_list_get_length (att_list) == 1) {
+ TnyMimePart *part;
+ iter = tny_list_create_iterator (att_list);
+ part = (TnyMimePart *) tny_iterator_get_current (iter);
+ g_object_unref (iter);
+ if (TNY_IS_MSG (part)) {
+ TnyHeader *header = tny_msg_get_header (TNY_MSG (part));
if (header) {
filename = g_strdup (tny_header_get_subject (header));
g_object_unref (header);
filename = g_strdup (_("mail_va_no_subject"));
}
} else {
- filename = g_strdup (tny_mime_part_get_filename (TNY_MIME_PART (att_list->data)));
+ filename = g_strdup (tny_mime_part_get_filename (TNY_MIME_PART (part)));
}
+ g_object_unref (part);
} else {
filename = g_strdup ("");
}
message = g_strdup_printf (ngettext("emev_nc_delete_attachment", "emev_nc_delete_attachments",
- att_list->next == NULL), filename);
+ (tny_list_get_length (att_list) == 1)), filename);
g_free (filename);
confirmation_dialog = hildon_note_new_confirmation (GTK_WINDOW (window), message);
g_free (message);
dialog_response = (gtk_dialog_run (GTK_DIALOG (confirmation_dialog))==GTK_RESPONSE_OK);
gtk_widget_destroy (confirmation_dialog);
if (!dialog_response) {
- if (clean_list)
- g_list_free (att_list);
+ g_object_unref (att_list);
return;
}
hildon_banner_show_information (NULL, NULL, _("mcen_ib_removing_attachment"));
-
- for (node = att_list; node != NULL; node = g_list_next (node)) {
- TnyMimePart *mime_part = (TnyMimePart *) node->data;
+
+ for (iter = tny_list_create_iterator (att_list);
+ !tny_iterator_is_done (iter);
+ tny_iterator_next (iter)) {
+ TnyMimePart *mime_part = (TnyMimePart *) tny_iterator_get_current (iter);
const gchar *att_id;
- priv->attachments = g_list_remove (priv->attachments, mime_part);
+ tny_list_remove (priv->attachments, (GObject *) mime_part);
modest_attachments_view_remove_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
mime_part);
- if (priv->attachments == NULL)
+ if (tny_list_get_length (priv->attachments) == 0)
gtk_widget_hide (priv->attachments_caption);
att_id = tny_mime_part_get_content_id (mime_part);
if (att_id != NULL)
text_buffer_delete_images_by_id (gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body)),
att_id);
- g_object_unref (mime_part);
gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
+ g_object_unref (mime_part);
}
}
- if (clean_list)
- g_list_free (att_list);
+ g_object_unref (att_list);
+
+ /* if the last attachment has been removed, focus the Subject: field */
+ if (!modest_attachments_view_has_attachments (MODEST_ATTACHMENTS_VIEW (priv->attachments_view)))
+ gtk_widget_grab_focus (priv->subject_field);
}
static void
wp_text_buffer_undo (WP_TEXT_BUFFER (priv->text_buffer));
modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+ modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
}
wp_text_buffer_redo (WP_TEXT_BUFFER (priv->text_buffer));
modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+ modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
}
{
modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (userdata));
+ modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (userdata));
+ modest_window_check_dimming_rules_group (MODEST_WINDOW (userdata), MODEST_DIMMING_RULES_CLIPBOARD);
return FALSE;
}
ModestMsgEditWindow *editor)
{
modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (editor));
+ modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (editor));
}
static void
body_changed (GtkTextBuffer *buffer, ModestMsgEditWindow *editor)
{
modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (editor));
+ modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (editor));
}
void
}
priv->clipboard_text = text;
- modest_window_check_dimming_rules_group (MODEST_WINDOW (window), "ModestClipboardDimmingRules");
+ modest_window_check_dimming_rules_group (MODEST_WINDOW (window), MODEST_DIMMING_RULES_CLIPBOARD);
}
static void
subject_field_move_cursor (GtkEntry *entry,
if (!GTK_WIDGET_VISIBLE (window))
return;
- modest_window_check_dimming_rules_group (MODEST_WINDOW (window), "ModestClipboardDimmingRules");
+ modest_window_check_dimming_rules_group (MODEST_WINDOW (window), MODEST_DIMMING_RULES_CLIPBOARD);
}
static void
update_window_title (window);
gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+ modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
}
static void
ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
g_return_if_fail (TNY_IS_MIME_PART (part));
- priv->attachments = g_list_prepend (priv->attachments, part);
- g_object_ref (part);
+ tny_list_prepend (priv->attachments, (GObject *) part);
modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), part);
gtk_widget_set_no_show_all (priv->attachments_caption, FALSE);
gtk_widget_show_all (priv->attachments_caption);