evolution r35929 - in trunk: mail ui

[mbarnes svn gnome org]

Author: mbarnes
Date: Thu Aug  7 19:30:06 2008
New Revision: 35929
URL: http://svn.gnome.org/viewvc/evolution?rev=35929&view=rev

Log:
2008-08-07  Paul Bolle  <pebolle tiscali nl>

	** Fix for bug #546788

	* mail/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.

	* ui/evolution-mail-message.xml: Drop unused "ViewNormal" cmd entry.



Modified:
   trunk/mail/ChangeLog
   trunk/mail/em-folder-view.c
   trunk/ui/ChangeLog
   trunk/ui/evolution-mail-message.xml

Modified: trunk/mail/em-folder-view.c
==============================================================================
--- trunk/mail/em-folder-view.c	(original)
+++ trunk/mail/em-folder-view.c	Thu Aug  7 19:30:06 2008
@@ -220,13 +220,6 @@
 	{ "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 @@
 	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 @@
 		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)

Modified: trunk/ui/evolution-mail-message.xml
==============================================================================
--- trunk/ui/evolution-mail-message.xml	(original)
+++ trunk/ui/evolution-mail-message.xml	Thu Aug  7 19:30:06 2008
@@ -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"/>