Ticket #3652: screensaver-x11.cpp.2.diff

libs/libmyth/screensaver-x11.cpp

@@ -21 +21 @@
     {
         m_xscreensaverRunning =
                 (myth_system("xscreensaver-command -version >&- 2>&-") == 0);
-        if (m_xscreensaverRunning)
+        m_gscreensaverRunning =
+                (myth_system("gnome-screensaver-command --help >&- 2>&-") == 0);
+        if (m_xscreensaverRunning || m_gscreensaverRunning)
         {
             m_resetTimer = new QTimer(outer);
             QObject::connect(m_resetTimer, SIGNAL(timeout()),
@@ -58 +60 @@
         delete m_resetTimer;
     }
 
-    bool IsScreenSaverRunning() { return m_xscreensaverRunning; }
+    bool IsScreenSaverRunning() { return m_xscreensaverRunning || m_gscreensaverRunning; }
 
     bool IsDPMSEnabled() { return m_dpmsenabled; }
 
@@ -77 +79 @@
         if (m_timeoutInterval == -1)
         {
             m_timeoutInterval = gContext->GetNumSettingOnHost(
-                "xscreensaverInterval", gContext->GetHostName(), 60) * 1000;
+                "xscreensaverInterval", gContext->GetHostName(), 50) * 1000;
         }
 
         if (m_timeoutInterval > 0)
@@ -127 +129 @@
         }
     }
 
+    void ResetScreenSaver()
+    {
+        if (m_gscreensaverRunning)
+            myth_system(QString("gnome-screensaver-command --poke >&- 2>&- &")); 
+        else
+            myth_system(QString("xscreensaver-command -deactivate >&- 2>&- &")); 
+    }
+
   private:
     struct ScreenSaverState
     {
@@ -141 +151 @@
   private:
     bool m_dpmsaware;
     bool m_xscreensaverRunning;
+    bool m_gscreensaverRunning;
     BOOL m_dpmsenabled;
     bool m_dpmsdeactivated; // true if we disabled DPMS
 
@@ -222 +233 @@
 
 void ScreenSaverX11::resetSlot()
 {
-    myth_system(QString("xscreensaver-command -deactivate >&- 2>&- &"));
+    d->ResetScreenSaver();
 }