From c7b60ca38c5bb8426d6439996a0259608619fb1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Mon, 12 Jun 2023 18:37:57 -0700
Subject: [PATCH] Application: use startup (#363)

---
 data/gresource.xml   |  4 +++-
 src/Application.vala | 24 +++++++++++++++---------
 src/MainWindow.vala  |  4 ----
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/data/gresource.xml b/data/gresource.xml
index 6a9d485e7d..55b2f7393b 100644
--- a/data/gresource.xml
+++ b/data/gresource.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/io/elementary/tasks">
-    <file alias="location-marker.svg" compressed="true" preprocess="xml-stripblanks">LocationMarker.svg</file>
     <file compressed="true">EditableLabel.css</file>
     <file compressed="true">EntryPopover.css</file>
     <file compressed="true">SourceRow.css</file>
     <file compressed="true">TaskRow.css</file>
   </gresource>
+  <gresource prefix="/io/elementary/tasks/icons">
+      <file alias="location-marker.svg" compressed="true" preprocess="xml-stripblanks">LocationMarker.svg</file>
+  </gresource>
 </gresources>
diff --git a/src/Application.vala b/src/Application.vala
index 385b18786f..f60ae11bae 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -53,6 +53,21 @@ public class Tasks.Application : Gtk.Application {
         GLib.Intl.textdomain (GETTEXT_PACKAGE);
 
         add_main_option_entries (OPTIONS);
+    }
+
+    protected override void startup () {
+        base.startup ();
+
+        Hdy.init ();
+
+        unowned var granite_settings = Granite.Settings.get_default ();
+        unowned var gtk_settings = Gtk.Settings.get_default ();
+
+        gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == DARK;
+
+        granite_settings.notify["prefers-color-scheme"].connect ((obj) => {
+            gtk_settings.gtk_application_prefer_dark_theme = ((Granite.Settings) obj).prefers_color_scheme == DARK;
+        });
 
         var quit_action = new SimpleAction ("quit", null);
         quit_action.activate.connect (() => {
@@ -101,15 +116,6 @@ public class Tasks.Application : Gtk.Application {
                 main_window.maximize ();
             }
 
-            var granite_settings = Granite.Settings.get_default ();
-            var gtk_settings = Gtk.Settings.get_default ();
-
-            gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == Granite.Settings.ColorScheme.DARK;
-
-            granite_settings.notify["prefers-color-scheme"].connect (() => {
-                gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == Granite.Settings.ColorScheme.DARK;
-            });
-
             main_window.show_all ();
         }
 
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index 7b81c91297..572c21288b 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -32,11 +32,7 @@ public class Tasks.MainWindow : Hdy.ApplicationWindow {
     }
 
     static construct {
-        Hdy.init ();
-
         action_accelerators[ACTION_DELETE_SELECTED_LIST] = "<Control>BackSpace";
-
-        Gtk.IconTheme.get_default ().add_resource_path ("/io/elementary/tasks");
     }
 
     construct {