From 2be507e96007b97d73995936ad50c469a4a8a798 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sun, 19 Dec 2021 19:17:35 +0100 Subject: Do not run helper applications unless ayatana-webmail is running --- data/usr/bin/ayatana-webmail-clear | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'data/usr/bin/ayatana-webmail-clear') diff --git a/data/usr/bin/ayatana-webmail-clear b/data/usr/bin/ayatana-webmail-clear index 744f709..500195f 100755 --- a/data/usr/bin/ayatana-webmail-clear +++ b/data/usr/bin/ayatana-webmail-clear @@ -6,7 +6,6 @@ import sys import dbus - from gi.repository import GLib from dbus.mainloop.glib import DBusGMainLoop from ayatanawebmail.common import isRunning @@ -15,11 +14,11 @@ oLoop = None if __name__ == '__main__': - DBusGMainLoop(set_as_default=True) - oSessionBus = dbus.SessionBus() - if isRunning(): + DBusGMainLoop(set_as_default=True) + oSessionBus = dbus.SessionBus() + try: oSession = oSessionBus.get_object('org.ayatana.webmail', '/org/ayatana/webmail') @@ -29,12 +28,14 @@ if __name__ == '__main__': oLoop = GLib.MainLoop() oLoop.run() + sys.exit(0) except dbus.DBusException as oDBusException: print(oDBusException) - sys.exit(1) - sys.exit(0) + else: + + print("Cannot start ayatana-webmail-clear - Ayatana Webmail is not running.") sys.exit(1) -- cgit v1.2.3