diff options
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/em-folder-view.c | 19 | ||||
| -rw-r--r-- | ui/ChangeLog | 6 | ||||
| -rw-r--r-- | ui/evolution-mail-message.xml | 4 |
4 files changed, 16 insertions, 21 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index bbbabf73d8..84f7066075 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2008-08-07 Paul Bolle <pebolle@tiscali.nl> + + ** Fix for bug #546788 + + * em-folder-view.c: "/commands/ViewNormal" isn't actually used. It is + probably a leftover from a previous way of setting the formatting + style. It can be removed. Related cleanups. + 2008-08-06 Paul Bolle <pebolle@tiscali.nl> ** Fix for bug #546668 diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 3dad22a1a3..b16312762b 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -220,13 +220,6 @@ static const EMFolderViewEnable emfv_enable_map[] = { { "MailStop", 0 }, { NULL }, - - /* always enabled - - { "ViewFullHeaders", IS_0MESSAGE, 0 }, - { "ViewNormal", IS_0MESSAGE, 0 }, - { "ViewSource", IS_0MESSAGE, 0 }, - { "CaretMode", IS_0MESSAGE, 0 }, */ }; struct _EMFolderViewPrivate { @@ -2210,13 +2203,6 @@ emfv_enable_menus(EMFolderView *emfv) g_string_free(name, TRUE); } -/* must match em_format_mode_t order */ -static const char * const emfv_display_styles[] = { - "/commands/ViewNormal", - "/commands/ViewFullHeaders", - "/commands/ViewSource" -}; - static void emfv_view_mode(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data) { @@ -2300,10 +2286,9 @@ emfv_activate(EMFolderView *emfv, BonoboUIComponent *uic, int act) bonobo_ui_component_add_listener(uic, "CaretMode", emfv_caret_mode, emfv); style = ((EMFormat *)emfv->preview)->mode?EM_FORMAT_ALLHEADERS:EM_FORMAT_NORMAL; - bonobo_ui_component_set_prop(uic, emfv_display_styles[style], "state", style?"1":"0", NULL); - /* bonobo_ui_component_add_listener(uic, "ViewNormal", emfv_view_mode, emfv); */ + if (style) + bonobo_ui_component_set_prop(uic, "/commands/ViewFullHeaders", "state", "1", NULL); bonobo_ui_component_add_listener(uic, "ViewFullHeaders", emfv_view_mode, emfv); - /* bonobo_ui_component_add_listener(uic, "ViewSource", emfv_view_mode, emfv); */ em_format_set_mode((EMFormat *)emfv->preview, style); if (emfv->folder) diff --git a/ui/ChangeLog b/ui/ChangeLog index 74f5a17b9e..b6402cb979 100644 --- a/ui/ChangeLog +++ b/ui/ChangeLog @@ -1,3 +1,9 @@ +2008-08-07 Paul Bolle <pebolle@tiscali.nl> + + ** Fix for bug #546788 + + * evolution-mail-message.xml: Drop unused "ViewNormal" cmd entry. + 2008-08-01 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #517825 diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml index 5b0a29c57d..0acbc44647 100644 --- a/ui/evolution-mail-message.xml +++ b/ui/evolution-mail-message.xml @@ -214,10 +214,6 @@ _tip="Force images in HTML mail to be loaded" accel="*Control*i" pixtype="pixbuf"/> - <cmd name="ViewNormal" - _tip="Show messages in the normal style" - type="radio" group="message_display"/> - <cmd name="ViewSource" _tip="Show the raw email source of the message" accel="*Control*u"/> |