Move non C-sources to resources dir

src/iridium-note-row.c

@@ -121,7 +121,7 @@ iridium_note_row_class_init (IridiumNoteRowClass *klass)
 
   oclass->dispose = iridium_note_row_dispose;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/net/bloerg/Iridium/iridium-note-row.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/net/bloerg/Iridium/ui/iridium-note-row.ui");
   gtk_widget_class_bind_template_child (widget_class, IridiumNoteRow, title);
   gtk_widget_class_bind_template_child (widget_class, IridiumNoteRow, tags);
 }

src/iridium-signin-dialog.c

@@ -139,7 +139,7 @@ iridium_signin_dialog_class_init (IridiumSigninDialogClass *klass)
 
   oclass->finalize = iridium_signin_finalize;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/net/bloerg/Iridium/iridium-signin-dialog.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/net/bloerg/Iridium/ui/iridium-signin-dialog.ui");
   gtk_widget_class_bind_template_child (widget_class, IridiumSigninDialog, server_entry);
   gtk_widget_class_bind_template_child (widget_class, IridiumSigninDialog, email_entry);
   gtk_widget_class_bind_template_child (widget_class, IridiumSigninDialog, password_entry);

src/iridium-tag-row.c

@@ -78,7 +78,7 @@ iridium_tag_row_class_init (IridiumTagRowClass *klass)
 
   oclass->dispose = iridium_tag_row_dispose;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/net/bloerg/Iridium/iridium-tag-row.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/net/bloerg/Iridium/ui/iridium-tag-row.ui");
   gtk_widget_class_bind_template_child (widget_class, IridiumTagRow, title);
   gtk_widget_class_bind_template_child (widget_class, IridiumTagRow, count);
 }

src/iridium-window.c

@@ -384,7 +384,7 @@ iridium_window_constructed (GObject *object)
   self->client = iridium_standard_file_new ();
   self->source_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (self->source_view));
 
-  style_data = g_resources_lookup_data ("/net/bloerg/Iridium/iridium-theme.css", G_RESOURCE_LOOKUP_FLAGS_NONE, NULL);
+  style_data = g_resources_lookup_data ("/net/bloerg/Iridium/css/iridium-theme.css", G_RESOURCE_LOOKUP_FLAGS_NONE, NULL);
   content_manager = webkit_web_view_get_user_content_manager (self->html_view);
   stylesheet = webkit_user_style_sheet_new ((const gchar *) g_bytes_get_data (style_data, NULL),
     WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES, WEBKIT_USER_STYLE_LEVEL_AUTHOR, NULL, NULL);
@@ -399,7 +399,7 @@ iridium_window_constructed (GObject *object)
                                   gtk_source_language_manager_get_language (manager, "markdown"));
 
   provider = GTK_STYLE_PROVIDER (gtk_css_provider_get_default ());
-  gtk_css_provider_load_from_resource (GTK_CSS_PROVIDER (provider), "/net/bloerg/Iridium/iridium.css");
+  gtk_css_provider_load_from_resource (GTK_CSS_PROVIDER (provider), "/net/bloerg/Iridium/css/iridium.css");
   gtk_style_context_add_provider_for_screen (gtk_window_get_screen (GTK_WINDOW (self)), provider, GTK_STYLE_PROVIDER_PRIORITY_USER);
 
   gtk_list_box_set_filter_func (self->note_list, (GtkListBoxFilterFunc) note_visible, self, NULL);
@@ -434,7 +434,7 @@ iridium_window_class_init (IridiumWindowClass *klass)
   oclass->constructed = iridium_window_constructed;
   oclass->dispose = iridium_window_dispose;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/net/bloerg/Iridium/iridium-window.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/net/bloerg/Iridium/ui/iridium-window.ui");
   gtk_widget_class_bind_template_child (widget_class, IridiumWindow, header_bar);
   gtk_widget_class_bind_template_child (widget_class, IridiumWindow, note_list);
   gtk_widget_class_bind_template_child (widget_class, IridiumWindow, source_view);

src/iridium.gresource.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/net/bloerg/Iridium">
-    <file>iridium.css</file>
-    <file>iridium-theme.css</file>
-    <file>iridium-menu.ui</file>
-    <file>iridium-note-row.ui</file>
-    <file>iridium-signin-dialog.ui</file>
-    <file>iridium-tag-row.ui</file>
-    <file>iridium-window.ui</file>
-  </gresource>
-</gresources>

src/meson.build

@@ -33,8 +33,10 @@ endif
 
 gnome = import('gnome')
 
-iridium_sources += gnome.compile_resources('iridium-resources',
-  'iridium.gresource.xml',
+iridium_sources += gnome.compile_resources(
+  'iridium-resources',
+  join_paths('resources', 'iridium.gresource.xml'),
+  source_dir: 'resources',
   c_name: 'iridium'
 )
 

src/resources/iridium.gresource.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/net/bloerg/Iridium">
+    <file>css/iridium.css</file>
+    <file>css/iridium-theme.css</file>
+    <file>ui/iridium-menu.ui</file>
+    <file>ui/iridium-note-row.ui</file>
+    <file>ui/iridium-signin-dialog.ui</file>
+    <file>ui/iridium-tag-row.ui</file>
+    <file>ui/iridium-window.ui</file>
+  </gresource>
+</gresources>