aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-02-14 05:55:43 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-02-17 07:57:09 +0800
commit9714a4bbf1a938871240640002c9dd369133c766 (patch)
tree99ffa3e5a7cbdb5f672909c62080a8ae5eb8d163 /calendar
parent9551d47dd1a42d1cce29926957a82238f9514272 (diff)
downloadgsoc2013-evolution-9714a4bbf1a938871240640002c9dd369133c766.tar
gsoc2013-evolution-9714a4bbf1a938871240640002c9dd369133c766.tar.gz
gsoc2013-evolution-9714a4bbf1a938871240640002c9dd369133c766.tar.bz2
gsoc2013-evolution-9714a4bbf1a938871240640002c9dd369133c766.tar.lz
gsoc2013-evolution-9714a4bbf1a938871240640002c9dd369133c766.tar.xz
gsoc2013-evolution-9714a4bbf1a938871240640002c9dd369133c766.tar.zst
gsoc2013-evolution-9714a4bbf1a938871240640002c9dd369133c766.zip
Defer "backend-died" alerts to EShell.
Diffstat (limited to 'calendar')
-rw-r--r--calendar/calendar.error.xml20
-rw-r--r--calendar/gui/e-cal-model.c2
2 files changed, 1 insertions, 21 deletions
diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml
index 98ca70b5a7..e58a482dc7 100644
--- a/calendar/calendar.error.xml
+++ b/calendar/calendar.error.xml
@@ -173,26 +173,6 @@
<button _label="_Send" response="GTK_RESPONSE_YES"/>
</error>
- <error id="tasks-crashed" type="error">
- <_primary>The Evolution tasks have quit unexpectedly.</_primary>
- <_secondary>Your tasks will not be available until Evolution is restarted.</_secondary>
- </error>
-
- <error id="calendar-crashed" type="error">
- <_primary>The Evolution calendar has quit unexpectedly.</_primary>
- <_secondary>Your calendars will not be available until Evolution is restarted.</_secondary>
- </error>
-
- <error id="memos-crashed" type="error">
- <_primary>The Evolution memo has quit unexpectedly.</_primary>
- <_secondary>Your memos will not be available until Evolution is restarted.</_secondary>
- </error>
-
- <error id="backend_died" type="error">
- <_primary>The Evolution calendars have quit unexpectedly.</_primary>
- <_secondary>Your calendars will not be available until Evolution is restarted.</_secondary>
- </error>
-
<error id="editor-error" type="error">
<_primary>Editor could not be loaded.</_primary>
<secondary>{0}.</secondary>
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 8ed2e5206f..b94c7090a8 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -3009,7 +3009,7 @@ add_new_client (ECalModel *model,
priv->clients = g_list_append (priv->clients, client_data);
g_signal_connect (
- client_data->client, "backend_died",
+ client_data->client, "backend-died",
G_CALLBACK (backend_died_cb), model);
load: