[evolution-patches] [PATCH] patch for bug 57940

[Jerome Lacoste <jerome coffeebreaks org>]

Note: I also have made a patch for bug 57177 and it needs review.


I've had a hard time to produce the patch

cvs diff evolution worked but cvs diff -u evolution
kept failing with the following error, even after I rm -rf then cvs co
again:

cvs server: Diffing evolution/addressbook
cvs [server aborted]: could not find desired version 1.1697 in
/cvs/gnome/evolution/addressbook/ChangeLog,v

So I've done the following:

  cvs diff -u evolution/addressbook > patch_57940_3.txt 
  cvs diff -u evolution/ui > patch_57940_4.txt 
  cat patch_57940_3.txt patch_57940_4.txt > patch_57940_5.txt 

really strange bug....

Any idea what could have happened?

Jerome

Index: evolution/addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1697
diff -u -r1.1697 ChangeLog
--- a/evolution/addressbook/ChangeLog	5 May 2004 06:24:11 -0000	1.1697
+++ b/evolution/addressbook/ChangeLog	6 May 2004 23:09:08 -0000
@@ -1,3 +1,9 @@
+2004-05-06  Jerome Lacoste <jerome coffeebreaks org>
+
+        * evolution/addressbook/gui/widgets/e-addressbook-view.c: 
+        Fixed Bug #57940
+        Save as VCard -> Save as VCard...
+
 2004-05-05  Hans Petter Jansson  <hpj ximian com>
 
 	* gui/contact-editor/e-contact-editor.c (init_address_textview):
Index: evolution/addressbook/gui/widgets/e-addressbook-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-addressbook-view.c,v
retrieving revision 1.138
diff -u -r1.138 e-addressbook-view.c
--- a/evolution/addressbook/gui/widgets/e-addressbook-view.c	13 Apr 2004 07:10:49 -0000	1.138
+++ b/evolution/addressbook/gui/widgets/e-addressbook-view.c	6 May 2004 23:09:18 -0000
@@ -847,7 +847,7 @@
 {
 	GList *contacts = get_contact_list (contact_and_book);
 	if (contacts) {
-		eab_contact_list_save(_("Save as VCard"), contacts, NULL);
+		eab_contact_list_save(_("Save as VCard..."), contacts, NULL);
 		e_free_object_list(contacts);
 	}
 }
@@ -1067,7 +1067,7 @@
 		E_POPUP_ITEM (N_("Pilot Settings..."), G_CALLBACK (pilot_settings), 0),
 #endif
 		E_POPUP_SEPARATOR,
-		E_POPUP_ITEM (N_("Save as VCard"), G_CALLBACK(save_as), POPUP_NOSELECTION_MASK),
+		E_POPUP_ITEM (N_("Save as VCard..."), G_CALLBACK(save_as), POPUP_NOSELECTION_MASK),
 		E_POPUP_ITEM (N_("Forward Contact"), G_CALLBACK(send_as), POPUP_NOSELECTION_MASK),
 		E_POPUP_ITEM (N_("Send Message to Contact"), G_CALLBACK(send_to), POPUP_NOSELECTION_MASK | POPUP_NOEMAIL_MASK),
 		E_POPUP_ITEM (N_("Print"), G_CALLBACK(print), POPUP_NOSELECTION_MASK),
@@ -2063,7 +2063,7 @@
 {
 	GList *list = get_selected_contacts (view);
 	if (list)
-		eab_contact_list_save (_("Save as VCard"), list, NULL);
+		eab_contact_list_save (_("Save as VCard..."), list, NULL);
 	e_free_object_list(list);
 }
 
Index: evolution/ui/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ui/ChangeLog,v
retrieving revision 1.389
diff -u -r1.389 ChangeLog
--- a/evolution/ui/ChangeLog	3 May 2004 14:34:16 -0000	1.389
+++ b/evolution/ui/ChangeLog	6 May 2004 23:11:43 -0000
@@ -1,3 +1,8 @@
+2004-05-06  Jerome Lacoste <jerome coffeebreaks org>
+
+       * ui/evolution-addressbook.xml: Fixed Bug #57940
+        Save as VCard -> Save as VCard...
+
 2004-04-30  Dave Fallon <davef tetsubo com>
 
        * ui/evolution-addressbook.xml: Fixed Bug #57611.
Index: evolution/ui/evolution-addressbook.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-addressbook.xml,v
retrieving revision 1.62
diff -u -r1.62 evolution-addressbook.xml
--- a/evolution/ui/evolution-addressbook.xml	3 May 2004 14:34:16 -0000	1.62
+++ b/evolution/ui/evolution-addressbook.xml	6 May 2004 23:11:44 -0000
@@ -36,7 +36,7 @@
 	 _tip="Select all contacts"
 	 accel="*Control*a"/>
 
-    <cmd name="ContactsSaveAsVCard" _label="Save as VCard"
+    <cmd name="ContactsSaveAsVCard" _label="Save as VCard..."
 	 _tip="Save selected contacts as a VCard."
 	 accel="*Control**Alt*s"/>
 
@@ -66,7 +66,7 @@
 	<menuitem name="ContactsView"
 		  verb="" _label="_Open"/>
 	<menuitem name="ContactsSaveAsVCard"
-		  verb="" _label="_Save as VCard"
+		  verb="" _label="_Save as VCard..."
 		  pixtype="pixbuf"/>
       </placeholder>