[libdazzle] app: ensure base resources are loaded first



commit 45785e6bf7b243d4a2aed4f652b13dd79985febb
Author: Christian Hergert <chergert redhat com>
Date:   Thu Jun 29 15:59:39 2017 -0700

    app: ensure base resources are loaded first
    
    Since we won't have cleared the delayed resources array yet,
    these will get queued behind the applications deferred
    resources. That is not what we want. So instead of allowing
    ourselves to queue behind those resources, we simply chain-up
    immediately to the class handler.

 src/app/dzl-application.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/app/dzl-application.c b/src/app/dzl-application.c
index 984e7f6..705afcd 100644
--- a/src/app/dzl-application.c
+++ b/src/app/dzl-application.c
@@ -180,7 +180,7 @@ dzl_application_startup (GApplication *app)
    */
 
   /* Register our resources that are part of libdazzle. */
-  dzl_application_add_resources (self, "resource:///org/gnome/dazzle");
+  DZL_APPLICATION_GET_CLASS (self)->add_resources (self, "resource:///org/gnome/dazzle");
 
   /* Now register the application resources */
   if (NULL != (resource_base_path = g_application_get_resource_base_path (app)))
@@ -188,7 +188,7 @@ dzl_application_startup (GApplication *app)
       g_autofree gchar *resource_path = NULL;
 
       resource_path = g_strdup_printf ("resource://%s", resource_base_path);
-      dzl_application_add_resources (self, resource_path);
+      DZL_APPLICATION_GET_CLASS (self)->add_resources (self, resource_path);
     }
 
   /* If the application has "app-menu" defined in menus.ui, we want to


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]