aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--po/POTFILES.in2
-rw-r--r--shell/test/e-test-shell-view.c8
2 files changed, 7 insertions, 3 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f9d5236dbb..e853975160 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -207,7 +207,7 @@ mail/em-format-html-print.c
mail/em-format-html.c
mail/em-html-stream.c
mail/em-junk.c
-mail/em-subscribe-editor.c
+mail/em-subscription-editor.c
mail/em-sync-stream.c
mail/em-utils.c
mail/em-vfolder-editor.c
diff --git a/shell/test/e-test-shell-view.c b/shell/test/e-test-shell-view.c
index b4464cc68f..4ecda3035c 100644
--- a/shell/test/e-test-shell-view.c
+++ b/shell/test/e-test-shell-view.c
@@ -74,6 +74,7 @@ test_shell_view_constructed (GObject *object)
EShellBackend *shell_backend;
EShellView *shell_view;
EActivity *activity;
+ GCancellable *cancellable;
GtkWidget *widget;
/* Chain up to parent's constructed() method. */
@@ -94,9 +95,12 @@ test_shell_view_constructed (GObject *object)
gtk_container_add (GTK_CONTAINER (shell_sidebar), widget);
gtk_widget_show (widget);
- activity = e_activity_new ("Test Activity");
- e_activity_set_allow_cancel (activity, TRUE);
+ activity = e_activity_new ();
+ cancellable = g_cancellable_new ();
+ e_activity_set_cancellable (activity, cancellable);
+ e_activity_set_primary_text (activity, "Test Activity");
e_shell_backend_add_activity (shell_backend, activity);
+ g_object_unref (cancellable);
priv->activity = activity;
}