Replace deprecated 'web-process-crashed' with 'web-process-terminated' signal

6 files changed, 29 insertions, 20 deletions

diff --git a/src/addressbook/gui/widgets/eab-contact-display.c b/src/addressbook/gui/widgets/eab-contact-display.c
index 45feac47b4..ea01567271 100644
--- a/src/addressbook/gui/widgets/eab-contact-display.c
+++ b/src/addressbook/gui/widgets/eab-contact-display.c
@@ -426,7 +426,8 @@ contact_display_update_actions (EWebView *web_view)
 }
 
 static void
-contact_display_web_process_crashed_cb (EABContactDisplay *display)
+contact_display_web_process_terminated_cb (EABContactDisplay *display,
+					   WebKitWebProcessTerminationReason reason)
 {
 	EAlertSink *alert_sink;
 
@@ -534,8 +535,8 @@ eab_contact_display_init (EABContactDisplay *display)
 	ui_manager = e_web_view_get_ui_manager (web_view);
 
 	g_signal_connect (
-		display, "web-process-crashed",
-		G_CALLBACK (contact_display_web_process_crashed_cb), NULL);
+		display, "web-process-terminated",
+		G_CALLBACK (contact_display_web_process_terminated_cb), NULL);
 
 	g_signal_connect (
 		web_view, "content-loaded",
diff --git a/src/calendar/gui/e-cal-component-preview.c b/src/calendar/gui/e-cal-component-preview.c
index 3f094b7389..225f7f8aff 100644
--- a/src/calendar/gui/e-cal-component-preview.c
+++ b/src/calendar/gui/e-cal-component-preview.c
@@ -689,7 +689,8 @@ load_comp (ECalComponentPreview *preview)
 }
 
 static void
-cal_component_preview_web_process_crashed_cb (ECalComponentPreview *preview)
+cal_component_preview_web_process_terminated_cb (ECalComponentPreview *preview,
+						 WebKitWebProcessTerminationReason reason)
 {
 	EAlertSink *alert_sink;
 	const gchar *tagid;
@@ -742,8 +743,8 @@ e_cal_component_preview_init (ECalComponentPreview *preview)
 	preview->priv = E_CAL_COMPONENT_PREVIEW_GET_PRIVATE (preview);
 
 	g_signal_connect (
-		preview, "web-process-crashed",
-		G_CALLBACK (cal_component_preview_web_process_crashed_cb), NULL);
+		preview, "web-process-terminated",
+		G_CALLBACK (cal_component_preview_web_process_terminated_cb), NULL);
 }
 
 GtkWidget *
diff --git a/src/e-util/e-mail-signature-preview.c b/src/e-util/e-mail-signature-preview.c
index 5e22cbefa7..327521512a 100644
--- a/src/e-util/e-mail-signature-preview.c
+++ b/src/e-util/e-mail-signature-preview.c
@@ -110,7 +110,8 @@ mail_signature_preview_load_cb (ESource *source,
 }
 
 static void
-mail_signature_preview_web_process_crashed_cb (EMailSignaturePreview *preview)
+mail_signature_preview_web_process_terminated_cb (EMailSignaturePreview *preview,
+						  WebKitWebProcessTerminationReason reason)
 {
 	g_return_if_fail (E_IS_MAIL_SIGNATURE_PREVIEW (preview));
 
@@ -318,8 +319,8 @@ e_mail_signature_preview_init (EMailSignaturePreview *preview)
 	preview->priv->webprocess_crashed = FALSE;
 
 	g_signal_connect (
-		preview, "web-process-crashed",
-		G_CALLBACK (mail_signature_preview_web_process_crashed_cb), NULL);
+		preview, "web-process-terminated",
+		G_CALLBACK (mail_signature_preview_web_process_terminated_cb), NULL);
 }
 
 GtkWidget *
diff --git a/src/e-util/test-html-editor-units-utils.c b/src/e-util/test-html-editor-units-utils.c
index 8912e64c38..0ed746be93 100644
--- a/src/e-util/test-html-editor-units-utils.c
+++ b/src/e-util/test-html-editor-units-utils.c
@@ -219,10 +219,14 @@ undo_content_test (TestFixture *fixture,
 }
 
 static gboolean
-test_utils_web_process_crashed_cb (WebKitWebView *web_view,
-				   gpointer user_data)
+test_utils_web_process_terminated_cb (WebKitWebView *web_view,
+				      WebKitWebProcessTerminationReason reason,
+				      gpointer user_data)
 {
-	g_warning ("%s:", G_STRFUNC);
+	g_warning ("%s: reason: %s", G_STRFUNC,
+		reason == WEBKIT_WEB_PROCESS_CRASHED ? "crashed" :
+		reason == WEBKIT_WEB_PROCESS_EXCEEDED_MEMORY_LIMIT ? "exceeded memory limit" :
+		reason == WEBKIT_WEB_PROCESS_TERMINATED_BY_API ? "terminated by API" : "unknown reason");
 
 	return FALSE;
 }
@@ -307,8 +311,8 @@ test_utils_html_editor_created_cb (GObject *source_object,
 		"height-request", 150,
 		NULL);
 
-	g_signal_connect (cnt_editor, "web-process-crashed",
-		G_CALLBACK (test_utils_web_process_crashed_cb), NULL);
+	g_signal_connect (cnt_editor, "web-process-terminated",
+		G_CALLBACK (test_utils_web_process_terminated_cb), NULL);
 
 	if (WEBKIT_IS_WEB_VIEW (cnt_editor)) {
 		WebKitSettings *web_settings;
diff --git a/src/mail/e-mail-display.c b/src/mail/e-mail-display.c
index 707363ac0c..8b52eb0193 100644
--- a/src/mail/e-mail-display.c
+++ b/src/mail/e-mail-display.c
@@ -2459,7 +2459,8 @@ e_mail_display_test_change_and_reload_cb (EMailDisplay *mail_display,
 }
 
 static void
-mail_display_web_process_crashed_cb (EMailDisplay *display)
+mail_display_web_process_terminated_cb (EMailDisplay *display,
+					WebKitWebProcessTerminationReason reason)
 {
 	EAlertSink *alert_sink;
 
@@ -2713,8 +2714,8 @@ e_mail_display_init (EMailDisplay *display)
 	display->priv->scheduled_reload = 0;
 
 	g_signal_connect (
-		display, "web-process-crashed",
-		G_CALLBACK (mail_display_web_process_crashed_cb), NULL);
+		display, "web-process-terminated",
+		G_CALLBACK (mail_display_web_process_terminated_cb), NULL);
 
 	g_signal_connect (
 		display, "decide-policy",
diff --git a/src/modules/webkit-editor/e-webkit-editor.c b/src/modules/webkit-editor/e-webkit-editor.c
index 2c4fa07605..6fa9061c2f 100644
--- a/src/modules/webkit-editor/e-webkit-editor.c
+++ b/src/modules/webkit-editor/e-webkit-editor.c
@@ -5356,7 +5356,8 @@ webkit_editor_drag_drop_cb (EWebKitEditor *wk_editor,
 }
 
 static void
-webkit_editor_web_process_crashed_cb (EWebKitEditor *wk_editor)
+webkit_editor_web_process_terminated_cb (EWebKitEditor *wk_editor,
+					 WebKitWebProcessTerminationReason reason)
 {
 	GtkWidget *widget;
 
@@ -5833,8 +5834,8 @@ e_webkit_editor_init (EWebKitEditor *wk_editor)
 		G_CALLBACK (webkit_editor_drag_motion_cb), NULL);
 
 	g_signal_connect (
-		wk_editor, "web-process-crashed",
-		G_CALLBACK (webkit_editor_web_process_crashed_cb), NULL);
+		wk_editor, "web-process-terminated",
+		G_CALLBACK (webkit_editor_web_process_terminated_cb), NULL);
 
 	g_signal_connect (
 		wk_editor, "style-updated",