[evolution-patches] patch for #70922 (addressbook)

[Sivaiah Nallagatla <snallagatla novell com>]

simple patch attached to show "other" as the email type when vcard does
not carry type explicitly or carries something other than home and work 


Siva

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1891
diff -u -r1.1891 ChangeLog
--- ChangeLog	17 Jan 2005 02:57:59 -0000	1.1891
+++ ChangeLog	17 Jan 2005 17:33:14 -0000
@@ -1,3 +1,13 @@
+2005-01-17 Sivaiah Nallagatla <snallagatla novell com>
+
+	* gui/contact-editor/e-contact-editor.c 
+	(fill_in_email_record) : show "other" when email 
+	does not carry "TYPE"
+	(fill_in_email) : pass deafult email 
+	types instead of -1 when clearing fields 
+	
+	Fixes #70922 
+	
 2005-01-17 Hao Sheng  <hao sheng sun com>
 
 	* gui/contact-editor/contact-editor.glade:
Index: gui/contact-editor/e-contact-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/e-contact-editor.c,v
retrieving revision 1.226
diff -u -r1.226 e-contact-editor.c
--- gui/contact-editor/e-contact-editor.c	9 Dec 2004 01:42:37 -0000	1.226
+++ gui/contact-editor/e-contact-editor.c	17 Jan 2005 17:33:29 -0000
@@ -684,7 +684,7 @@
 	g_free (widget_name);
 
 	set_option_menu_history (editor, GTK_OPTION_MENU (location_option_menu),
-				 location >= 0 ? location : email_default [record - 1]);
+				 location >= 0 ? location : email_default[2]);
 	set_entry_text (editor, GTK_ENTRY (email_entry), address ? address : "");
 }
 
@@ -885,7 +885,7 @@
 	/* Clear */
 
 	for (record_n = 1; record_n <= EMAIL_SLOTS; record_n++) {
-		fill_in_email_record (editor, record_n, NULL, -1);
+		fill_in_email_record (editor, record_n, NULL, email_default [record_n -1]);
 	}
 
 	/* Fill in */