display x-evolution-mailer pseudo header irrespective of xmailer_mask.

2003-12-11  Grahame Bowland  <grahame@angrygoats.net>

	* em-format-html.c (efh_format_header): display
	x-evolution-mailer pseudo header irrespective of
	xmailer_mask. This is now handled by a header
	configuration dialog.

	* mail-config.glade: add tab to mail configuration
	dialog to allow custom headers to be specified for
	display.

	* em-mailer-prefs.h: modify struct _EMMailerPrefs to
	add widgets for custom header tab. Add defines for custom
	header flags. Add struct EMMailerCustomHeader to describe
	custom headers, and add function
	em_mailer_custom_headers_from_xml to allow XML from gconf
	key to be parsed into this structure.

	* em-folder-view.c (emfv_setting_notify): catch changes to
	custom header gconf key and update mail view to correspond

	* em-mailer-prefs.c (em_mailer_prefs_apply): save custom
	headers to gconf
	(header_list_enabled_toggled): toggle clicked toggle column
	(add_header): add header to custom header list if valid
	(remove_header): remove selected custom header
	(is_valid_header): return true if passed header is valid,
	otherwise false
	(entry_header_changed):	call add_header_update_sensitivity
	(em_mailer_prefs_construct): initialise header selection tab.
	Load gconf data for header selection dialog.
	(em_mailer_custom_header_to_xml): load a header structure
	from XML document structure
	(em_mailer_custom_header_from_xml): load a header
	structure from a string containing valid XML. if any failure,
	the header.name is set to NULL.
	(header_list_row_selected): call
	remove_header_update_sensitivity
	(remove_header_update_sensitivity): set the sensitivity of
	the remove button to FALSE if the list is empty or nothing
	is selected. Otherwise, set it to TRUE.
	(add_header_update_sensitivity): set the sensitivity of the
	the add button to FALSE if the entry box is empty, contains
	a duplicate header, or contains an invalid header. Otherwise,
	set it to TRUE.

	* evolution-mail.schemas.in.in: add mail/display/headers

svn path=/trunk/; revision=23924

1 files changed, 171 insertions, 0 deletions

diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 7b451f0a56..b900f19870 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -4477,6 +4477,177 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
       </child>
 
       <child>
+	<widget class="GtkVBox" id="vboxHeaderTab">
+	  <property name="border_width">6</property>
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">0</property>
+
+	  <child>
+	    <widget class="GtkLabel" id="lblHeaders">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">&lt;b&gt;_Displayed Mail Headers&lt;/b&gt;</property>
+	      <property name="use_underline">True</property>
+	      <property name="use_markup">True</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="mnemonic_widget">txtHeaders</property>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkHBox" id="hboxTreeButtons">
+	      <property name="border_width">6</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkVBox" id="vboxEntryTree">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+
+		  <child>
+		    <widget class="GtkEntry" id="txtHeaders">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="editable">True</property>
+		      <property name="visibility">True</property>
+		      <property name="max_length">0</property>
+		      <property name="text" translatable="yes"></property>
+		      <property name="has_frame">True</property>
+		      <property name="invisible_char" translatable="yes">*</property>
+		      <property name="activates_default">False</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkScrolledWindow" id="scrolledwindow49">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		      <property name="shadow_type">GTK_SHADOW_NONE</property>
+		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+		      <child>
+			<widget class="GtkTreeView" id="treeHeaders">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="headers_visible">False</property>
+			  <property name="rules_hint">False</property>
+			  <property name="reorderable">False</property>
+			  <property name="enable_search">True</property>
+			</widget>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkVBox" id="vbox162">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
+		  <child>
+		    <widget class="GtkButton" id="cmdHeadersAdd">
+		      <property name="visible">True</property>
+		      <property name="sensitive">False</property>
+		      <property name="can_focus">True</property>
+		      <property name="label">gtk-add</property>
+		      <property name="use_stock">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">6</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkButton" id="cmdHeadersRemove">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label">gtk-remove</property>
+		      <property name="use_stock">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">6</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="tab_expand">False</property>
+	  <property name="tab_fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkLabel" id="lblHeaders">
+	  <property name="visible">True</property>
+	  <property name="label" translatable="yes">H_eaders</property>
+	  <property name="use_underline">True</property>
+	  <property name="use_markup">False</property>
+	  <property name="justify">GTK_JUSTIFY_LEFT</property>
+	  <property name="wrap">False</property>
+	  <property name="selectable">False</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+	<packing>
+	  <property name="type">tab</property>
+	</packing>
+      </child>
+
+      <child>
 	<widget class="GtkVBox" id="vbox161">
 	  <property name="border_width">6</property>
 	  <property name="visible">True</property>