2 files changed, 3 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index d238818..4f5058e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -175,7 +175,9 @@ int main(int argc, char *argv[])
     gint exitCode = EXIT_SUCCESS;
     TrgClient *client;
 
+#if !GLIB_CHECK_VERSION(2, 36, 0)
     g_type_init();
+#endif
 
 #if !GLIB_CHECK_VERSION(2, 32, 0)
     g_thread_init(NULL);
diff --git a/src/trg-remote-prefs-dialog.c b/src/trg-remote-prefs-dialog.c
index f8bd43b..eadb0ac 100644
--- a/src/trg-remote-prefs-dialog.c
+++ b/src/trg-remote-prefs-dialog.c
@@ -436,7 +436,7 @@ static gboolean on_port_tested(gpointer data)
                                      _
                                      ("Port is <span font_weight=\"bold\" fgcolor=\"red\">closed</span>"));
         } else {
-            trg_error_dialog(GTK_WINDOW(data), response);
+          trg_error_dialog(GTK_WINDOW(response->cb_data), response);
         }
     }