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

4 files changed, 25 insertions, 0 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index e65ea1cb60..3f01449f92 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,16 @@
+2001-08-08  Nat Friedman  <nat@ximian.com>
+
+	* 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.
+
 2001-08-07  Chris Toshok  <toshok@ximian.com>
 
 	* gui/component/addressbook-storage.c (remove_ldap_folder): ifdef
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index ae1ef0ff95..1a5f154111 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -982,6 +982,7 @@ print_cb (BonoboUIComponent *uih, void *data, const char *path)
 	gtk_widget_show(e_contact_print_card_dialog_new(ce->card));
 }
 
+#if 0 /* Envelope printing is disabled for Evolution 1.0. */
 /* Emits the signal to request printing a card */
 static void
 print_envelope_cb (BonoboUIComponent *uih, void *data, const char *path)
@@ -995,6 +996,7 @@ print_envelope_cb (BonoboUIComponent *uih, void *data, const char *path)
 
 	gtk_widget_show(e_contact_print_envelope_dialog_new(ce->card));
 }
+#endif
 
 /* Toolbar/Save and Close callback */
 static void
@@ -1015,7 +1017,9 @@ BonoboUIVerb verbs [] = {
 	BONOBO_UI_UNSAFE_VERB ("ContactEditorSendTo", file_send_to_cb),
 	BONOBO_UI_UNSAFE_VERB ("ContactEditorDelete", delete_cb),
 	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrint", print_cb),
+#if 0 /* Envelope printing is disabled for Evolution 1.0. */
 	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrintEnvelope", print_envelope_cb),
+#endif
 	/*	BONOBO_UI_UNSAFE_VERB ("ContactEditorPageSetup", file_page_setup_menu), */
 	BONOBO_UI_UNSAFE_VERB ("ContactEditorClose", file_close_cb),
 	
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index 04f17fd074..47f81db581 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -173,6 +173,7 @@ print (GtkWidget *widget, ModelAndSelection *mns)
 	model_and_selection_free (mns);
 }
 
+#if 0 /* Envelope printing is disabled for Evolution 1.0. */
 static void
 print_envelope (GtkWidget *widget, ModelAndSelection *mns)
 {
@@ -184,6 +185,7 @@ print_envelope (GtkWidget *widget, ModelAndSelection *mns)
 	g_list_free (list);
 	model_and_selection_free (mns);
 }
+#endif
 
 static void
 card_changed_cb (EBook* book, EBookStatus status, gpointer user_data)
@@ -231,7 +233,9 @@ e_addressbook_reflow_adapter_right_click (EAddressbookReflowAdapter *adapter, Gd
 			      {N_("Send contact to other"), NULL, GTK_SIGNAL_FUNC(send_as), NULL, 0},
 			      {N_("Send message to contact"), NULL, GTK_SIGNAL_FUNC(send_to), NULL, 0},
 			      {N_("Print"), NULL, GTK_SIGNAL_FUNC(print), NULL, 0},
+#if 0 /* Envelope printing is disabled for Evolution 1.0. */
 			      {N_("Print Envelope"), NULL, GTK_SIGNAL_FUNC(print_envelope), NULL, 0},
+#endif
 			      {N_("Delete"), NULL, GTK_SIGNAL_FUNC(delete), NULL, 0},
 			      {NULL, NULL, NULL, 0}};
 
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 74935dc242..709b0fdfde 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -633,12 +633,14 @@ print (GtkWidget *widget, CardAndBook *card_and_book)
 	card_and_book_free(card_and_book);
 }
 
+#if 0 /* Envelope printing is disabled for Evolution 1.0. */
 static void
 print_envelope (GtkWidget *widget, CardAndBook *card_and_book)
 {
 	gtk_widget_show(e_contact_print_envelope_dialog_new(card_and_book->card));
 	card_and_book_free(card_and_book);
 }
+#endif
 
 static void
 delete (GtkWidget *widget, CardAndBook *card_and_book)
@@ -671,7 +673,9 @@ table_right_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EA
 			{N_("Send contact to other"), NULL, GTK_SIGNAL_FUNC(send_as), NULL, 0},
 			{N_("Send message to contact"), NULL, GTK_SIGNAL_FUNC(send_to), NULL, 0},
 			{N_("Print"), NULL, GTK_SIGNAL_FUNC(print), NULL, 0},
+#if 0 /* Envelope printing is disabled for Evolution 1.0. */
 			{N_("Print Envelope"), NULL, GTK_SIGNAL_FUNC(print_envelope), NULL, 0},
+#endif
 			{N_("Delete"), NULL, GTK_SIGNAL_FUNC(delete), NULL, 0},
 			{NULL, NULL, NULL, NULL, 0}
 		};