From 581740ce36eed13bed3e269fde3c0f117f3950ac Mon Sep 17 00:00:00 2001
From: Nat Friedman <nat@ximian.com>
Date: Wed, 8 Aug 2001 10:27:28 +0000
Subject: Fixes Clahey bug #2200 :-)

2001-08-08  Nat Friedman  <nat@ximian.com>

	* evolution-contact-editor.xml: Removed Print Envelope since it's
	disabled for Evolution 1.0.

	* gui/widgets/e-addressbook-reflow-adapter.c (print_envelope): If 0'd out
	since Envelope printing is disabled for 1.0.
	* gui/widgets/e-addressbook-view.c (print_envelope): Likewise.
	* gui/contact-editor/e-contact-editor.c (print_envelope_cb): Likewise.

	* gui/widgets/e-addressbook-reflow-adapter.c
	(e_addressbook_reflow_adapter_right_click): Removed "Print
	Envelope" menu item.
	* gui/widgets/e-addressbook-view.c (table_right_click): Likewise.
	* gui/contact-editor/e-contact-editor.c	(verbs): Likewise.

svn path=/trunk/; revision=11780
---
 ui/ChangeLog                    | 5 +++++
 ui/evolution-contact-editor.xml | 5 +++++
 2 files changed, 10 insertions(+)

(limited to 'ui')

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 7c7288133c..46da1f30d1 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-08  Nat Friedman  <nat@ximian.com>
+
+	* evolution-contact-editor.xml: Removed Print Envelope since it's
+	disabled for Evolution 1.0.
+
 2001-08-07  Ettore Perazzoli  <ettore@ximian.com>
 
 	* evolution-mail-messagedisplay.xml: Remove "Customize toolbar"
diff --git a/ui/evolution-contact-editor.xml b/ui/evolution-contact-editor.xml
index 7916ef9986..12e9e0ce33 100644
--- a/ui/evolution-contact-editor.xml
+++ b/ui/evolution-contact-editor.xml
@@ -184,8 +184,10 @@ static GnomeUIInfo main_menu[] = {
 		 _tip="Print this item"
 		 pixtype="pixbuf"/>
 
+<!-- Envelope printing is disabled for Evolution 1.0.
 		<cmd name="ContactEditorPrintEnvelope"
 		 pixtype="pixbuf"/>
+-->
 
 		<cmd name="ContactEditorClose"
 		 pixtype="stock" pixname="Close"/>
@@ -222,8 +224,11 @@ static GnomeUIInfo main_menu[] = {
 				<menuitem name="ContactEditorPrint" verb=""
 				_label="_Print..."/>
 
+<!-- Envelope printing is disabled for Evolution 1.0.
+
 				<menuitem name="ContactEditorPrintEnvelope" verb=""
 				_label="Print En_velope..."/>
+-->
 
 			</placeholder>
 
-- 
cgit v1.2.3