Added code to make sure we don't see a canceled deep count as an eternally

	* libnautilus-extensions/nautilus-directory-private.h:
	* libnautilus-extensions/nautilus-directory-async.c:
	(cancel_deep_count): Added code to make sure we don't see a
	canceled deep count as an eternally "in progress" one.
	(nautilus_directory_async_state_changed): Exported this
	function for use in NautilusFile.

	* libnautilus-extensions/nautilus-file.h:
	* libnautilus-extensions/nautilus-file.c:
	(nautilus_file_get_deep_counts): Fixed the comment.
	(nautilus_file_recompute_deep_counts): Added a function to
	force the deep count to be recomputed.

	* libnautilus-extensions/nautilus-mime-actions.h:
	* libnautilus-extensions/nautilus-mime-actions.c:
	(nautilus_mime_set_default_action_type_for_uri),
	(nautilus_mime_set_default_application_for_uri),
	(nautilus_mime_set_default_component_for_uri),
	(nautilus_mime_set_short_list_applications_for_uri),
	(nautilus_mime_set_short_list_components_for_uri),
	(nautilus_mime_add_application_to_short_list_for_uri),
	(nautilus_mime_remove_application_from_short_list_for_uri),
	(nautilus_mime_add_component_to_short_list_for_uri),
	(nautilus_mime_remove_component_from_short_list_for_uri),
	(nautilus_mime_extend_all_applications_for_uri),
	(nautilus_mime_remove_from_all_applications_for_uri):
	Added some rudimentary error handling.

1 files changed, 36 insertions, 39 deletions

diff --git a/libnautilus-private/nautilus-mime-actions.h b/libnautilus-private/nautilus-mime-actions.h
index 319194943..69ff93c1a 100644
--- a/libnautilus-private/nautilus-mime-actions.h
+++ b/libnautilus-private/nautilus-mime-actions.h
@@ -27,48 +27,45 @@
 
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
 
-
-GnomeVFSMimeActionType   nautilus_mime_get_default_action_type_for_uri       (const char             *uri);
-GnomeVFSMimeAction      *nautilus_mime_get_default_action_for_uri            (const char             *uri);
-GnomeVFSMimeApplication *nautilus_mime_get_default_application_for_uri       (const char             *uri);
-gboolean		 nautilus_mime_is_default_application_for_uri_user_chosen (const char          *uri);
-OAF_ServerInfo          *nautilus_mime_get_default_component_for_uri         (const char             *uri);
-gboolean		 nautilus_mime_is_default_component_for_uri_user_chosen (const char          *uri);
-GList                   *nautilus_mime_get_short_list_applications_for_uri   (const char             *uri);
-GList                   *nautilus_mime_get_short_list_components_for_uri     (const char             *uri);
-GList                   *nautilus_mime_get_all_applications_for_uri          (const char             *uri);
-GList                   *nautilus_mime_get_all_components_for_uri            (const char             *uri);
-gboolean		 nautilus_mime_has_any_components_for_uri	     (const char	     *uri);
-gboolean		 nautilus_mime_has_any_applications_for_uri	     (const char	     *uri);
-
-void                     nautilus_mime_set_default_action_type_for_uri       (const char             *uri,
-									      GnomeVFSMimeActionType  action_type);
-void                     nautilus_mime_set_default_application_for_uri       (const char             *uri,
-									      const char             *application_id);
-void                     nautilus_mime_set_default_component_for_uri         (const char             *uri,
-									      const char             *component_iid);
+GnomeVFSMimeActionType   nautilus_mime_get_default_action_type_for_uri            (const char             *uri);
+GnomeVFSMimeAction *     nautilus_mime_get_default_action_for_uri                 (const char             *uri);
+GnomeVFSMimeApplication *nautilus_mime_get_default_application_for_uri            (const char             *uri);
+gboolean                 nautilus_mime_is_default_application_for_uri_user_chosen (const char             *uri);
+OAF_ServerInfo *         nautilus_mime_get_default_component_for_uri              (const char             *uri);
+gboolean                 nautilus_mime_is_default_component_for_uri_user_chosen   (const char             *uri);
+GList *                  nautilus_mime_get_short_list_applications_for_uri        (const char             *uri);
+GList *                  nautilus_mime_get_short_list_components_for_uri          (const char             *uri);
+GList *                  nautilus_mime_get_all_applications_for_uri               (const char             *uri);
+GList *                  nautilus_mime_get_all_components_for_uri                 (const char             *uri);
+gboolean                 nautilus_mime_has_any_components_for_uri                 (const char             *uri);
+gboolean                 nautilus_mime_has_any_applications_for_uri               (const char             *uri);
+GnomeVFSResult           nautilus_mime_set_default_action_type_for_uri            (const char             *uri,
+										   GnomeVFSMimeActionType  action_type);
+GnomeVFSResult           nautilus_mime_set_default_application_for_uri            (const char             *uri,
+										   const char             *application_id);
+GnomeVFSResult           nautilus_mime_set_default_component_for_uri              (const char             *uri,
+										   const char             *component_iid);
 /* Stored as delta to current user level */
-void                     nautilus_mime_set_short_list_applications_for_uri   (const char             *uri,
-									      GList                  *applications);
-void                     nautilus_mime_set_short_list_components_for_uri     (const char             *uri,
-									      GList                  *components);
-void			 nautilus_mime_add_application_to_short_list_for_uri (const char	     *uri,
-									      const char	     *application_id);									      
-void			 nautilus_mime_remove_application_from_short_list_for_uri (const char	     *uri,
-									           const char	     *application_id);									      
-void			 nautilus_mime_add_component_to_short_list_for_uri   (const char	     *uri,
-									      const char	     *iid);									      
-void			 nautilus_mime_remove_component_from_short_list_for_uri (const char	     *uri,
-									         const char	     *iid);									      
+GnomeVFSResult           nautilus_mime_set_short_list_applications_for_uri        (const char             *uri,
+										   GList                  *applications);
+GnomeVFSResult           nautilus_mime_set_short_list_components_for_uri          (const char             *uri,
+										   GList                  *components);
+GnomeVFSResult           nautilus_mime_add_application_to_short_list_for_uri      (const char             *uri,
+										   const char             *application_id);
+GnomeVFSResult           nautilus_mime_remove_application_from_short_list_for_uri (const char             *uri,
+										   const char             *application_id);
+GnomeVFSResult           nautilus_mime_add_component_to_short_list_for_uri        (const char             *uri,
+										   const char             *iid);
+GnomeVFSResult           nautilus_mime_remove_component_from_short_list_for_uri   (const char             *uri,
+										   const char             *iid);
+
 /* No way to override system list; can only add. */
-void                     nautilus_mime_extend_all_applications_for_uri       (const char             *uri,
-									      GList                  *applications);
+GnomeVFSResult           nautilus_mime_extend_all_applications_for_uri            (const char             *uri,
+										   GList                  *applications);
 /* Only "user" entries may be removed. */
-void                    nautilus_mime_remove_from_all_applications_for_uri   (const char             *uri,
-									      GList                  *applications);
-/* No way to add to all components; oafinfo database assumed trusted in this regard. */
-
+GnomeVFSResult           nautilus_mime_remove_from_all_applications_for_uri       (const char             *uri,
+										   GList                  *applications);
 
+/* No way to add to all components; oafinfo database assumed trusted in this regard. */
 
 #endif /* NAUTILUS_MIME_ACTIONS_H */
-