1 files changed, 17 insertions, 185 deletions

diff --git a/src/messenger_gtk.c b/src/messenger_gtk.c
index 7106645..7ec3da0 100644
--- a/src/messenger_gtk.c
+++ b/src/messenger_gtk.c
@@ -22,65 +22,12 @@
  * @file messenger_gtk.c
  */
 
-#include <stdbool.h>
-#include <stdio.h>
+#include "chat/messenger.h"
+#include "ui/messenger.h"
 
 #include <pthread.h>
 
-#include <gtk-3.0/gtk/gtk.h>
-#include <libhandy-1/handy.h>
-
-#include <gnunet/gnunet_program_lib.h>
-#include <gnunet/gnunet_chat_lib.h>
-
-void handle_user_details_button_click(GtkButton* button,
-                                      gpointer user_data)
-{
-  HdyFlap* flap = HDY_FLAP(user_data);
-
-  if (TRUE == hdy_flap_get_reveal_flap(flap)) {
-    hdy_flap_set_reveal_flap(flap, FALSE);
-  } else {
-    hdy_flap_set_reveal_flap(flap, TRUE);
-  }
-}
-
-void handle_account_details_button_click(GtkButton* button,
-                                         gpointer user_data)
-{
-  GtkRevealer* revealer = GTK_REVEALER(user_data);
-
-  if (TRUE == gtk_revealer_get_reveal_child(revealer)) {
-    gtk_revealer_set_reveal_child(revealer, FALSE);
-  } else {
-    gtk_revealer_set_reveal_child(revealer, TRUE);
-  }
-}
-
-void handle_chats_listbox_row_activated(GtkListBox* listbox,
-                                        GtkListBoxRow* row,
-                                        gpointer user_data)
-{
-  HdyLeaflet* leaflet = HDY_LEAFLET(user_data);
-
-  GList* children = gtk_container_get_children(GTK_CONTAINER(leaflet));
-
-  if ((children) && (children->next)) {
-    hdy_leaflet_set_visible_child(leaflet, GTK_WIDGET(children->next->data));
-  }
-}
-
-void handle_back_button_click(GtkButton* button,
-                              gpointer user_data)
-{
-  HdyLeaflet* leaflet = HDY_LEAFLET(user_data);
-
-  GList* children = gtk_container_get_children(GTK_CONTAINER(leaflet));
-
-  if (children) {
-    hdy_leaflet_set_visible_child(leaflet, GTK_WIDGET(children->data));
-  }
-}
+#define UNUSED __attribute__((unused))
 
 struct main_program
 {
@@ -89,31 +36,27 @@ struct main_program
 
   bool exit;
 
-  struct GNUNET_CHAT_Handle *chat;
-
-  HdyAvatar *profile_avatar;
-  GtkLabel *profile_label;
-
-  struct GNUNET_SCHEDULER_Task *idle;
+  struct CHAT_MESSENGER_Handle chat;
+  struct UI_MESSENGER_Handle ui;
 };
 
 gboolean gtk_set_profile_name(gpointer user_data)
 {
   struct main_program *program = (struct main_program*) user_data;
 
-  const char *name = GNUNET_CHAT_get_name(program->chat);
+  const char *name = GNUNET_CHAT_get_name(program->chat.handle);
 
   if (name)
   {
-    hdy_avatar_set_text(program->profile_avatar, name);
-    gtk_label_set_text(program->profile_label, name);
+    hdy_avatar_set_text(program->ui.profile_avatar, name);
+    gtk_label_set_text(program->ui.profile_label, name);
   }
 
   return FALSE;
 }
 
 int gnunet_chat_message(void *cls,
-                        struct GNUNET_CHAT_Context *context,
+                        UNUSED struct GNUNET_CHAT_Context *context,
                         const struct GNUNET_CHAT_Message *message)
 {
   struct main_program *program = (struct main_program*) cls;
@@ -132,14 +75,14 @@ void gnunet_idle(void *cls)
 
   if (program->exit)
   {
-    GNUNET_CHAT_stop(program->chat);
-    program->chat = NULL;
+    GNUNET_CHAT_stop(program->chat.handle);
+    program->chat.handle = NULL;
 
     GNUNET_SCHEDULER_shutdown();
     return;
   }
 
-  program->idle = GNUNET_SCHEDULER_add_delayed_with_priority(
+  program->chat.idle = GNUNET_SCHEDULER_add_delayed_with_priority(
       GNUNET_TIME_relative_get_second_(),
       GNUNET_SCHEDULER_PRIORITY_IDLE,
       gnunet_idle,
@@ -148,13 +91,13 @@ void gnunet_idle(void *cls)
 }
 
 void gnunet_task(void *cls,
-                 char *const *args,
-                 const char *cfgfile,
+                 UNUSED char *const *args,
+                 UNUSED const char *cfgfile,
                  const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct main_program *program = (struct main_program*) cls;
 
-  program->chat = GNUNET_CHAT_start(
+  program->chat.handle = GNUNET_CHAT_start(
       cfg,
       "messenger-gtk",
       "test",
@@ -162,7 +105,7 @@ void gnunet_task(void *cls,
       program
   );
 
-  program->idle = GNUNET_SCHEDULER_add_delayed_with_priority(
+  program->chat.idle = GNUNET_SCHEDULER_add_delayed_with_priority(
       GNUNET_TIME_relative_get_zero_(),
       GNUNET_SCHEDULER_PRIORITY_IDLE,
       gnunet_idle,
@@ -201,27 +144,7 @@ int main(int argc, char **argv) {
   pthread_t gnunet_tid;
   gtk_init(&argc, &argv);
 
-  GtkBuilder* builder = gtk_builder_new();
-  gtk_builder_add_from_file(
-      builder,
-      "resources/ui/messenger.ui",
-      NULL
-  );
-
-  GtkApplicationWindow* window = GTK_APPLICATION_WINDOW(
-      gtk_builder_get_object(builder, "main_window")
-  );
-
-  program.profile_avatar = HDY_AVATAR(
-      gtk_builder_get_object(builder, "profile_avatar")
-  );
-
-  program.profile_label = GTK_LABEL(
-      gtk_builder_get_object(builder, "profile_label")
-  );
-
   GdkScreen* screen = gdk_screen_get_default();
-
   GtkCssProvider* provider = gtk_css_provider_new();
   gtk_css_provider_load_from_path(
       provider,
@@ -235,98 +158,7 @@ int main(int argc, char **argv) {
       GTK_STYLE_PROVIDER_PRIORITY_APPLICATION
   );
 
-  HdyHeaderBar* title_bar = HDY_HEADER_BAR(
-      gtk_builder_get_object(builder, "title_bar")
-  );
-
-  HdyLeaflet* leaflet_chat = HDY_LEAFLET(
-      gtk_builder_get_object(builder, "leaflet_chat")
-  );
-
-  hdy_leaflet_set_homogeneous(leaflet_chat, FALSE, GTK_ORIENTATION_HORIZONTAL, FALSE);
-
-  GtkListBox* chats_listbox = GTK_LIST_BOX(
-      gtk_builder_get_object(builder, "chats_listbox")
-  );
-
-  g_signal_connect(
-      chats_listbox,
-      "row-activated",
-      G_CALLBACK(handle_chats_listbox_row_activated),
-      leaflet_chat
-  );
-
-  GtkButton* user_details_button = GTK_BUTTON(
-      gtk_builder_get_object(builder, "user_details_button")
-  );
-
-  GtkButton* hide_user_details_button = GTK_BUTTON(
-      gtk_builder_get_object(builder, "hide_user_details_button")
-  );
-
-  HdyFlap* flap_user_details = HDY_FLAP(
-      gtk_builder_get_object(builder, "flap_user_details")
-  );
-
-  g_signal_connect(
-      user_details_button,
-      "clicked",
-      G_CALLBACK(handle_user_details_button_click),
-      flap_user_details
-  );
-
-  g_signal_connect(
-      hide_user_details_button,
-      "clicked",
-      G_CALLBACK(handle_user_details_button_click),
-      flap_user_details
-  );
-
-  GtkButton* account_details_button = GTK_BUTTON(
-      gtk_builder_get_object(builder, "account_details_button")
-  );
-
-  GtkRevealer* account_details_revealer = GTK_REVEALER(
-      gtk_builder_get_object(builder, "account_details_revealer")
-  );
-
-  g_signal_connect(
-      account_details_button,
-      "clicked",
-      G_CALLBACK(handle_account_details_button_click),
-      account_details_revealer
-  );
-
-  GtkButton* back_button = GTK_BUTTON(
-      gtk_builder_get_object(builder, "back_button")
-  );
-
-  g_signal_connect(
-      back_button,
-      "clicked",
-      G_CALLBACK(handle_back_button_click),
-      leaflet_chat
-  );
-
-  g_object_bind_property(
-      leaflet_chat,
-      "folded",
-      back_button,
-      "visible",
-      G_BINDING_SYNC_CREATE
-  );
-
-  g_object_bind_property(
-      leaflet_chat,
-      "folded",
-      title_bar,
-      "show-close-button",
-      G_BINDING_INVERT_BOOLEAN
-  );
-
-  gtk_widget_show(GTK_WIDGET(window));
-
-  g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
+  ui_messenger_init(&(program.ui));
 
   pthread_create(&gnunet_tid, NULL, gnunet_thread, &program);