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 ad771b0d983d3b1292925c7725cd98dd0f9d0f79..f3722524bb83abbe2f2994f5f8e0ce41c6c7f9ff 100644 (file)
--- 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,