New, implementation for the cancel_discover_shared_folder virtual method.

* e-corba-storage.c (cancel_discover_shared_folder): New,
implementation for the cancel_discover_shared_folder virtual
method.
(class_init): Install.

* evolution-test-component.c
(storage_discover_shared_folder_callback): Instead of passing the
listener to the timeout function, just pass the storage.  Put the
listener and the timeout ID on the storage object by using
gtk_object_set_data().
(shared_folder_discovery_timeout_callback): Updated accordingly.
(storage_cancel_discover_shared_folder_callback): New, callback
for the cancel_discover_shared_folder signal.
(setup_custom_storage): Connect.

* e-shell-shared-folder-picker-dialog.c: New member storage in
struct DiscoveryData.  While I am at it, rename member user to
user_email_address.
(discover_folder): Set the storage member.
(cleanup_discovery): Unref storage member.
(progress_dialog_clicked_callback): New, callback for the
"clicked" signal on the dialog.
(discover_folder): Connect.

* evolution-storage.c (class_init): Install signal
"cancel_discover_shared_folder".
(impl_Storage_cancelDiscoverSharedFolder): New, implementation for
the cancelDiscoverSharedFolder CORBA method; emit
"cancel_discover_shared_folder".
(evolution_storage_get_epv): Install CORBA method implementation.

* evolution-storage.h: Add signal cancel_discover_shared_folder.

* e-storage.c (e_storage_cancel_discover_shared_folder): New.

* e-storage.h: New virtual method cancel_discover_shared_folder.

* Evolution-Storage.idl (cancelDiscoverSharedFolder): New.

svn path=/trunk/; revision=18386

1 files changed, 26 insertions, 20 deletions

diff --git a/shell/e-storage.h b/shell/e-storage.h
index f017cacc1d..31d2ff7c1a 100644
--- a/shell/e-storage.h
+++ b/shell/e-storage.h
@@ -114,16 +114,19 @@ struct _EStorageClass {
 	void         (* async_open_folder)    (EStorage *storage,
 					       const char *path);
 
-	gboolean     (* supports_shared_folders)      (EStorage *storage);
-	void         (* async_discover_shared_folder) (EStorage *storage,
-						       const char *owner,
-						       const char *folder_name,
-						       EStorageDiscoveryCallback callback,
-						       void *data);
-	void         (* async_remove_shared_folder)   (EStorage *storage,
-						       const char *path,
-						       EStorageResultCallback callback,
-						       void *data);
+	gboolean     (* supports_shared_folders)       (EStorage *storage);
+	void         (* async_discover_shared_folder)  (EStorage *storage,
+						        const char *owner,
+						        const char *folder_name,
+						        EStorageDiscoveryCallback callback,
+						        void *data);
+	void         (* cancel_discover_shared_folder) (EStorage *storage,
+							const char *owner,
+							const char *folder_name);
+	void         (* async_remove_shared_folder)    (EStorage *storage,
+						        const char *path,
+						        EStorageResultCallback callback,
+						        void *data);
 };
 
 
@@ -168,16 +171,19 @@ void  e_storage_async_open_folder    (EStorage               *storage,
 const char *e_storage_result_to_string  (EStorageResult result);
 
 /* Shared folders.  */
-gboolean    e_storage_supports_shared_folders      (EStorage                 *storage);
-void        e_storage_async_discover_shared_folder (EStorage                 *storage,
-						    const char               *owner,
-						    const char               *folder_name,
-						    EStorageDiscoveryCallback callback,
-						    void                     *data);
-void        e_storage_async_remove_shared_folder   (EStorage                 *storage,
-						    const char               *path,
-						    EStorageResultCallback    callback,
-						    void                     *data);
+gboolean    e_storage_supports_shared_folders       (EStorage                 *storage);
+void        e_storage_async_discover_shared_folder  (EStorage                 *storage,
+						     const char               *owner,
+						     const char               *folder_name,
+						     EStorageDiscoveryCallback callback,
+						     void                     *data);
+void        e_storage_cancel_discover_shared_folder (EStorage                 *storage,
+						     const char               *owner,
+						     const char               *folder_name);
+void        e_storage_async_remove_shared_folder    (EStorage                 *storage,
+						     const char               *path,
+						     EStorageResultCallback    callback,
+						     void                     *data);
 
 /* Utility functions.  */