aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/component
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook/gui/component')
-rw-r--r--addressbook/gui/component/addressbook-component.c17
-rw-r--r--addressbook/gui/component/addressbook-storage.c2
2 files changed, 17 insertions, 2 deletions
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index 2979d211eb..54940faeab 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -505,6 +505,20 @@ destination_folder_handle_drop (EvolutionShellComponentDndDestinationFolder *fol
}
+/* Quitting. */
+
+static gboolean
+request_quit (EvolutionShellComponent *shell_component,
+ void *data)
+{
+ if (! e_contact_editor_request_close_all ()
+ || ! e_contact_list_editor_request_close_all ())
+ return FALSE;
+ else
+ return TRUE;
+}
+
+
/* The factory function. */
static void
@@ -549,7 +563,8 @@ create_component (void)
remove_folder, xfer_folder,
NULL,
get_dnd_selection,
- NULL, NULL);
+ request_quit,
+ NULL);
destination_interface = evolution_shell_component_dnd_destination_folder_new (destination_folder_handle_motion,
destination_folder_handle_drop,
diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c
index d3430dd476..358c3e8245 100644
--- a/addressbook/gui/component/addressbook-storage.c
+++ b/addressbook/gui/component/addressbook-storage.c
@@ -165,7 +165,7 @@ addressbook_get_other_contact_storage (void)
EvolutionStorageResult result;
if (storage == NULL) {
- storage = evolution_storage_new (U_("Other Contacts"), FALSE);
+ storage = evolution_storage_new (U_("Other Contacts"), TRUE);
gtk_signal_connect (GTK_OBJECT (storage),
"remove_folder",
GTK_SIGNAL_FUNC(remove_ldap_folder), NULL);