1 files changed, 14 insertions, 12 deletions
diff --git a/src/main.c b/src/main.c
index 78968a3..9d8747e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,24 +1,26 @@
 #define _POSIX_C_SOURCE 200809L
-#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <gtk-3.0/gtk/gtk.h>
-#include "http.h"
+#include <gs.h>
 #include "config.h"
 #include "main_window.h"
 
-static void startup(GtkApplication *app, gpointer user_data)
+static void activate(GtkApplication *app, gpointer user_data)
 {
+    GSClient *gs_client;
+
     config_load();
-    if (http_init()) {
-        exit(EXIT_FAILURE);
-    }
-}
+    if(gs_init())
+        g_application_quit(G_APPLICATION(app));
 
-static void activate(GtkApplication *app, gpointer user_data)
-{
-    create_main_window(app, NULL);
+    gs_client = gs_client_new(config->instance_url, config->client_id, 
+            config->client_secret);
+    if(!gs_client) 
+        g_application_quit(G_APPLICATION(app));
+
+    create_main_window(app, gs_client);
 }
 
 int main(int argc, char **argv)
@@ -27,12 +29,12 @@ int main(int argc, char **argv)
     int status;
 
     app = gtk_application_new("org.gtk.ap_client", G_APPLICATION_FLAGS_NONE);
-    g_signal_connect(app, "startup", G_CALLBACK(startup), NULL);
     g_signal_connect(app, "activate", G_CALLBACK(activate), NULL);
     status = g_application_run(G_APPLICATION(app), argc, argv);
+
     g_object_unref(app);
-    http_cleanup();
     config_cleanup();
+    gs_cleanup();
 
     return status;
 }