aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog10
-rw-r--r--addressbook/gui/component/addressbook-view.c2
-rw-r--r--addressbook/gui/widgets/e-addressbook-view.c10
-rw-r--r--addressbook/gui/widgets/e-addressbook-view.h2
4 files changed, 18 insertions, 6 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 9aeb4e33b2..1b12cebd0e 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,13 @@
+2005-07-21 Sushma Rai <rsushma@novell.com>
+
+ * gui/widgets/e-addressbook-view.[ch] (eab_view_delete_selection):
+ Prompt for confirmation only while deleting the contact, and not for
+ cut operation.
+ (delete)(eab_view_cut): Using the flag to inidicate delete/cut.
+
+ * addressbook/gui/component/addressbook-view.c (delete_contact_cb):
+ Similar. Fixes #311090
+
2005-07-19 Arunprakash <arunp@novell.com>
* gui/widgets/eab-gui-util.c: Added two new entries in array
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index 78d44d83c9..9923c31a62 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -179,7 +179,7 @@ delete_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
AddressbookView *view = (AddressbookView *) user_data;
EABView *v = get_current_view (view);
if (v)
- eab_view_delete_selection(v);
+ eab_view_delete_selection(v, TRUE);
}
static void
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);