From 477e1ba2977435ae7bb75c7dbd95cf28247f89bd Mon Sep 17 00:00:00 2001 From: nirav Date: Thu, 28 Mar 2019 09:10:52 +0530 Subject: Move APIs into libgs dir --- src/main.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'src/main.c') 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 #include #include #include #include -#include "http.h" +#include #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; } -- cgit v1.2.3