aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@novell.com>2009-01-30 00:10:16 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2009-01-30 00:10:16 +0800
commita4c046053dd34ef08f2e3d564bf36f4e00030d4e (patch)
treeaf3c430a795e1cf927b5bb5b194adbc1c36a7dcb
parent0ab6dc569c130a4dec50efd56c2512476ea06994 (diff)
downloadgsoc2013-evolution-a4c046053dd34ef08f2e3d564bf36f4e00030d4e.tar.gz
gsoc2013-evolution-a4c046053dd34ef08f2e3d564bf36f4e00030d4e.tar.zst
gsoc2013-evolution-a4c046053dd34ef08f2e3d564bf36f4e00030d4e.zip
Show attachment bar at all times. Seems like the contents are missing at
2009-01-29 Srinivasa Ragavan <sragavan@novell.com> * 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. svn path=/trunk/; revision=37176
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/em-format-html-display.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 455d42d27d..c0df32d91c 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,11 @@
2009-01-29 Srinivasa Ragavan <sragavan@novell.com>
+ * 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 <sragavan@novell.com>
+
* em-format.c: (em_format_format_text): Handle empty messages well.
2009-01-29 Srinivasa Ragavan <sragavan@novell.com>
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 7793b2da39..49e2d1bac9 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -2352,7 +2352,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;
}
@@ -2435,7 +2436,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);