From 616f0b140bb937d7afeb46f834e32e8c51a67e1e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 31 Oct 2010 17:11:35 -0400 Subject: EActivity: Add an "alert-sink" property. This is just for convenience, EActivity does not use this property. Especially useful in async function callbacks when the operation failed and now you have to do something useful with the GError. --- doc/reference/shell/eshell-sections.txt | 3 ++- doc/reference/shell/tmpl/e-activity.sgml | 16 ++++++++++++---- doc/reference/shell/tmpl/eshell-unused.sgml | 9 +++++++++ 3 files changed, 23 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/reference/shell/eshell-sections.txt b/doc/reference/shell/eshell-sections.txt index 6e03f4ddd7..12f66667f6 100644 --- a/doc/reference/shell/eshell-sections.txt +++ b/doc/reference/shell/eshell-sections.txt @@ -470,10 +470,11 @@ EActionComboBoxPrivate e-activity EActivity e_activity_new -e_activity_newv e_activity_complete e_activity_describe e_activity_is_completed +e_activity_get_alert_sink +e_activity_set_alert_sink e_activity_get_cancellable e_activity_set_cancellable e_activity_get_icon_name diff --git a/doc/reference/shell/tmpl/e-activity.sgml b/doc/reference/shell/tmpl/e-activity.sgml index 1d4d1b3f3c..3d9fb20107 100644 --- a/doc/reference/shell/tmpl/e-activity.sgml +++ b/doc/reference/shell/tmpl/e-activity.sgml @@ -35,17 +35,16 @@ e-activity @Returns: - + -@format: -@Varargs: +@activity: @Returns: - + @@ -54,6 +53,15 @@ e-activity @Returns: + + + + + +@activity: +@alert_sink: + + diff --git a/doc/reference/shell/tmpl/eshell-unused.sgml b/doc/reference/shell/tmpl/eshell-unused.sgml index 2b172b25de..0ce25a6249 100644 --- a/doc/reference/shell/tmpl/eshell-unused.sgml +++ b/doc/reference/shell/tmpl/eshell-unused.sgml @@ -307,6 +307,15 @@ e-shell-window.sgml @activity: @Returns: + + + + + +@format: +@Varargs: +@Returns: + -- cgit