From 519c8633e65498e6aa64e2727165647a824aa22c Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Fri, 21 Aug 2020 10:36:58 +1000 Subject: [PATCH] Application.Client: Explicitly set a GApplication resource base path Set the resource base path to be the expected path so that when running devel or beta builds (ones that have different app ids), the keyboard shortcut UI file is still found. Fixes #930 --- src/client/application/application-client.vala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala index 43002728..8048acfe 100644 --- a/src/client/application/application-client.vala +++ b/src/client/application/application-client.vala @@ -28,6 +28,7 @@ public class Application.Client : Gtk.Application { public const string NAME = "Geary" + _NAME_SUFFIX; public const string APP_ID = _APP_ID; + public const string RESOURCE_BASE_PATH = "/org/gnome/Geary"; public const string SCHEMA_ID = "org.gnome.Geary"; public const string DESCRIPTION = _("Send and receive email"); public const string COPYRIGHT_1 = _("Copyright 2016 Software Freedom Conservancy Inc."); @@ -337,6 +338,7 @@ public class Application.Client : Gtk.Application { public Client() { Object( application_id: APP_ID, + resource_base_path: RESOURCE_BASE_PATH, flags: ( GLib.ApplicationFlags.HANDLES_OPEN | GLib.ApplicationFlags.HANDLES_COMMAND_LINE