From fee5916b60c605ff5086d8fdc2a85c5ea21351f6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 31 Jan 2009 19:03:12 +0000 Subject: Merge revisions 37108:37199 from trunk. svn path=/branches/kill-bonobo/; revision=37200 --- mail/ChangeLog | 41 +++++++++++++++++++++++++++++++++++++++++ mail/em-format-html-display.c | 5 +++-- mail/em-format-html-print.c | 2 +- mail/em-format.c | 2 +- mail/message-list.c | 3 ++- 5 files changed, 48 insertions(+), 5 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index bad1191117..c65af1896a 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,44 @@ +2009-01-30 Srinivasa Ragavan + + * message-list.c: (regen_list_exec): Fix compiler warnings + +2009-01-29 Srinivasa Ragavan + + * em-format-html-display.c: (efhd_update_bar), + (efhd_message_update_bar): Show attachment bar at all times. Seems + like the contents are missing at times. + +2009-01-29 Srinivasa Ragavan + + * em-format.c: (em_format_format_text): Handle empty messages well. + +2009-01-29 Srinivasa Ragavan + + ** Fix for bug #546637 + + * em-folder-view.c: (emfv_popup_source): Ensure uid for source view + also. + +2009-01-29 Srinivasa Ragavan + + ** Fix for bug #562449 + + * em-folder-view.c: (em_folder_view_mark_selected), + (emfv_delete_msg_response): Don't emit for vfolders. + +2009-01-29 Srinivasa Ragavan + + ** Fix for bug #567654 + + * message-list.c: (regen_list_exec): Don't free the reffable string. + +2009-01-27 Milan Crha + + ** Fix for bug #561628 + + * em-format-html-print.c: (efhp_class_init): + Initialize 'parent_class' with its parent, not with itself. + 2009-01-19 Milan Crha ** Fix for bug #204891 diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index b87767654a..1bdbcbea0e 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -2353,7 +2353,8 @@ efhd_update_bar(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pob EMFormatHTMLDisplay *efhd = (EMFormatHTMLDisplay *)efh; struct _EMFormatHTMLDisplayPrivate *priv = efhd->priv; - e_attachment_bar_refresh (E_ATTACHMENT_BAR (priv->attachment_bar)); + if (priv->attachment_bar) + e_attachment_bar_refresh (E_ATTACHMENT_BAR (priv->attachment_bar)); return TRUE; } @@ -2436,7 +2437,7 @@ efhd_message_update_bar(EMFormat *emf, CamelStream *stream, CamelMimePart *part, EMFormatHTMLDisplay *efhd = (EMFormatHTMLDisplay *) emf; const char *classid = "attachment-bar-refresh"; - if (efhd->nobar || efhd->priv->updated || !efhd->priv->attachment_bar) + if (efhd->nobar || efhd->priv->updated) return; efhd->priv->files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c index c0d3573a3e..a903820ca3 100644 --- a/mail/em-format-html-print.c +++ b/mail/em-format-html-print.c @@ -52,7 +52,7 @@ efhp_finalize (GObject *o) static void efhp_class_init (GObjectClass *class) { - parent_class = g_type_class_ref(EM_TYPE_FORMAT_HTML_PRINT); + parent_class = g_type_class_peek_parent (class); class->finalize = efhp_finalize; } diff --git a/mail/em-format.c b/mail/em-format.c index ef08d206ff..5b38f6cea3 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -1109,7 +1109,7 @@ em_format_format_text(EMFormat *emf, CamelStream *stream, CamelDataWrapper *dw) camel_object_unref(filter_stream); camel_stream_reset (mem_stream); - if (max == -1 || size < (max * 1024) || emf->composer) { + if (max == -1 || size == -1 || size < (max * 1024) || emf->composer) { camel_stream_write_to_stream(mem_stream, (CamelStream *)stream); camel_stream_flush((CamelStream *)stream); } else { diff --git a/mail/message-list.c b/mail/message-list.c index b52ec71b82..921dc34c58 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -41,6 +41,7 @@ #include #include #include +#include #include @@ -4060,7 +4061,7 @@ regen_list_exec (struct _regen_list_msg *m) on the flag whether we can view deleted messages or not. */ if (!was_deleted || (was_deleted && !m->hidedel)) - g_ptr_array_add (uids, g_strdup (looking_for)); + g_ptr_array_add (uids, (gpointer) camel_pstring_strdup (looking_for)); } } } -- cgit v1.2.3