From 1c150a74abe1fa91d353903e5122ec6895bf23fd Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Fri, 5 May 2023 03:41:42 +0200 Subject: Fix error handlers for D-Bus methods --- src/arctica-greeter.vala | 6 ++++-- src/greeter-list.vala | 6 ++++-- src/remote-logon-service.vala | 9 +++++---- src/settings-daemon.vala | 14 ++++++++------ 4 files changed, 21 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/arctica-greeter.vala b/src/arctica-greeter.vala index 3ba2ff4..82d679e 100644 --- a/src/arctica-greeter.vala +++ b/src/arctica-greeter.vala @@ -2,6 +2,7 @@ * * Copyright (C) 2011 Canonical Ltd * Copyright (C) 2015-2017 Mike Gabriel + * Copyright (C) 2023 Robert Tari * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3 as @@ -17,6 +18,7 @@ * * Authors: Robert Ancell * Mike Gabriel + * Robert Tari */ public const int grid_size = 40; @@ -1243,12 +1245,12 @@ public class DialogDBusInterface : Object public signal void open_dialog (uint32 type); public signal void close_dialog (); - public void open (uint32 type, uint32 timestamp, uint32 seconds_to_stay_open, ObjectPath[] inhibitor_object_paths) + public void open (uint32 type, uint32 timestamp, uint32 seconds_to_stay_open, ObjectPath[] inhibitor_object_paths) throws GLib.DBusError, GLib.IOError { open_dialog (type); } - public void close () + public void close () throws GLib.DBusError, GLib.IOError { close_dialog (); } diff --git a/src/greeter-list.vala b/src/greeter-list.vala index b1853cf..102c153 100644 --- a/src/greeter-list.vala +++ b/src/greeter-list.vala @@ -2,6 +2,7 @@ * * Copyright (C) 2012 Canonical Ltd * Copyright (C) 2015-2017 Mike Gabriel + * Copyright (C) 2023 Robert Tari * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3 as @@ -19,6 +20,7 @@ * Michael Terry * Scott Sweeny * Mike Gabriel + * Robert Tari */ private const int MAX_FIELD_SIZE = 200; @@ -41,11 +43,11 @@ public class ListDBusInterface : Object }); } - public string get_active_entry () + public string get_active_entry () throws GLib.DBusError, GLib.IOError { return list.get_active_entry (); } - public void set_active_entry (string entry_name) + public void set_active_entry (string entry_name) throws GLib.DBusError, GLib.IOError { list.set_active_entry (entry_name); } diff --git a/src/remote-logon-service.vala b/src/remote-logon-service.vala index f0bfa7d..94bf5b9 100644 --- a/src/remote-logon-service.vala +++ b/src/remote-logon-service.vala @@ -2,6 +2,7 @@ * * Copyright (C) 2012 Canonical Ltd * Copyright (C) 2015-2016 Mike Gabriel + * Copyright (C) 2023 Robert Tari * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3 as @@ -44,10 +45,10 @@ protected struct RemoteServer [DBus (name = "org.ArcticaProject.RemoteLogon")] interface RemoteLogonService : Object { - public abstract async void get_servers (out RemoteServer[] serverList) throws IOError; - public abstract async void get_servers_for_login (string url, string emailAddress, string password, bool allowCache, out bool loginSuccess, out string dataType, out RemoteServer[] serverList) throws IOError; - public abstract async void get_cached_domains_for_server (string url, out string[] domains) throws IOError; - public abstract async void set_last_used_server (string uccsUrl, string serverUrl) throws IOError; + public abstract async void get_servers (out RemoteServer[] serverList) throws GLib.DBusError, GLib.IOError; + public abstract async void get_servers_for_login (string url, string emailAddress, string password, bool allowCache, out bool loginSuccess, out string dataType, out RemoteServer[] serverList) throws GLib.DBusError, GLib.IOError; + public abstract async void get_cached_domains_for_server (string url, out string[] domains) throws GLib.DBusError, GLib.IOError; + public abstract async void set_last_used_server (string uccsUrl, string serverUrl) throws GLib.DBusError, GLib.IOError; public signal void servers_updated (RemoteServer[] serverList); public signal void login_servers_updated (string url, string emailAddress, string dataType, RemoteServer[] serverList); diff --git a/src/settings-daemon.vala b/src/settings-daemon.vala index 34dd99c..88bf698 100644 --- a/src/settings-daemon.vala +++ b/src/settings-daemon.vala @@ -2,6 +2,7 @@ * * Copyright (C) 2011 Canonical Ltd * Copyright (C) 2015,2017 Mike Gabriel + * Copyright (C) 2023 Robert Tari * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3 as @@ -17,6 +18,7 @@ * * Authored by: Michael Terry * Mike Gabriel + * Robert Tari */ public class SettingsDaemon : Object @@ -232,7 +234,7 @@ public class ScreenSaverInterface : Object } } - public void set_active (bool value) + public void set_active (bool value) throws GLib.DBusError, GLib.IOError { if (_active == value) return; @@ -246,15 +248,15 @@ public class ScreenSaverInterface : Object active_changed (value); } - public bool get_active () + public bool get_active () throws GLib.DBusError, GLib.IOError { return _active; } - public uint32 get_active_time () { return 0; } - public void lock () {} - public void show_message (string summary, string body, string icon) {} - public void simulate_user_activity () {} + public uint32 get_active_time () throws GLib.DBusError, GLib.IOError { return 0; } + public void lock () throws GLib.DBusError, GLib.IOError {} + public void show_message (string summary, string body, string icon) throws GLib.DBusError, GLib.IOError {} + public void simulate_user_activity () throws GLib.DBusError, GLib.IOError {} } [DBus (name="org.gnome.SessionManager")] -- cgit v1.2.3