nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'goa_fix' into 'mainline'

Browse source 
client: accounts: Use new GNOME Settings app-id

Closes #1371

See merge request GNOME/geary!734
This commit is contained in:
Cédric Bellegarde 2022-07-05 19:51:02 +00:00
commit d9afe29b1c
2 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
org.gnome.Geary.json
View file

@ -20,6 +20,7 @@
"--talk-name=org.freedesktop.secrets",
"--talk-name=org.gnome.Contacts",
"--talk-name=org.gnome.ControlCenter",
"--talk-name=org.gnome.Settings",
"--talk-name=org.gnome.OnlineAccounts",
"--talk-name=org.gnome.evolution.dataserver.*",
"--filesystem=xdg-cache/evolution/addressbook:ro",

30
src/client/accounts/accounts-manager.vala
View file

@ -856,15 +856,27 @@ public class Accounts.Manager : GLib.Object {
// This method was based on the implementation from:
// https://gitlab.gnome.org/GNOME/gnome-calendar/blob/master/src/gcal-source-dialog.c,
// Courtesy Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
GLib.DBusProxy settings = yield new GLib.DBusProxy.for_bus(
GLib.BusType.SESSION,
GLib.DBusProxyFlags.NONE,
null,
"org.gnome.ControlCenter",
"/org/gnome/ControlCenter",
"org.gtk.Actions",
cancellable
);
try {
GLib.DBusProxy settings = yield new GLib.DBusProxy.for_bus(
GLib.BusType.SESSION,
GLib.DBusProxyFlags.NONE,
null,
"org.gnome.Settings",
"/org/gnome/Settings",
"org.gtk.Actions",
cancellable
);
} catch (GLib.Error) {
GLib.DBusProxy settings = yield new GLib.DBusProxy.for_bus(
GLib.BusType.SESSION,
GLib.DBusProxyFlags.NONE,
null,
"org.gnome.ControlCenter",
"/org/gnome/ControlCenter",
"org.gtk.Actions",
cancellable
);
}
// @s "launch-panel"
// @av [<@(sav) ("online-accounts", [<@s "add">, <@s "google">])>]