From: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Tue, 20 Sep 2011 22:32:59 +0000 (+1000)
Subject: Merge branch 'crash-659118'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=e3598826ad6ede2f72fbee91c528e621f6dce926;hp=f9c3f78251f24515f8c667142d278641b608e260

Merge branch 'crash-659118'

Freeze exception signed off by Andre Klapper <ak-47@gmx.net> and
Matthias Clasen <matthias.clasen@gmail.com>
---

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index ad771b0d..f3722524 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -2122,6 +2122,10 @@ empathy_main_window_init (EmpathyMainWindow *window)
 	gtk_window_set_role (GTK_WINDOW (window), "contact_list");
 	gtk_window_set_default_size (GTK_WINDOW (window), 225, 325);
 
+	/* don't finalize the widget on delete-event, just hide it */
+	g_signal_connect (window, "delete-event",
+		G_CALLBACK (gtk_widget_hide_on_delete), NULL);
+
 	/* Set up interface */
 	filename = empathy_file_lookup ("empathy-main-window.ui", "src");
 	gui = empathy_builder_get_file (filename,