18 files changed, 62 insertions, 67 deletions

diff --git a/src/ui/chat.c b/src/ui/chat.c
index 3831f66..71f7ebc 100644
--- a/src/ui/chat.c
+++ b/src/ui/chat.c
@@ -279,8 +279,8 @@ ui_chat_new(MESSENGER_Application *app)
   handle->messages = NULL;
   handle->edge_value = 0;
 
-  handle->builder = gtk_builder_new_from_file(
-      "resources/ui/chat.ui"
+  handle->builder = gtk_builder_new_from_resource(
+      application_get_resource_path(app, "ui/chat.ui")
   );
 
   handle->chat_box = GTK_WIDGET(
@@ -466,6 +466,7 @@ ui_chat_new(MESSENGER_Application *app)
 }
 
 struct IterateChatGroupClosure {
+  MESSENGER_Application *app;
   GHashTable *bindings;
   GtkListBox *listbox;
 };
@@ -480,7 +481,7 @@ iterate_ui_chat_update_group_contacts(void *cls,
   );
 
   GtkListBox *listbox = closure->listbox;
-  UI_PROFILE_ENTRY_Handle* entry = ui_profile_entry_new();
+  UI_PROFILE_ENTRY_Handle* entry = ui_profile_entry_new(closure->app);
 
   const char *name = GNUNET_CHAT_contact_get_name(contact);
 
@@ -559,6 +560,7 @@ ui_chat_update(UI_CHAT_Handle *handle,
   if (group)
   {
     struct IterateChatGroupClosure closure;
+    closure.app = app;
     closure.bindings = app->ui.bindings;
     closure.listbox = handle->chat_contacts_listbox;
 
diff --git a/src/ui/chat_entry.c b/src/ui/chat_entry.c
index 7de4064..1dabec8 100644
--- a/src/ui/chat_entry.c
+++ b/src/ui/chat_entry.c
@@ -35,7 +35,9 @@ ui_chat_entry_new(MESSENGER_Application *app)
   UI_CHAT_ENTRY_Handle* handle = g_malloc(sizeof(UI_CHAT_ENTRY_Handle));
 
   handle->chat = ui_chat_new(app);
-  handle->builder = gtk_builder_new_from_file("resources/ui/chat_entry.ui");
+  handle->builder = gtk_builder_new_from_resource(
+      application_get_resource_path(app, "ui/chat_entry.ui")
+  );
 
   handle->entry_box = GTK_WIDGET(
       gtk_builder_get_object(handle->builder, "entry_box")
diff --git a/src/ui/contact_entry.c b/src/ui/contact_entry.c
index cf830db..291c3b0 100644
--- a/src/ui/contact_entry.c
+++ b/src/ui/contact_entry.c
@@ -27,11 +27,13 @@
 #include "../application.h"
 
 UI_CONTACT_ENTRY_Handle*
-ui_contact_entry_new(void)
+ui_contact_entry_new(MESSENGER_Application *app)
 {
   UI_CONTACT_ENTRY_Handle* handle = g_malloc(sizeof(UI_CONTACT_ENTRY_Handle));
 
-  handle->builder = gtk_builder_new_from_file("resources/ui/contact_entry.ui");
+  handle->builder = gtk_builder_new_from_resource(
+      application_get_resource_path(app, "ui/contact_entry.ui")
+  );
 
   handle->entry_box = GTK_WIDGET(
       gtk_builder_get_object(handle->builder, "entry_box")
diff --git a/src/ui/contact_entry.h b/src/ui/contact_entry.h
index 6b39077..1ec97fc 100644
--- a/src/ui/contact_entry.h
+++ b/src/ui/contact_entry.h
@@ -40,7 +40,7 @@ typedef struct UI_CONTACT_ENTRY_Handle
 } UI_CONTACT_ENTRY_Handle;
 
 UI_CONTACT_ENTRY_Handle*
-ui_contact_entry_new(void);
+ui_contact_entry_new(MESSENGER_Application *app);
 
 void
 ui_contact_entry_delete(UI_CONTACT_ENTRY_Handle *handle);
diff --git a/src/ui/contacts.c b/src/ui/contacts.c
index fac9e62..3969446 100644
--- a/src/ui/contacts.c
+++ b/src/ui/contacts.c
@@ -104,7 +104,7 @@ _iterate_contacts(void *cls,
 
   const char *key = GNUNET_CHAT_contact_get_key(contact);
 
-  UI_CONTACT_ENTRY_Handle *entry = ui_contact_entry_new();
+  UI_CONTACT_ENTRY_Handle *entry = ui_contact_entry_new(app);
   gtk_list_box_prepend(
       app->ui.contacts.contacts_listbox,
       entry->entry_box
@@ -139,7 +139,9 @@ ui_contacts_dialog_init(MESSENGER_Application *app,
 {
   handle->contact_entries = NULL;
 
-  handle->builder = gtk_builder_new_from_file("resources/ui/contacts.ui");
+  handle->builder = gtk_builder_new_from_resource(
+      application_get_resource_path(app, "ui/contacts.ui")
+  );
 
   handle->dialog = GTK_DIALOG(
       gtk_builder_get_object(handle->builder, "contacts_dialog")
diff --git a/src/ui/invite_contact.c b/src/ui/invite_contact.c
index 5b6a71c..8cbde0c 100644
--- a/src/ui/invite_contact.c
+++ b/src/ui/invite_contact.c
@@ -96,7 +96,7 @@ _iterate_contacts(void *cls,
 
   const char *key = GNUNET_CHAT_contact_get_key(contact);
 
-  UI_CONTACT_ENTRY_Handle *entry = ui_contact_entry_new();
+  UI_CONTACT_ENTRY_Handle *entry = ui_contact_entry_new(app);
   gtk_list_box_prepend(
       app->ui.invite_contact.contacts_listbox,
       entry->entry_box
@@ -131,7 +131,9 @@ ui_invite_contact_dialog_init(MESSENGER_Application *app,
 {
   handle->contact_entries = NULL;
 
-  handle->builder = gtk_builder_new_from_file("resources/ui/invite_contact.ui");
+  handle->builder = gtk_builder_new_from_resource(
+      application_get_resource_path(app, "ui/invite_contact.ui")
+  );
 
   handle->dialog = GTK_DIALOG(
       gtk_builder_get_object(handle->builder, "invite_contact_dialog")
diff --git a/src/ui/message.c b/src/ui/message.c
index 47ec2aa..da6bb97 100644
--- a/src/ui/message.c
+++ b/src/ui/message.c
@@ -27,8 +27,8 @@
 #include "../application.h"
 
 UI_MESSAGE_Handle*
-ui_message_new(UI_MESSAGE_Type type,
-               UI_MESSAGE_ContentType content_type)
+ui_message_new(MESSENGER_Application *app,
+               UI_MESSAGE_Type type)
 {
   UI_MESSAGE_Handle* handle = g_malloc(sizeof(UI_MESSAGE_Handle));
 
@@ -39,17 +39,19 @@ ui_message_new(UI_MESSAGE_Type type,
   switch (handle->type)
   {
     case UI_MESSAGE_SENT:
-      ui_builder_file = "resources/ui/message-sent.ui";
+      ui_builder_file = "ui/message-sent.ui";
       break;
     case UI_MESSAGE_STATUS:
-      ui_builder_file = "resources/ui/message-status.ui";
+      ui_builder_file = "ui/message-status.ui";
       break;
     default:
-      ui_builder_file = "resources/ui/message.ui";
+      ui_builder_file = "ui/message.ui";
       break;
   }
 
-  handle->builder = gtk_builder_new_from_file(ui_builder_file);
+  handle->builder = gtk_builder_new_from_resource(
+      application_get_resource_path(app, ui_builder_file)
+  );
 
   handle->message_box = GTK_WIDGET(
       gtk_builder_get_object(handle->builder, "message_box")
@@ -94,8 +96,8 @@ ui_message_new(UI_MESSAGE_Type type,
       gtk_builder_get_object(handle->builder, "content_box")
   );
 
-  GtkBuilder *builder = gtk_builder_new_from_file(
-      "resources/ui/message_content.ui"
+  GtkBuilder *builder = gtk_builder_new_from_resource(
+      application_get_resource_path(app, "ui/message_content.ui")
   );
 
   handle->timestamp_label = GTK_LABEL(
@@ -131,32 +133,6 @@ ui_message_new(UI_MESSAGE_Type type,
       break;
   }
 
-  switch (content_type)
-  {
-    case UI_MESSAGE_CONTENT_TEXT:
-      gtk_stack_set_visible_child(
-          handle->content_stack,
-          GTK_WIDGET(handle->text_label)
-      );
-      break;
-    case UI_MESSAGE_CONTENT_FILE:
-      gtk_stack_set_visible_child(
-          handle->content_stack,
-          GTK_WIDGET(handle->file_revealer)
-      );
-
-      gtk_revealer_set_reveal_child(handle->file_revealer, TRUE);
-      break;
-    case UI_MESSAGE_CONTENT_PREVIEW:
-      gtk_stack_set_visible_child(
-          handle->content_stack,
-          GTK_WIDGET(handle->preview_drawing_area)
-      );
-      break;
-    default:
-      break;
-  }
-
   gtk_container_add(content_box, GTK_WIDGET(
       gtk_builder_get_object(builder, "message_content_box")
   ));
diff --git a/src/ui/message.h b/src/ui/message.h
index 27577a9..f5883de 100644
--- a/src/ui/message.h
+++ b/src/ui/message.h
@@ -41,13 +41,6 @@ typedef enum UI_MESSAGE_Type
   UI_MESSAGE_STATUS     = 2
 } UI_MESSAGE_Type;
 
-typedef enum UI_MESSAGE_ContentType
-{
-  UI_MESSAGE_CONTENT_TEXT       = 0,
-  UI_MESSAGE_CONTENT_FILE       = 1,
-  UI_MESSAGE_CONTENT_PREVIEW    = 2
-} UI_MESSAGE_ContentType;
-
 typedef struct UI_MESSAGE_Handle
 {
   UI_MESSAGE_Type type;
@@ -75,8 +68,8 @@ typedef struct UI_MESSAGE_Handle
 } UI_MESSAGE_Handle;
 
 UI_MESSAGE_Handle*
-ui_message_new(UI_MESSAGE_Type type,
-               UI_MESSAGE_ContentType content_type);
+ui_message_new(MESSENGER_Application *app,
+               UI_MESSAGE_Type type);
 
 void
 ui_message_update(UI_MESSAGE_Handle *handle,
diff --git a/src/ui/messenger.c b/src/ui/messenger.c
index 0db82a0..a926332 100644
--- a/src/ui/messenger.c
+++ b/src/ui/messenger.c
@@ -194,7 +194,9 @@ ui_messenger_init(MESSENGER_Application *app,
 {
   handle->chat_entries = NULL;
 
-  handle->builder = gtk_builder_new_from_file("resources/ui/messenger.ui");
+  handle->builder = gtk_builder_new_from_resource(
+      application_get_resource_path(app, "ui/messenger.ui")
+  );
 
   handle->main_window = GTK_APPLICATION_WINDOW(
       gtk_builder_get_object(handle->builder, "main_window")
diff --git a/src/ui/new_contact.c b/src/ui/new_contact.c
index 7e6f9c6..147f591 100644
--- a/src/ui/new_contact.c
+++ b/src/ui/new_contact.c
@@ -287,7 +287,9 @@ ui_new_contact_dialog_init(MESSENGER_Application *app,
   handle->video = zbar_video_create();
   handle->scanner = zbar_image_scanner_create();
 
-  handle->builder = gtk_builder_new_from_file("resources/ui/new_contact.ui");
+  handle->builder = gtk_builder_new_from_resource(
+      application_get_resource_path(app, "ui/new_contact.ui")
+  );
 
   handle->dialog = GTK_DIALOG(
       gtk_builder_get_object(handle->builder, "new_contact_dialog")
diff --git a/src/ui/new_group.c b/src/ui/new_group.c
index e161fbb..dbad66b 100644
--- a/src/ui/new_group.c
+++ b/src/ui/new_group.c
@@ -163,7 +163,7 @@ _iterate_contacts(void *cls,
 
   const char *key = GNUNET_CHAT_contact_get_key(contact);
 
-  UI_CONTACT_ENTRY_Handle *entry = ui_contact_entry_new();
+  UI_CONTACT_ENTRY_Handle *entry = ui_contact_entry_new(app);
   gtk_list_box_prepend(
       app->ui.new_group.contacts_listbox,
       entry->entry_box
@@ -198,7 +198,9 @@ ui_new_group_dialog_init(MESSENGER_Application *app,
 {
   handle->contact_entries = NULL;
 
-  handle->builder = gtk_builder_new_from_file("resources/ui/new_group.ui");
+  handle->builder = gtk_builder_new_from_resource(
+      application_get_resource_path(app, "ui/new_group.ui")
+  );
 
   handle->dialog = GTK_DIALOG(
       gtk_builder_get_object(handle->builder, "new_group_dialog")
diff --git a/src/ui/new_platform.c b/src/ui/new_platform.c
index dad4ad1..544b7c7 100644
--- a/src/ui/new_platform.c
+++ b/src/ui/new_platform.c
@@ -100,7 +100,9 @@ void
 ui_new_platform_dialog_init(MESSENGER_Application *app,
                             UI_NEW_PLATFORM_Handle *handle)
 {
-  handle->builder = gtk_builder_new_from_file("resources/ui/new_platform.ui");
+  handle->builder = gtk_builder_new_from_resource(
+      application_get_resource_path(app, "ui/new_platform.ui")
+  );
 
   handle->dialog = GTK_DIALOG(
       gtk_builder_get_object(handle->builder, "new_platform_dialog")
diff --git a/src/ui/new_profile.c b/src/ui/new_profile.c
index d845fdf..d1d0274 100644
--- a/src/ui/new_profile.c
+++ b/src/ui/new_profile.c
@@ -77,7 +77,9 @@ void
 ui_new_profile_dialog_init(MESSENGER_Application *app,
                            UI_NEW_PROFILE_Handle *handle)
 {
-  handle->builder = gtk_builder_new_from_file("resources/ui/new_profile.ui");
+  handle->builder = gtk_builder_new_from_resource(
+      application_get_resource_path(app, "ui/new_profile.ui")
+  );
 
   handle->dialog = GTK_DIALOG(
       gtk_builder_get_object(handle->builder, "new_profile_dialog")
diff --git a/src/ui/picker.c b/src/ui/picker.c
index 4a5d205..bdaa713 100644
--- a/src/ui/picker.c
+++ b/src/ui/picker.c
@@ -97,8 +97,8 @@ ui_picker_new(UNUSED MESSENGER_Application *app,
 {
   UI_PICKER_Handle *handle = g_malloc(sizeof(UI_PICKER_Handle));
 
-  handle->builder = gtk_builder_new_from_file(
-      "resources/ui/picker.ui"
+  handle->builder = gtk_builder_new_from_resource(
+      application_get_resource_path(app, "ui/picker.ui")
   );
 
   handle->picker_box = GTK_WIDGET(
diff --git a/src/ui/profile_entry.c b/src/ui/profile_entry.c
index 4a03f94..c2b232f 100644
--- a/src/ui/profile_entry.c
+++ b/src/ui/profile_entry.c
@@ -27,11 +27,13 @@
 #include "../application.h"
 
 UI_PROFILE_ENTRY_Handle*
-ui_profile_entry_new(void)
+ui_profile_entry_new(MESSENGER_Application *app)
 {
   UI_PROFILE_ENTRY_Handle* handle = g_malloc(sizeof(UI_PROFILE_ENTRY_Handle));
 
-  handle->builder = gtk_builder_new_from_file("resources/ui/profile_entry.ui");
+  handle->builder = gtk_builder_new_from_resource(
+      application_get_resource_path(app, "ui/profile_entry.ui")
+  );
 
   handle->entry_box = GTK_WIDGET(
       gtk_builder_get_object(handle->builder, "entry_box")
diff --git a/src/ui/profile_entry.h b/src/ui/profile_entry.h
index 6196737..92d2fd0 100644
--- a/src/ui/profile_entry.h
+++ b/src/ui/profile_entry.h
@@ -38,7 +38,7 @@ typedef struct UI_PROFILE_ENTRY_Handle
 } UI_PROFILE_ENTRY_Handle;
 
 UI_PROFILE_ENTRY_Handle*
-ui_profile_entry_new(void);
+ui_profile_entry_new(MESSENGER_Application *app);
 
 void
 ui_profile_entry_delete(UI_PROFILE_ENTRY_Handle *handle);
diff --git a/src/ui/send_file.c b/src/ui/send_file.c
index 0d0c04b..4b9643c 100644
--- a/src/ui/send_file.c
+++ b/src/ui/send_file.c
@@ -231,7 +231,9 @@ void
 ui_send_file_dialog_init(MESSENGER_Application *app,
                          UI_SEND_FILE_Handle *handle)
 {
-  handle->builder = gtk_builder_new_from_file("resources/ui/send_file.ui");
+  handle->builder = gtk_builder_new_from_resource(
+      application_get_resource_path(app, "ui/send_file.ui")
+  );
 
   handle->dialog = GTK_DIALOG(
       gtk_builder_get_object(handle->builder, "send_file_dialog")
diff --git a/src/ui/settings.c b/src/ui/settings.c
index ca58270..6863968 100644
--- a/src/ui/settings.c
+++ b/src/ui/settings.c
@@ -37,7 +37,9 @@ void
 ui_settings_dialog_init(MESSENGER_Application *app,
                         UI_SETTINGS_Handle *handle)
 {
-  handle->builder = gtk_builder_new_from_file("resources/ui/settings.ui");
+  handle->builder = gtk_builder_new_from_resource(
+      application_get_resource_path(app, "ui/settings.ui")
+  );
 
   handle->dialog = HDY_PREFERENCES_WINDOW(
       gtk_builder_get_object(handle->builder, "settings_dialog")