From 9714a4bbf1a938871240640002c9dd369133c766 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 13 Feb 2013 16:55:43 -0500
Subject: Defer "backend-died" alerts to EShell.

---
 calendar/calendar.error.xml | 20 --------------------
 calendar/gui/e-cal-model.c  |  2 +-
 2 files changed, 1 insertion(+), 21 deletions(-)

(limited to 'calendar')

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:
-- 
cgit v1.2.3