From 56b5ddf1ca2d8cd63f2c10fba1b0018037c6ad69 Mon Sep 17 00:00:00 2001 From: Sushma Rai Date: Thu, 21 Jul 2005 13:27:37 +0000 Subject: Not prompting the delete confirmation dialog for cut contact operation. Fixes #311090 svn path=/trunk/; revision=29833 --- addressbook/gui/widgets/e-addressbook-view.c | 10 ++++++---- addressbook/gui/widgets/e-addressbook-view.h | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 276567e6cc..91f16b25c2 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -877,7 +877,7 @@ delete (EPopup *ep, EPopupItem *pitem, void *data) { ContactAndBook *contact_and_book = data; - eab_view_delete_selection(contact_and_book->view); + eab_view_delete_selection(contact_and_book->view, TRUE); } static void @@ -1851,7 +1851,7 @@ eab_view_print_preview(EABView *view) } void -eab_view_delete_selection(EABView *view) +eab_view_delete_selection(EABView *view, gboolean is_delete) { GList *list, *l; gboolean plural = FALSE, is_list = FALSE; @@ -1869,7 +1869,9 @@ eab_view_delete_selection(EABView *view) if (e_contact_get (contact, E_CONTACT_IS_LIST)) is_list = TRUE; - if (!eab_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(view->widget)), + /* confirm delete */ + if (is_delete && + !eab_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(view->widget)), plural, is_list, name)) { g_free (name); return; @@ -2039,7 +2041,7 @@ void eab_view_cut (EABView *view) { eab_view_copy (view); - eab_view_delete_selection (view); + eab_view_delete_selection (view, FALSE); } void diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h index 737605a80f..08371ae009 100644 --- a/addressbook/gui/widgets/e-addressbook-view.h +++ b/addressbook/gui/widgets/e-addressbook-view.h @@ -132,7 +132,7 @@ void eab_view_send (EABView *view); void eab_view_send_to (EABView *view); void eab_view_print (EABView *view); void eab_view_print_preview (EABView *view); -void eab_view_delete_selection (EABView *view); +void eab_view_delete_selection (EABView *view, gboolean is_delete); void eab_view_cut (EABView *view); void eab_view_copy (EABView *view); void eab_view_paste (EABView *view); -- cgit v1.2.3