[evolution-patches] Bug #22599

[Nirnimesh <nirnimesh students iiit net>]

Evolution 1.5
Bug #22599: Deleting contacts&lists should display contact name, plurals
& type (list)

Nirnimesh
Vardhman Jain
Priyanshu Raj.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1704
diff -u -r1.1704 ChangeLog
--- a/ChangeLog	12 May 2004 17:22:22 -0000	1.1704
+++ b/ChangeLog	28 May 2004 17:58:01 -0000
@@ -1,3 +1,6 @@
+2004-05-28 Nirnimesh <nirnimesh students iiit net>
+	* Fixed Bug #22599: Deleting contacts&lists should display contact name, plurals & type (list)
+
 2004-05-12  Hans Petter Jansson  <hpj ximian com>
 
 	* gui/contact-editor/contact-editor.glade: Add PO box entries.

Index: e-addressbook-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-addressbook-view.c,v
retrieving revision 1.139
diff -u -r1.139 e-addressbook-view.c
--- a/e-addressbook-view.c	11 May 2004 00:42:19 -0000	1.139
+++ b/e-addressbook-view.c	28 May 2004 17:40:56 -0000
@@ -920,7 +920,11 @@
 static void
 delete (GtkWidget *widget, ContactAndBook *contact_and_book)
 {
-	if (eab_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(contact_and_book->view->widget)))) {
+	/* XXX get the file as name .. not handled multiple selections :( */
+	EContact *contact_pre = get_contact_list(contact_and_book)->data;
+	gpointer contact_file_as = e_contact_get_const (contact_pre, E_CONTACT_FILE_AS);
+
+	if (eab_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(contact_and_book->view->widget)), contact_file_as)) {
 		EBook *book;
 		GList *list = get_contact_list(contact_and_book);
 		GList *iterator;
Index: eab-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/eab-editor.c,v
retrieving revision 1.2
diff -u -r1.2 eab-editor.c
--- eab-editor.c	26 Mar 2004 04:09:18 -0000	1.2
+++ eab-editor.c	28 May 2004 17:42:52 -0000
@@ -301,10 +301,12 @@
 }
 
 gboolean
-eab_editor_confirm_delete (GtkWindow *parent)
+eab_editor_confirm_delete (GtkWindow *parent, const char* name)
 {
 	GtkWidget *dialog;
 	gint result;
+	char* message=(char*) malloc(sizeof(char)*100+strlen(name));
+	sprintf(message, "Are you sure you want\nto delete the contact (%s)?", name);
 
 	dialog = gtk_message_dialog_new (parent,
 					 0,
@@ -316,8 +318,7 @@
 					  ? _("Are you sure you want\n"
 					      "to delete these contacts?"))
 #endif
-					  _("Are you sure you want\n"
-					    "to delete this contact?"));
+					  _(message));
 
 	gtk_dialog_add_buttons (GTK_DIALOG (dialog),
 				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
Index: eab-editor.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/eab-editor.h,v
retrieving revision 1.1
diff -u -r1.1 eab-editor.h
--- a/eab-editor.h	24 Mar 2004 19:58:15 -0000	1.1
+++ b/eab-editor.h	28 May 2004 17:51:18 -0000
@@ -90,7 +90,7 @@
 GtkWindow*      eab_editor_get_window        (EABEditor *editor);
 
 gboolean        eab_editor_prompt_to_save_changes (EABEditor *editor, GtkWindow *window);
-gboolean        eab_editor_confirm_delete    (GtkWindow *parent);
+gboolean        eab_editor_confirm_delete    (GtkWindow *parent, const char* name);
 
 /* these four generate EABEditor signals */
 void 		eab_editor_contact_added     (EABEditor *editor, EBookStatus status, EContact *contact);