diff options
| author | Not Zed <NotZed@Ximian.com> | 2004-07-10 09:31:04 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2004-07-10 09:31:04 +0800 |
| commit | 27f894733e551067737a21bc21259ccbda60c777 (patch) | |
| tree | a32a38714a27a064efcd1306bc154a11365af6f0 /mail/em-folder-browser.c | |
| parent | 991e6790184c21f39e27047ef165c5da3703b4c8 (diff) | |
| download | gsoc2013-evolution-27f894733e551067737a21bc21259ccbda60c777.tar.gz gsoc2013-evolution-27f894733e551067737a21bc21259ccbda60c777.tar.zst gsoc2013-evolution-27f894733e551067737a21bc21259ccbda60c777.zip | |
only call expunge if the folder is set. (emfb_enable_map[]): only enable
2004-07-09 Not Zed <NotZed@Ximian.com>
* em-folder-browser.c (emfb_folder_expunge): only call expunge if
the folder is set.
(emfb_enable_map[]): only enable expunge menu item if we have a
valid folder set.
** See bug #60900.
* em-format-html.c: convert the text_inline_parts hash to be keyed
off the partid.
(efh_free_inline_parts): -> efh_free_cache and fix to do it.
* em-format.c (emf_free_cache): make the inline table cache other
info too based on partid, this frees the structure.
(emf_clone_inlines): copy all of the cache data.
(em_format_is_inline): use the new data structure to determine
state.
(em_format_set_inline): same for setting.
(emf_multipart_signed): cache/lookup the cached part.
(emf_insert_cache): helper to add a cache entry.
(emf_multipart_encrypted): cache decrypted part.
(emf_application_xpkcs7mime): same.
2004-07-08 Not Zed <NotZed@Ximian.com>
** See bug #60900 (related only).
* em-format-html-display.c (efhd_attachment_show): let set_inline
do the redraw itself if required. kill some dead code.
* em-format.c (em_format_set_inline): trigger a redraw here like
the other em_format_set methods, if the state changed.
* em-format.c (emf_format_clone): free inline table keys & setup
string hash table.
* em-format-quote.c (emfq_format_attachment):
* em-format-html-display.c (efhd_format_attachment):
* em-format-html.c (efh_format_attachment): is_inline api changes.
* em-format-html-display.c (efhd_attachment_show): set_inline api
changes.
* em-format.c (em_format_is_inline): make this use the partid
rather than the part address as a key, which may change.
(emf_init): make the inline talbe a string hashtable.
(emf_finalise): free inline keys.
(emf_clone_inlines): copy the key string.
svn path=/trunk/; revision=26614
Diffstat (limited to 'mail/em-folder-browser.c')
| -rw-r--r-- | mail/em-folder-browser.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index e61453e8ce..e9c14ea600 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -556,8 +556,9 @@ static void emfb_folder_expunge(BonoboUIComponent *uid, void *data, const char *path) { EMFolderBrowser *emfb = data; - - em_utils_expunge_folder(gtk_widget_get_toplevel((GtkWidget *)emfb), emfb->view.folder); + + if (emfb->view.folder) + em_utils_expunge_folder(gtk_widget_get_toplevel((GtkWidget *)emfb), emfb->view.folder); } static void @@ -722,6 +723,7 @@ static const EMFolderViewEnable emfb_enable_map[] = { { "EditInvertSelection", EM_POPUP_SELECT_FOLDER }, { "EditSelectAll", EM_POPUP_SELECT_FOLDER }, { "EditSelectThread", EM_FOLDER_VIEW_SELECT_THREADED }, + { "FolderExpunge", EM_POPUP_SELECT_FOLDER }, { "MailPost", EM_POPUP_SELECT_FOLDER }, { "MessageMarkAllAsRead", EM_POPUP_SELECT_FOLDER }, { "ViewHideSelected", EM_POPUP_SELECT_MANY }, |