[geary/gnumdk/stable: 6/21] client: accounts: Do not fallback to previous id
- From: Cédric Bellegarde <cbellegarde src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/gnumdk/stable: 6/21] client: accounts: Do not fallback to previous id
- Date: Mon, 1 Aug 2022 12:45:46 +0000 (UTC)
commit 296e3ee9b67bede6a8486512329bf47d8c618bbc
Author: Cédric Bellegarde <cedric bellegarde adishatz org>
Date: Tue Jul 5 23:19:14 2022 +0200
client: accounts: Do not fallback to previous id
This makes valac locked on build
src/client/accounts/accounts-manager.vala | 30 +++++++++---------------------
1 file changed, 9 insertions(+), 21 deletions(-)
---
diff --git a/src/client/accounts/accounts-manager.vala b/src/client/accounts/accounts-manager.vala
index 3a35093a1..2f60944c5 100644
--- a/src/client/accounts/accounts-manager.vala
+++ b/src/client/accounts/accounts-manager.vala
@@ -856,27 +856,15 @@ 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>
- 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
- );
- }
+ 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
+ );
// @s "launch-panel"
// @av [<@(sav) ("online-accounts", [<@s "add">, <@s "google">])>]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]