Check with e_shell_prepare_for_quit() before quitting.

* e-shell-view-menu.c (command_quit): Check with
e_shell_prepare_for_quit() before quitting.

* e-shell.c (e_shell_prepare_for_quit): New.

* evolution-test-component.c (request_quit_fn): New function
asking for confirmation to quit.

* evolution-shell-component.c (evolution_shell_component_new): New
arg @request_quit_fn.
(impl_requestQuit): New, implementation for
EvolutionShellComponent::requestQuit.
(evolution_shell_component_result_to_string): Handle
EVOLUTION_SHELL_COMPONENT_CANCEL.
(evolution_shell_component_client_request_quit): New.

* Evolution-ShellComponent.idl (requestQuit): New.

* component-factory.c (create_component): Pass NULL as
@request_quit_fn.

* component-factory.c (create_component): Pass NULL as
@request_quit_fn.

* gui/component-factory.c (create_object): Pass NULL as
@request_quit_fn.

* gui/component/addressbook-component.c (create_component): Pass
NULL as @request_quit_fn.

svn path=/trunk/; revision=16925

1 files changed, 26 insertions, 20 deletions

diff --git a/shell/evolution-shell-component.h b/shell/evolution-shell-component.h
index b10613cb34..8cd1f98d96 100644
--- a/shell/evolution-shell-component.h
+++ b/shell/evolution-shell-component.h
@@ -52,6 +52,7 @@ typedef struct _EvolutionShellComponentClass   EvolutionShellComponentClass;
 
 enum _EvolutionShellComponentResult {
 	EVOLUTION_SHELL_COMPONENT_OK,
+	EVOLUTION_SHELL_COMPONENT_CANCEL,
 	EVOLUTION_SHELL_COMPONENT_CORBAERROR,
 	EVOLUTION_SHELL_COMPONENT_INTERRUPTED,
 	EVOLUTION_SHELL_COMPONENT_INVALIDARG,
@@ -110,6 +111,9 @@ typedef char * (* EvolutionShellComponentGetDndSelectionFn) (EvolutionShellCompo
 							     int *selection_length_return,
 							     void *closure);
 
+typedef gboolean (* EvolutionShellComponentRequestQuitFn) (EvolutionShellComponent *shell_component,
+							   void *closure);
+
 struct _EvolutionShellComponentFolderType {
 	char *name;
 	char *icon_name;
@@ -161,26 +165,28 @@ struct _EvolutionShellComponentClass {
 };
 
 
-GtkType                  evolution_shell_component_get_type   (void);
-void                     evolution_shell_component_construct  (EvolutionShellComponent                            *shell_component,
-							       const EvolutionShellComponentFolderType             folder_types[],
-							       const char                                         *external_uri_schemas[],
-							       EvolutionShellComponentCreateViewFn                 create_view_fn,
-							       EvolutionShellComponentCreateFolderFn               create_folder_fn,
-							       EvolutionShellComponentRemoveFolderFn               remove_folder_fn,
-							       EvolutionShellComponentXferFolderFn                 xfer_folder_fn,
-							       EvolutionShellComponentPopulateFolderContextMenuFn  populate_folder_context_menu_fn,
-							       EvolutionShellComponentGetDndSelectionFn            get_dnd_selection_fn,
-							       void                                               *closure);
-EvolutionShellComponent *evolution_shell_component_new        (const EvolutionShellComponentFolderType             folder_types[],
-							       const char                                         *external_uri_schemas[],
-							       EvolutionShellComponentCreateViewFn                 create_view_fn,
-							       EvolutionShellComponentCreateFolderFn               create_folder_fn,
-							       EvolutionShellComponentRemoveFolderFn               remove_folder_fn,
-							       EvolutionShellComponentXferFolderFn                 xfer_folder_fn,
-							       EvolutionShellComponentPopulateFolderContextMenuFn  populate_folder_context_menu_fn,
-							       EvolutionShellComponentGetDndSelectionFn            get_dnd_selection_fn,
-							       void                                               *closure);
+GtkType evolution_shell_component_get_type   (void);
+void evolution_shell_component_construct  (EvolutionShellComponent                            *shell_component,
+					   const EvolutionShellComponentFolderType             folder_types[],
+					   const char                                         *external_uri_schemas[],
+					   EvolutionShellComponentCreateViewFn                 create_view_fn,
+					   EvolutionShellComponentCreateFolderFn               create_folder_fn,
+					   EvolutionShellComponentRemoveFolderFn               remove_folder_fn,
+					   EvolutionShellComponentXferFolderFn                 xfer_folder_fn,
+					   EvolutionShellComponentPopulateFolderContextMenuFn  populate_folder_context_menu_fn,
+					   EvolutionShellComponentGetDndSelectionFn            get_dnd_selection_fn,
+					   EvolutionShellComponentRequestQuitFn                request_quit_fn,
+					   void                                               *closure);
+EvolutionShellComponent *evolution_shell_component_new (const EvolutionShellComponentFolderType             folder_types[],
+							const char                                         *external_uri_schemas[],
+							EvolutionShellComponentCreateViewFn                 create_view_fn,
+							EvolutionShellComponentCreateFolderFn               create_folder_fn,
+							EvolutionShellComponentRemoveFolderFn               remove_folder_fn,
+							EvolutionShellComponentXferFolderFn                 xfer_folder_fn,
+							EvolutionShellComponentPopulateFolderContextMenuFn  populate_folder_context_menu_fn,
+							EvolutionShellComponentGetDndSelectionFn            get_dnd_selection_fn,
+							EvolutionShellComponentRequestQuitFn                request_quit_fn,
+							void                                               *closure);
 EvolutionShellClient    *evolution_shell_component_get_owner  (EvolutionShellComponent                            *shell_component);
 
 void  evolution_shell_component_add_user_creatable_item  (EvolutionShellComponent *shell_component,