Fix race where UI sensitivity was being set before the AM was ready

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 4db232b975d691aaefabf4b62b5f7d869c596e37..bf0cb471b9ed46a429c59319bcf2f423a0cf2f85 100644 (file)
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -1214,6 +1214,8 @@ account_manager_prepared_cb (GObject *source_object,
                                  window);
        }
 
                                  window);
        }
 

+       main_window_update_status (window);
+

        /* Disable the "Previous Conversations" menu entry if there is no account */
        gtk_action_set_sensitive (window->view_history,
                g_list_length (accounts) > 0);
        /* Disable the "Previous Conversations" menu entry if there is no account */
        gtk_action_set_sensitive (window->view_history,
                g_list_length (accounts) > 0);


@@ -1454,8 +1456,6 @@ empathy_main_window_show (void)
                                                 EMPATHY_PREFS_UI_SHOW_AVATARS,
                                                 window);
 
                                                 EMPATHY_PREFS_UI_SHOW_AVATARS,
                                                 window);
 

-       main_window_update_status (window);
-

        return window->window;
 }
 
        return window->window;
 }