diff options
| author | Parthasarathi Susarla <sparthasarathi@novell.com> | 2005-08-11 14:02:31 +0800 |
|---|---|---|
| committer | Parthasarathi Susarla <saps@src.gnome.org> | 2005-08-11 14:02:31 +0800 |
| commit | 2fa1dd24d2f04c4bbfd738bbce842d30b9cb82e7 (patch) | |
| tree | d8179cf470fa4645799ef396b5360b8f8f84d7d9 /mail | |
| parent | 79e68e099cb9e3b1a93201ade1f9609d82807ead (diff) | |
| download | gsoc2013-evolution-2fa1dd24d2f04c4bbfd738bbce842d30b9cb82e7.tar.gz gsoc2013-evolution-2fa1dd24d2f04c4bbfd738bbce842d30b9cb82e7.tar.zst gsoc2013-evolution-2fa1dd24d2f04c4bbfd738bbce842d30b9cb82e7.zip | |
return the target in any case. It will be an empty target and not NULL.
2005-08-11 Parthasarathi Susarla <sparthasarathi@novell.com>
* em-folder-view.c
(emfv_enable_menus): return the target in any case.
It will be an empty target and not NULL.
Fixes bug ** 312420
svn path=/trunk/; revision=30086
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/em-folder-browser.c | 3 | ||||
| -rw-r--r-- | mail/em-folder-view.c | 10 |
3 files changed, 12 insertions, 8 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 817330bc80..6ea038aaeb 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2005-08-11 Parthasarathi Susarla <sparthasarathi@novell.com> + + * em-folder-view.c + (emfv_enable_menus): return the target in any case. + It will be an empty target and not NULL. + Fixes bug ** 312420 + 2005-08-11 Srinivasa Ragavan <sragavan@novell.com> * em-format-html-display.c (efhd_attachment_bar_refresh) (efhd_bar_resize) diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 1f89a2c569..a161f4d37e 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -297,7 +297,8 @@ GtkWidget *em_folder_browser_new(void) * @Class: org.gnome.evolution.mail.bonobomenu:1.0 * @Target: EMMenuTargetSelect * - * The main menu of mail view of the main application window. + * The main menu of mail view of the main application window. + * If the folder is NULL (not selected), the target will be empty, not NULL. */ ((EMFolderView *)emfb)->menu = em_menu_new("org.gnome.evolution.mail.browser"); diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index e108e0a90e..a02bd19aca 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -1827,14 +1827,10 @@ emfv_enable_menus(EMFolderView *emfv) { if (emfv->menu) { - if (emfv->folder) { - EMMenuTargetSelect *t; + EMMenuTargetSelect *t; - t = em_menu_target_new_select(emfv->menu, emfv->folder, emfv->folder_uri, message_list_get_selected(emfv->list)); - e_menu_update_target((EMenu *)emfv->menu, t); - } else { - e_menu_update_target((EMenu *)emfv->menu, NULL); - } + t = em_menu_target_new_select(emfv->menu, emfv->folder, emfv->folder_uri, message_list_get_selected(emfv->list)); + e_menu_update_target((EMenu *)emfv->menu, t); } } |