[Bug 217642] New: dragon player break screensaver preferences

[Nicolas Lécureuil]

https://bugs.kde.org/show_bug.cgi?id=217642

           Summary: dragon player break screensaver preferences
           Product: dragonplayer
           Version: unspecified
          Platform: Compiled Sources
        OS/Version: unspecified
            Status: NEW
          Severity: normal
          Priority: NOR
         Component: general
        AssignedTo: unassigned-bugs at kde.org
        ReportedBy: nlecureuil at mandriva.com


Version:            (using Devel)
Installed from:    Compiled sources

dragonplayer should inhibit and restart screensavers only if they are activated
on the system.

Can i commit this patch ?

Index: dragonplayer/src/app/stateChange.cpp                                     
===================================================================             
--- dragonplayer/src/app/stateChange.cpp        (révision 1059506)              
+++ dragonplayer/src/app/stateChange.cpp        (copie de travail)              
@@ -118,37 +118,44 @@                                                           
     }                                                                          
     kDebug() << "updated menus";                                               

-    /// turn off screensaver                                                   
-    if( state == Phonon::PlayingState )                                        
+    KConfigGroup config(KSharedConfig::openConfig("kscreensaverrc"),
"ScreenSaver");
+    bool  haveScreensaver = config.readEntry("Enabled", true);                 
+                                                                               
+                                                                               
+    if (haveScreensaver)                                                       
     {                                                                          
-      m_stopSleepCookie =
Solid::PowerManagement::beginSuppressingSleep("DragonPlayer: watching a film");
+      /// turn off screensaver                                                 
+      if( state == Phonon::PlayingState )                                      
+      {                                                                        
+        m_stopSleepCookie =
Solid::PowerManagement::beginSuppressingSleep("DragonPlayer: watching a film");

-      QDBusInterface screensaver("org.freedesktop.ScreenSaver",
"/ScreenSaver", "org.freedesktop.ScreenSaver");
-      QDBusReply<int> screensaverRc =
screensaver.call("Inhibit","dragonplayer","Watching a film");            
-      if (screensaverRc.isValid())                                             
+        QDBusInterface screensaver("org.freedesktop.ScreenSaver",
"/ScreenSaver", "org.freedesktop.ScreenSaver");
+        QDBusReply<int> screensaverRc =
screensaver.call("Inhibit","dragonplayer","Watching a film");            
+        if (screensaverRc.isValid())                                           
+        {                                                                      
+          m_screensaverDisableCookie = screensaverRc.value();                  
+        }                                                                      
+        if (!m_stopScreenSaver)                                                
+          m_stopScreenSaver = new
KNotificationRestrictions(KNotificationRestrictions::ScreenSaver);
+      }
+      else if( Phonon::StoppedState || !TheStream::hasMedia() )
       {
-         m_screensaverDisableCookie = screensaverRc.value();
-      }
-      if (!m_stopScreenSaver)
-          m_stopScreenSaver = new
KNotificationRestrictions(KNotificationRestrictions::ScreenSaver);
-    }
-    else if( Phonon::StoppedState || !TheStream::hasMedia() )
-    {
-      //stop supressing sleep
-      Solid::PowerManagement::stopSuppressingSleep(m_stopSleepCookie);
+        //stop supressing sleep
+        Solid::PowerManagement::stopSuppressingSleep(m_stopSleepCookie);

-     //stop disabling screensaver
-      if (m_screensaverDisableCookie != 0)
-      {
-        QDBusInterface screensaver("org.freedesktop.ScreenSaver",
"/ScreenSaver", "org.freedesktop.ScreenSaver");
-        screensaver.call("Uninhibit",m_screensaverDisableCookie);
-        m_screensaverDisableCookie = 0;
+        //stop disabling screensaver
+        if (m_screensaverDisableCookie != 0)
+        {
+
+          QDBusInterface screensaver("org.freedesktop.ScreenSaver",
"/ScreenSaver", "org.freedesktop.ScreenSaver");
+          screensaver.call("Uninhibit",m_screensaverDisableCookie);
+          m_screensaverDisableCookie = 0;
+        }
+
+        delete m_stopScreenSaver;
+        m_stopScreenSaver = 0;
       }
-
-      delete m_stopScreenSaver;
-      m_stopScreenSaver = 0;
     }
-
     updateTitleBarText();

     // enable/disable DVD specific buttons

-- 
Configure bugmail: https://bugs.kde.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.