[mythtv-commits] mythtv branch master updated by stuarta. v0.28-pre-2869-g8ea5911

[Git Repo Owner]

The branch, master has been updated on the
mythtv repository by gitolite user stuarta.
       via  8ea5911f066fe406deeddb8ba92b629be4f47cd1 (commit)
       via  e731ebc0d31d20afa29a95a3934be0149c2e0383 (commit)
      from  348ed663810ffa6860f380733a677e0aa6d729d1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8ea5911f066fe406deeddb8ba92b629be4f47cd1
Author:    Stuart Auchterlonie <stuarta at squashedfrog.net> at Fri, 1 May 2015 18:09:57 +0100
Committer: Stuart Auchterlonie <stuarta at squashedfrog.net> at Fri, 1 May 2015 18:09:57 +0100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=8ea5911f066fe406deeddb8ba92b629be4f47cd1

Re-Enable screensaver-x11 after the dbus screensaver support was added.
This now utilizes the dbus screensaver first, and then the previously
existing screensaver methods. This should resolve the issues seen by
those using only DPMS or xscreensaver.

Fixes #12438
Refs #12414



commit e731ebc0d31d20afa29a95a3934be0149c2e0383
Author:    Stuart Auchterlonie <stuarta at squashedfrog.net> at Fri, 1 May 2015 18:09:30 +0100
Committer: Stuart Auchterlonie <stuarta at squashedfrog.net> at Fri, 1 May 2015 18:09:30 +0100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=e731ebc0d31d20afa29a95a3934be0149c2e0383

Move failure to connect to the different dbus services to LOG_WARNING level #2
    Refs #12438
    Refs #12414



-----------------------------------------------------------------------

Summary of changes:
 mythtv/libs/libmythui/screensaver-dbus.cpp |    2 +-
 mythtv/libs/libmythui/screensaver.cpp      |   55 +++++++++++++++++++---------
 mythtv/libs/libmythui/screensaver.h        |    3 ++
 3 files changed, 42 insertions(+), 18 deletions(-)

--