diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2009-02-01 03:03:12 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-02-01 03:03:12 +0800 |
| commit | fee5916b60c605ff5086d8fdc2a85c5ea21351f6 (patch) | |
| tree | 4feaede1cf070448a32bd0ab846908e47747ceb7 /mail/em-format-html-display.c | |
| parent | cd5ff486fb02451645f8b4b39608edca2da5e4a2 (diff) | |
| download | gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.tar.gz gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.tar.zst gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.zip | |
Merge revisions 37108:37199 from trunk.
svn path=/branches/kill-bonobo/; revision=37200
Diffstat (limited to 'mail/em-format-html-display.c')
| -rw-r--r-- | mail/em-format-html-display.c | 5 |
1 files changed, 3 insertions, 2 deletions
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); |