diff -Nru timekpr-next-beta-0.3.0~ppa1~ubuntu1~ubuntu19.04.1/client/interface/dbus/notifications.py timekpr-next-beta-0.3.1~ppa1~ubuntu1~ubuntu19.04.1/client/interface/dbus/notifications.py --- timekpr-next-beta-0.3.0~ppa1~ubuntu1~ubuntu19.04.1/client/interface/dbus/notifications.py 2020-04-12 18:42:43.000000000 +0000 +++ timekpr-next-beta-0.3.1~ppa1~ubuntu1~ubuntu19.04.1/client/interface/dbus/notifications.py 2020-04-13 14:01:08.000000000 +0000 @@ -6,6 +6,7 @@ # import import dbus +import os from gi.repository import GLib from dbus.mainloop.glib import DBusGMainLoop @@ -104,10 +105,26 @@ # only if screensaver are ok if self._screenSaverInterface is None: # define inames (I hope "revolutionary company" won't sue me for using i in front of variable names) - iNames = ["org.freedesktop.ScreenSaver", "org.gnome.ScreenSaver"] - iPaths = ["/org/freedesktop/ScreenSaver", "/org/gnome/ScreenSaver"] + iNames = [] + iPaths = [] chosenIdx = None + # workarounds per desktop + for rDesk in cons.TK_SCR_XDGCD_OVERRIDE: + if rDesk in os.getenv("XDG_CURRENT_DESKTOP", "SUPERDESKTOP").upper(): + log.log(cons.TK_LOG_LEVEL_INFO, "INFO: using gnome screensaver dbus interface as a workaround") + # use gnome stuff + iNames.extend(["org.gnome.ScreenSaver"]) + iPaths.extend(["/org/gnome/ScreenSaver"]) + # first match is enough + break + + # if there are no workarounds add default section, the preference is freedesktop standard, the rest is added in case standard can not be used + if len(iNames) < 1: + # add default section + iNames.extend(["org.freedesktop.ScreenSaver", "org.gnome.ScreenSaver"]) + iPaths.extend(["/org/freedesktop/ScreenSaver", "/org/gnome/ScreenSaver"]) + # go through inames for idx in range(0, len(iNames)): # go through all possible interfaces diff -Nru timekpr-next-beta-0.3.0~ppa1~ubuntu1~ubuntu19.04.1/common/constants/constants.py timekpr-next-beta-0.3.1~ppa1~ubuntu1~ubuntu19.04.1/common/constants/constants.py --- timekpr-next-beta-0.3.0~ppa1~ubuntu1~ubuntu19.04.1/common/constants/constants.py 2020-04-12 18:42:43.000000000 +0000 +++ timekpr-next-beta-0.3.1~ppa1~ubuntu1~ubuntu19.04.1/common/constants/constants.py 2020-04-13 14:01:08.000000000 +0000 @@ -15,7 +15,7 @@ # ## constants ## # version (in case config is corrupt or smth like that) -TK_VERSION = "0.3.0" +TK_VERSION = "0.3.1" TK_DEV_ACTIVE = False # change this accordingly when running in DEV or PROD TK_DEV_BUS = "ses" # this sets up which bus to use for development (sys or ses) @@ -118,6 +118,9 @@ TK_CTRL_SCR_K = "scrs:key" TK_CTRL_SCR_R = "scrs:retr" +# workarounds section for use in Gnome and similar to specifically use gnome interface +TK_SCR_XDGCD_OVERRIDE = ("GNOME", "UNITY") + # DBUS performance measurement TK_DBUS_ANSWER_TIME = 3 diff -Nru timekpr-next-beta-0.3.0~ppa1~ubuntu1~ubuntu19.04.1/debian/changelog timekpr-next-beta-0.3.1~ppa1~ubuntu1~ubuntu19.04.1/debian/changelog --- timekpr-next-beta-0.3.0~ppa1~ubuntu1~ubuntu19.04.1/debian/changelog 2020-04-12 18:42:43.000000000 +0000 +++ timekpr-next-beta-0.3.1~ppa1~ubuntu1~ubuntu19.04.1/debian/changelog 2020-04-13 14:01:08.000000000 +0000 @@ -1,8 +1,14 @@ -timekpr-next-beta (0.3.0~ppa1~ubuntu1~ubuntu19.04.1) disco; urgency=low +timekpr-next-beta (0.3.1~ppa1~ubuntu1~ubuntu19.04.1) disco; urgency=low * Auto build. - -- Eduards Bezverhijs Sun, 12 Apr 2020 18:42:43 +0000 + -- Eduards Bezverhijs Mon, 13 Apr 2020 14:01:08 +0000 + +timekpr-next-beta (0.3.1~ppa1~ubuntu1) UNRELEASED; urgency=medium + + * Introduced workarounds section for screensaver dbus interface to use gnome version instead of freedesktop for Unity and Gnome itself + + -- Eduards Bezverhijs Sun, 13 Apr 2020 16:46:35 +0300 timekpr-next-beta (0.3.0~ppa1~ubuntu1) UNRELEASED; urgency=medium diff -Nru timekpr-next-beta-0.3.0~ppa1~ubuntu1~ubuntu19.04.1/debian/git-build-recipe.manifest timekpr-next-beta-0.3.1~ppa1~ubuntu1~ubuntu19.04.1/debian/git-build-recipe.manifest --- timekpr-next-beta-0.3.0~ppa1~ubuntu1~ubuntu19.04.1/debian/git-build-recipe.manifest 2020-04-12 18:42:43.000000000 +0000 +++ timekpr-next-beta-0.3.1~ppa1~ubuntu1~ubuntu19.04.1/debian/git-build-recipe.manifest 2020-04-13 14:01:08.000000000 +0000 @@ -1,2 +1,2 @@ # git-build-recipe format 0.4 deb-version {debupstream} -lp:timekpr-next git-commit:86aff9b20d8f4405dd492c1fd66471d12d275ca5 +lp:timekpr-next git-commit:f1369ab0feb5c6fb8a6242d143f0466ce168db91