aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/calendar/e-cal-shell-view-memopad.c6
-rw-r--r--modules/calendar/e-cal-shell-view-private.c15
-rw-r--r--modules/calendar/e-cal-shell-view-taskpad.c6
-rw-r--r--modules/calendar/e-memo-shell-view-private.c10
-rw-r--r--modules/calendar/e-task-shell-view-private.c10
-rw-r--r--modules/mail/e-mail-shell-view.c4
6 files changed, 30 insertions, 21 deletions
diff --git a/modules/calendar/e-cal-shell-view-memopad.c b/modules/calendar/e-cal-shell-view-memopad.c
index e88aa3a546..11e1bcd3dc 100644
--- a/modules/calendar/e-cal-shell-view-memopad.c
+++ b/modules/calendar/e-cal-shell-view-memopad.c
@@ -429,7 +429,7 @@ e_cal_shell_view_memopad_set_status_message (ECalShellView *cal_shell_view,
if (status_message == NULL || *status_message == '\0') {
if (activity != NULL) {
- e_activity_complete (activity);
+ e_activity_set_state (activity, E_ACTIVITY_COMPLETED);
g_object_unref (activity);
activity = NULL;
}
@@ -437,12 +437,12 @@ e_cal_shell_view_memopad_set_status_message (ECalShellView *cal_shell_view,
} else if (activity == NULL) {
activity = e_activity_new ();
e_activity_set_percent (activity, percent);
- e_activity_set_primary_text (activity, status_message);
+ e_activity_set_text (activity, status_message);
e_shell_backend_add_activity (shell_backend, activity);
} else {
e_activity_set_percent (activity, percent);
- e_activity_set_primary_text (activity, status_message);
+ e_activity_set_text (activity, status_message);
}
cal_shell_view->priv->memopad_activity = activity;
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index 29c7d1e528..2dd1fdc3bb 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -705,21 +705,24 @@ e_cal_shell_view_private_dispose (ECalShellView *cal_shell_view)
if (priv->calendar_activity != NULL) {
/* XXX Activity is not cancellable. */
- e_activity_complete (priv->calendar_activity);
+ e_activity_set_state (
+ priv->calendar_activity, E_ACTIVITY_COMPLETED);
g_object_unref (priv->calendar_activity);
priv->calendar_activity = NULL;
}
if (priv->memopad_activity != NULL) {
/* XXX Activity is not cancellable. */
- e_activity_complete (priv->memopad_activity);
+ e_activity_set_state (
+ priv->memopad_activity, E_ACTIVITY_COMPLETED);
g_object_unref (priv->memopad_activity);
priv->memopad_activity = NULL;
}
if (priv->taskpad_activity != NULL) {
/* XXX Activity is not cancellable. */
- e_activity_complete (priv->taskpad_activity);
+ e_activity_set_state (
+ priv->taskpad_activity, E_ACTIVITY_COMPLETED);
g_object_unref (priv->taskpad_activity);
priv->taskpad_activity = NULL;
}
@@ -808,18 +811,18 @@ e_cal_shell_view_set_status_message (ECalShellView *cal_shell_view,
if (status_message == NULL || *status_message == '\0') {
if (activity != NULL) {
- e_activity_complete (activity);
+ e_activity_set_state (activity, E_ACTIVITY_COMPLETED);
g_object_unref (activity);
activity = NULL;
}
} else if (activity == NULL) {
activity = e_activity_new ();
e_activity_set_percent (activity, percent);
- e_activity_set_primary_text (activity, status_message);
+ e_activity_set_text (activity, status_message);
e_shell_backend_add_activity (shell_backend, activity);
} else {
e_activity_set_percent (activity, percent);
- e_activity_set_primary_text (activity, status_message);
+ e_activity_set_text (activity, status_message);
}
cal_shell_view->priv->calendar_activity = activity;
diff --git a/modules/calendar/e-cal-shell-view-taskpad.c b/modules/calendar/e-cal-shell-view-taskpad.c
index b1eb390616..6dae14465d 100644
--- a/modules/calendar/e-cal-shell-view-taskpad.c
+++ b/modules/calendar/e-cal-shell-view-taskpad.c
@@ -556,7 +556,7 @@ e_cal_shell_view_taskpad_set_status_message (ECalShellView *cal_shell_view,
if (status_message == NULL || *status_message == '\0') {
if (activity != NULL) {
- e_activity_complete (activity);
+ e_activity_set_state (activity, E_ACTIVITY_COMPLETED);
g_object_unref (activity);
activity = NULL;
}
@@ -564,12 +564,12 @@ e_cal_shell_view_taskpad_set_status_message (ECalShellView *cal_shell_view,
} else if (activity == NULL) {
activity = e_activity_new ();
e_activity_set_percent (activity, percent);
- e_activity_set_primary_text (activity, status_message);
+ e_activity_set_text (activity, status_message);
e_shell_backend_add_activity (shell_backend, activity);
} else {
e_activity_set_percent (activity, percent);
- e_activity_set_primary_text (activity, status_message);
+ e_activity_set_text (activity, status_message);
}
cal_shell_view->priv->taskpad_activity = activity;
diff --git a/modules/calendar/e-memo-shell-view-private.c b/modules/calendar/e-memo-shell-view-private.c
index 8c83619564..4fe6a259e2 100644
--- a/modules/calendar/e-memo-shell-view-private.c
+++ b/modules/calendar/e-memo-shell-view-private.c
@@ -296,7 +296,9 @@ e_memo_shell_view_private_dispose (EMemoShellView *memo_shell_view)
if (memo_shell_view->priv->activity != NULL) {
/* XXX Activity is not cancellable. */
- e_activity_complete (memo_shell_view->priv->activity);
+ e_activity_set_state (
+ memo_shell_view->priv->activity,
+ E_ACTIVITY_COMPLETED);
g_object_unref (memo_shell_view->priv->activity);
memo_shell_view->priv->activity = NULL;
}
@@ -370,7 +372,7 @@ e_memo_shell_view_set_status_message (EMemoShellView *memo_shell_view,
if (status_message == NULL || *status_message == '\0') {
if (activity != NULL) {
- e_activity_complete (activity);
+ e_activity_set_state (activity, E_ACTIVITY_COMPLETED);
g_object_unref (activity);
activity = NULL;
}
@@ -378,12 +380,12 @@ e_memo_shell_view_set_status_message (EMemoShellView *memo_shell_view,
} else if (activity == NULL) {
activity = e_activity_new ();
e_activity_set_percent (activity, percent);
- e_activity_set_primary_text (activity, status_message);
+ e_activity_set_text (activity, status_message);
e_shell_backend_add_activity (shell_backend, activity);
} else {
e_activity_set_percent (activity, percent);
- e_activity_set_primary_text (activity, status_message);
+ e_activity_set_text (activity, status_message);
}
memo_shell_view->priv->activity = activity;
diff --git a/modules/calendar/e-task-shell-view-private.c b/modules/calendar/e-task-shell-view-private.c
index f0e8cbff2f..9f833e9542 100644
--- a/modules/calendar/e-task-shell-view-private.c
+++ b/modules/calendar/e-task-shell-view-private.c
@@ -377,7 +377,9 @@ e_task_shell_view_private_dispose (ETaskShellView *task_shell_view)
if (task_shell_view->priv->activity != NULL) {
/* XXX Activity is not cancellable. */
- e_activity_complete (task_shell_view->priv->activity);
+ e_activity_set_state (
+ task_shell_view->priv->activity,
+ E_ACTIVITY_COMPLETED);
g_object_unref (task_shell_view->priv->activity);
task_shell_view->priv->activity = NULL;
}
@@ -521,7 +523,7 @@ e_task_shell_view_set_status_message (ETaskShellView *task_shell_view,
if (status_message == NULL || *status_message == '\0') {
if (activity != NULL) {
- e_activity_complete (activity);
+ e_activity_set_state (activity, E_ACTIVITY_COMPLETED);
g_object_unref (activity);
activity = NULL;
}
@@ -529,12 +531,12 @@ e_task_shell_view_set_status_message (ETaskShellView *task_shell_view,
} else if (activity == NULL) {
activity = e_activity_new ();
e_activity_set_percent (activity, percent);
- e_activity_set_primary_text (activity, status_message);
+ e_activity_set_text (activity, status_message);
e_shell_backend_add_activity (shell_backend, activity);
} else {
e_activity_set_percent (activity, percent);
- e_activity_set_primary_text (activity, status_message);
+ e_activity_set_text (activity, status_message);
}
task_shell_view->priv->activity = activity;
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index 557d206c36..8d5a568b8f 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -55,7 +55,9 @@ search_results_desc (SearchResultsMsg *msg)
}
static void
-search_results_exec (SearchResultsMsg *msg)
+search_results_exec (SearchResultsMsg *msg,
+ GCancellable *cancellable,
+ GError **error)
{
GList *copied_list;
generated by cgit (git 2.34.1) at 2024-11-19 06:57:17 +0800