Merge branch 'debug-window'

[empathy.git] / src / empathy-main-window.c

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 4a9f80f76f1ed0392f13398442ed984fdd861246..8fb127b90c2a6b2a93f653724af3e86d5373d1fa 100644 (file)
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -54,7 +54,7 @@
 #include "ephy-spinner.h"
 #include "empathy-preferences.h"
 #include "empathy-about-dialog.h"
-#include "empathy-debug-dialog.h"
+#include "empathy-debug-window.h"
 #include "empathy-new-chatroom-dialog.h"
 #include "empathy-map-view.h"
 #include "empathy-chatrooms-window.h"
@@ -1064,7 +1064,7 @@ static void
 main_window_help_debug_cb (GtkAction         *action,
                           EmpathyMainWindow *window)
 {
-       empathy_debug_dialog_new (GTK_WINDOW (window->window));
+       empathy_debug_window_new (GTK_WINDOW (window->window));
 }
 
 static void
@@ -1254,8 +1254,8 @@ empathy_main_window_show (void)
                          "account-connection-changed",
                          G_CALLBACK (main_window_connection_changed_cb), window);
 
-       window->errors = g_hash_table_new_full (empathy_account_hash,
-                                               empathy_account_equal,
+       window->errors = g_hash_table_new_full (g_direct_hash,
+                                               g_direct_equal,
                                                g_object_unref,
                                                NULL);
 
@@ -1404,6 +1404,8 @@ empathy_main_window_show (void)
 
        main_window_update_status (window, window->account_manager);
 
+       gtk_widget_show (window->window);
+
        return window->window;
 }