Move configure_environment() into application on_startup() handlers in order that e.g. environment variables need not be set, and config files not available, for just calling help.

Author: lawmurray

src/mendingwall.c

@@ -21,10 +21,9 @@
 #include <mendingwallapplication.h>
 
 int main(int argc, char* argv[]) {
-  configure_environment();
-  g_resources_register(mendingwall_get_resource());
   MendingwallApplication* app = mendingwall_application_new();
   int status = g_application_run(G_APPLICATION(app), argc, argv);
   g_object_unref(app);
   return status;
 }
+

src/mendingwall.gresource.xml

@@ -6,3 +6,4 @@
     <file alias="icons/scalable/apps/mendingwall.svg">../data/icons/hicolor/scalable/apps/org.indii.mendingwall.svg</file>
   </gresource>
 </gresources>
+

src/mendingwallapplication.c

@@ -51,6 +51,11 @@ static void on_about(MendingwallApplication* self) {
 }
 
 static void on_startup(MendingwallApplication* self) {
+  /* setup */
+  configure_environment();
+  g_resources_register(mendingwall_get_resource());
+
+  /* builder */
   g_autoptr(GtkBuilder) builder = gtk_builder_new_from_resource("/org/indii/mendingwall/main.ui");
 
   /* main window */
@@ -107,3 +112,4 @@ MendingwallApplication* mendingwall_application_new(void) {
 
   return self;
 }
+

src/mendingwallapplication.h

@@ -29,3 +29,4 @@ G_DECLARE_FINAL_TYPE(MendingwallApplication, mendingwall_application, MENDINGWAL
 MendingwallApplication* mendingwall_application_new(void);
 
 G_END_DECLS
+

src/mendingwallcli.c

@@ -15,15 +15,14 @@
  * with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
- #include <config.h>
- #include <utility.h>
- #include <mendingwallcliapplication.h>
- 
- int main(int argc, char* argv[]) {
-   configure_environment();
-   MendingwallCLIApplication* app = mendingwall_cli_application_new();
-   int status = g_application_run(G_APPLICATION(app), argc, argv);
-   g_object_unref(app);
-   return status;
- }
- 
+#include <config.h>
+#include <utility.h>
+#include <mendingwallcliapplication.h>
+
+int main(int argc, char* argv[]) {
+  MendingwallCLIApplication* app = mendingwall_cli_application_new();
+  int status = g_application_run(G_APPLICATION(app), argc, argv);
+  g_object_unref(app);
+  return status;
+}
+

src/mendingwallcliapplication.c

@@ -32,7 +32,10 @@ struct _MendingwallCLIApplication {
 
 G_DEFINE_TYPE(MendingwallCLIApplication, mendingwall_cli_application, G_TYPE_APPLICATION)
 
-static void on_activate(MendingwallCLIApplication* self) {
+static void on_startup(MendingwallCLIApplication* self) {
+  /* setup */
+  configure_environment();
+
   /* update configuration */
   g_autoptr(GSettings) global = g_settings_new("org.indii.mendingwall");
   gboolean themes = g_settings_get_boolean(global, "themes");
@@ -72,6 +75,10 @@ static void on_activate(MendingwallCLIApplication* self) {
   }
 }
 
+static void on_activate(MendingwallCLIApplication* self) {
+  //
+}
+
 void mendingwall_cli_application_dispose(GObject* o) {
   G_OBJECT_CLASS(mendingwall_cli_application_parent_class)->dispose(o);
 }
@@ -127,7 +134,9 @@ MendingwallCLIApplication* mendingwall_cli_application_new(void) {
       "For more information see https://mendingwall.indii.org");
   g_application_add_main_option_entries(G_APPLICATION(self), option_entries);
 
+  g_signal_connect(self, "startup", G_CALLBACK(on_startup), NULL);
   g_signal_connect(self, "activate", G_CALLBACK(on_activate), NULL);
 
   return self;
 }
+

src/mendingwallcliapplication.h

@@ -26,3 +26,4 @@ G_DECLARE_FINAL_TYPE(MendingwallCLIApplication, mendingwall_cli_application, MEN
 MendingwallCLIApplication* mendingwall_cli_application_new(void);
 
 G_END_DECLS
+

src/mendingwalld.c

@@ -20,9 +20,9 @@
 #include <mendingwalldapplication.h>
 
 int main(int argc, char* argv[]) {
-  configure_environment();
   MendingwallDApplication* app = mendingwall_d_application_new();
   int status = g_application_run(G_APPLICATION(app), argc, argv);
   g_object_unref(app);
   return status;
 }
+

src/mendingwalldapplication.c

@@ -133,6 +133,9 @@ static void on_session_state_changed(MendingwallDApplication* self, gboolean,
 }
 
 static void on_startup(MendingwallDApplication* self) {
+  /* setup */
+  configure_environment();
+
   /* basic initialization */
   self->portal = xdp_portal_initable_new(NULL);
   self->global = g_settings_new("org.indii.mendingwall");

src/mendingwalldapplication.h

@@ -26,3 +26,4 @@ G_DECLARE_FINAL_TYPE(MendingwallDApplication, mendingwall_d_application, MENDING
 MendingwallDApplication* mendingwall_d_application_new(void);
 
 G_END_DECLS
+