From 3e3c13b439668945241b32cf8c1fd3d6e625f9f5 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Fri, 19 Sep 2008 16:52:08 +0000
Subject: Replace EActivityHandler with a new activity-tracking system that
 uses EActivity objects instead of numeric handler IDs.  Create an EActivity,
 configure it, and (optionally) connect to its "cancelled" and "completed"
 signals.  Then hand it to the shell view via e_shell_view_add_activity().
 When finished with the activity, call e_activity_finish() and unref it.

svn path=/branches/kill-bonobo/; revision=36391
---
 doc/reference/shell/Makefile.am                  |   3 +-
 doc/reference/shell/eshell.types                 |  13 +--
 doc/reference/shell/tmpl/e-activity-handler.sgml | 137 -----------------------
 doc/reference/shell/tmpl/e-shell-module.sgml     |   8 ++
 doc/reference/shell/tmpl/e-shell-taskbar.sgml    |   5 +
 doc/reference/shell/tmpl/eshell-unused.sgml      | 123 ++++++++++++++++++++
 6 files changed, 143 insertions(+), 146 deletions(-)

(limited to 'doc/reference/shell')

diff --git a/doc/reference/shell/Makefile.am b/doc/reference/shell/Makefile.am
index f41e71b303..26d6bf2bb5 100644
--- a/doc/reference/shell/Makefile.am
+++ b/doc/reference/shell/Makefile.am
@@ -71,7 +71,6 @@ GTKDOC_LIBS=								\
 	$(top_builddir)/shell/e-shell-nm.o				\
 	$(top_builddir)/shell/e-shell-window-private.o			\
 	$(top_builddir)/shell/es-event.o				\
-	$(top_builddir)/shell/.libs/e-activity-handler.o		\
 	$(top_builddir)/shell/.libs/e-shell-content.o			\
 	$(top_builddir)/shell/.libs/e-shell-module.o			\
 	$(top_builddir)/shell/.libs/e-shell-sidebar.o			\
@@ -117,6 +116,8 @@ GTKDOC_LIBS=								\
 	$(top_builddir)/widgets/menus/.libs/gal-view-new-dialog.o	\
 	$(top_builddir)/widgets/menus/.libs/gal-view.o			\
 	$(top_builddir)/widgets/misc/.libs/e-action-combo-box.o		\
+	$(top_builddir)/widgets/misc/.libs/e-activity.o			\
+	$(top_builddir)/widgets/misc/.libs/e-activity-proxy.o		\
 	$(top_builddir)/widgets/misc/.libs/e-icon-entry.o		\
 	$(top_builddir)/widgets/misc/.libs/e-gui-utils.o		\
 	$(top_builddir)/widgets/misc/.libs/e-menu-tool-button.o		\
diff --git a/doc/reference/shell/eshell.types b/doc/reference/shell/eshell.types
index 9d773be677..b0933d219f 100644
--- a/doc/reference/shell/eshell.types
+++ b/doc/reference/shell/eshell.types
@@ -1,11 +1,8 @@
-e_shell_view_get_type
-e_shell_switcher_get_type
-es_event_get_type
-es_event_hook_get_type
+e_shell_get_type
+e_shell_content_get_type
+e_shell_module_get_type
 e_shell_sidebar_get_type
-e_activity_handler_get_type
+e_shell_switcher_get_type
 e_shell_taskbar_get_type
-e_shell_module_get_type
-e_shell_content_get_type
-e_shell_get_type
+e_shell_view_get_type
 e_shell_window_get_type
diff --git a/doc/reference/shell/tmpl/e-activity-handler.sgml b/doc/reference/shell/tmpl/e-activity-handler.sgml
index 209b4b4d04..09d417213d 100644
--- a/doc/reference/shell/tmpl/e-activity-handler.sgml
+++ b/doc/reference/shell/tmpl/e-activity-handler.sgml
@@ -17,140 +17,3 @@ EActivityHandler
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### MACRO EAH_ICON_INFO ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO EAH_ICON_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT EActivityHandler ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION e_activity_handler_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION e_activity_handler_attach_task_bar ##### -->
-<para>
-
-</para>
-
-@activity_hanlder: 
-@shell_taskbar: 
-
-
-<!-- ##### FUNCTION e_activity_handler_set_message ##### -->
-<para>
-
-</para>
-
-@activity_handler: 
-@message: 
-
-
-<!-- ##### FUNCTION e_activity_handler_unset_message ##### -->
-<para>
-
-</para>
-
-@activity_handler: 
-
-
-<!-- ##### FUNCTION e_activity_handler_operation_started ##### -->
-<para>
-
-</para>
-
-@activity_handler: 
-@information: 
-@cancellable: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_activity_handler_cancelable_operation_started ##### -->
-<para>
-
-</para>
-
-@activity_handler: 
-@information: 
-@cancellable: 
-@cancel_func: 
-@user_data: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_activity_handler_operation_progressing ##### -->
-<para>
-
-</para>
-
-@activity_handler: 
-@activity_id: 
-@information: 
-@progress: 
-
-
-<!-- ##### FUNCTION e_activity_handler_operation_finished ##### -->
-<para>
-
-</para>
-
-@activity_handler: 
-@activity_id: 
-
-
-<!-- ##### FUNCTION e_activity_handler_set_logger ##### -->
-<para>
-
-</para>
-
-@handler: 
-@logger: 
-
-
-<!-- ##### FUNCTION e_activity_handler_make_error ##### -->
-<para>
-
-</para>
-
-@activity_handler: 
-@error_type: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_activity_handler_operation_set_error ##### -->
-<para>
-
-</para>
-
-@activity_handler: 
-@activity_id: 
-@error: 
-
-
-<!-- ##### FUNCTION e_activity_handler_set_error_flush_time ##### -->
-<para>
-
-</para>
-
-@handler: 
-@time: 
-
-
diff --git a/doc/reference/shell/tmpl/e-shell-module.sgml b/doc/reference/shell/tmpl/e-shell-module.sgml
index 583719c3fc..f4fe9ca069 100644
--- a/doc/reference/shell/tmpl/e-shell-module.sgml
+++ b/doc/reference/shell/tmpl/e-shell-module.sgml
@@ -23,6 +23,14 @@ EShellModule
 </para>
 
 
+<!-- ##### SIGNAL EShellModule::activity-added ##### -->
+<para>
+
+</para>
+
+@eshellmodule: the object which received the signal.
+@arg1: 
+
 <!-- ##### ARG EShellModule:filename ##### -->
 <para>
 
diff --git a/doc/reference/shell/tmpl/e-shell-taskbar.sgml b/doc/reference/shell/tmpl/e-shell-taskbar.sgml
index 1d7dd76790..ff99855e5e 100644
--- a/doc/reference/shell/tmpl/e-shell-taskbar.sgml
+++ b/doc/reference/shell/tmpl/e-shell-taskbar.sgml
@@ -23,6 +23,11 @@ EShellTaskbar
 </para>
 
 
+<!-- ##### ARG EShellTaskbar:message ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG EShellTaskbar:shell-view ##### -->
 <para>
 
diff --git a/doc/reference/shell/tmpl/eshell-unused.sgml b/doc/reference/shell/tmpl/eshell-unused.sgml
index 2810585883..448bdb8fcf 100644
--- a/doc/reference/shell/tmpl/eshell-unused.sgml
+++ b/doc/reference/shell/tmpl/eshell-unused.sgml
@@ -331,6 +331,24 @@ intelligent
 
 @obj: 
 
+<!-- ##### MACRO EAH_ICON_ERROR ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO EAH_ICON_INFO ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT EActivityHandler ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### STRUCT EActivityHandlerPrivate ##### -->
 <para>
 
@@ -1703,6 +1721,111 @@ intelligent
 </para>
 
 
+<!-- ##### FUNCTION e_activity_handler_attach_task_bar ##### -->
+<para>
+
+</para>
+
+@activity_hanlder: 
+@shell_taskbar: 
+
+<!-- ##### FUNCTION e_activity_handler_cancelable_operation_started ##### -->
+<para>
+
+</para>
+
+@activity_handler: 
+@information: 
+@cancellable: 
+@cancel_func: 
+@user_data: 
+@Returns: 
+
+<!-- ##### FUNCTION e_activity_handler_make_error ##### -->
+<para>
+
+</para>
+
+@activity_handler: 
+@error_type: 
+@error: 
+@Returns: 
+
+<!-- ##### FUNCTION e_activity_handler_new ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+<!-- ##### FUNCTION e_activity_handler_operation_finished ##### -->
+<para>
+
+</para>
+
+@activity_handler: 
+@activity_id: 
+
+<!-- ##### FUNCTION e_activity_handler_operation_progressing ##### -->
+<para>
+
+</para>
+
+@activity_handler: 
+@activity_id: 
+@information: 
+@progress: 
+
+<!-- ##### FUNCTION e_activity_handler_operation_set_error ##### -->
+<para>
+
+</para>
+
+@activity_handler: 
+@activity_id: 
+@error: 
+
+<!-- ##### FUNCTION e_activity_handler_operation_started ##### -->
+<para>
+
+</para>
+
+@activity_handler: 
+@information: 
+@cancellable: 
+@Returns: 
+
+<!-- ##### FUNCTION e_activity_handler_set_error_flush_time ##### -->
+<para>
+
+</para>
+
+@handler: 
+@time: 
+
+<!-- ##### FUNCTION e_activity_handler_set_logger ##### -->
+<para>
+
+</para>
+
+@handler: 
+@logger: 
+
+<!-- ##### FUNCTION e_activity_handler_set_message ##### -->
+<para>
+
+</para>
+
+@activity_handler: 
+@message: 
+
+<!-- ##### FUNCTION e_activity_handler_unset_message ##### -->
+<para>
+
+</para>
+
+@activity_handler: 
+
 <!-- ##### FUNCTION e_config_upgrade ##### -->
 <para>
 
-- 
cgit v1.2.3