aboutsummaryrefslogtreecommitdiffstats
path: root/doc/reference
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-11-01 05:11:35 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-11-01 10:54:30 +0800
commitccc2b3a14bf19b3db1d837887a07e74f50db078c (patch)
tree639b3deaf2fa7e15ebb149a705095fbb0d717a7b /doc/reference
parent82925c6be94e9e48e4ef521a88a9feec24cf9eef (diff)
downloadgsoc2013-evolution-ccc2b3a14bf19b3db1d837887a07e74f50db078c.tar
gsoc2013-evolution-ccc2b3a14bf19b3db1d837887a07e74f50db078c.tar.gz
gsoc2013-evolution-ccc2b3a14bf19b3db1d837887a07e74f50db078c.tar.bz2
gsoc2013-evolution-ccc2b3a14bf19b3db1d837887a07e74f50db078c.tar.lz
gsoc2013-evolution-ccc2b3a14bf19b3db1d837887a07e74f50db078c.tar.xz
gsoc2013-evolution-ccc2b3a14bf19b3db1d837887a07e74f50db078c.tar.zst
gsoc2013-evolution-ccc2b3a14bf19b3db1d837887a07e74f50db078c.zip
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.
Diffstat (limited to 'doc/reference')
-rw-r--r--doc/reference/shell/eshell-sections.txt3
-rw-r--r--doc/reference/shell/tmpl/e-activity.sgml16
-rw-r--r--doc/reference/shell/tmpl/eshell-unused.sgml9
3 files changed, 23 insertions, 5 deletions
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
<FILE>e-activity</FILE>
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:
-<!-- ##### FUNCTION e_activity_newv ##### -->
+<!-- ##### FUNCTION e_activity_describe ##### -->
<para>
</para>
-@format:
-@Varargs:
+@activity:
@Returns:
-<!-- ##### FUNCTION e_activity_describe ##### -->
+<!-- ##### FUNCTION e_activity_get_alert_sink ##### -->
<para>
</para>
@@ -54,6 +53,15 @@ e-activity
@Returns:
+<!-- ##### FUNCTION e_activity_set_alert_sink ##### -->
+<para>
+
+</para>
+
+@activity:
+@alert_sink:
+
+
<!-- ##### FUNCTION e_activity_get_cancellable ##### -->
<para>
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:
+<!-- ##### FUNCTION e_activity_newv ##### -->
+<para>
+
+</para>
+
+@format:
+@Varargs:
+@Returns:
+
<!-- ##### FUNCTION e_activity_set_allow_cancel ##### -->
<para>