Merge branch 'crash-659118'

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

diff --combined src/empathy-main-window.c
index ad771b0d983d3b1292925c7725cd98dd0f9d0f79,0e75b1cbe07e4abba421779f973c36114dafd986..f3722524bb83abbe2f2994f5f8e0ce41c6c7f9ff
--- 1/src/empathy-main-window.c
--- 2/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@@ -2010,7 -2010,7 +2010,7 @@@ account_manager_prepared_cb (GObjec
        EmpathyMainWindowPriv *priv = GET_PRIV (window);
        GError *error = NULL;
  
 -      if (!tp_account_manager_prepare_finish (manager, result, &error)) {
 +      if (!tp_proxy_prepare_finish (manager, result, &error)) {
                DEBUG ("Failed to prepare account manager: %s", error->message);
                g_error_free (error);
                return;
@@@ -2122,6 -2122,10 +2122,10 @@@ empathy_main_window_init (EmpathyMainWi
        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,
@@@ -2208,7 -2212,7 +2212,7 @@@
  
        priv->account_manager = tp_account_manager_dup ();
  
 -      tp_account_manager_prepare_async (priv->account_manager, NULL,
 +      tp_proxy_prepare_async (priv->account_manager, NULL,
                                          account_manager_prepared_cb, window);
  
        priv->errors = g_hash_table_new_full (g_direct_hash,