          }
        }
  
-@@ -4808,7 +4812,7 @@ float CApplication::GetVolume(bool percentage /* = true */) const
-     // converts the hardware volume to a percentage
-     return m_volumeLevel * 100.0f;
-   }
--  
-+
-   return m_volumeLevel;
- }
- 
-@@ -5253,7 +5257,7 @@ void CApplication::CloseNetworkShares()
- #if defined(HAS_FILESYSTEM_SMB) && !defined(TARGET_WINDOWS)
-   smb.Deinit();
- #endif
--  
-+
- #ifdef HAS_FILESYSTEM_NFS
-   gNfsConnection.Deinit();
- #endif
-@@ -5287,6 +5291,6 @@ bool CApplication::NotifyActionListeners(const CAction &action) const
-     if ((*it)->OnAction(action))
-       return true;
-   }
--  
-+
-   return false;
- }
 diff --git a/xbmc/Application.h b/xbmc/Application.h
 index 6029a82..6d02f3e 100644
 --- a/xbmc/Application.h

   bool m_bEnableLegacyRes;
   bool m_bTestMode;
   bool m_bSystemScreenSaverEnable;
@@ -505,11 +516,11 @@ protected:
 #endif
 
   ReplayGainSettings m_replayGainSettings;
-  
+
   std::vector<IActionListener *> m_actionListeners;
 
   bool m_fallbackLanguageLoaded;
-  
+
 private:
   CCriticalSection                m_critSection;                 /*!< critical section for all changes to this class, except for changes to triggers */
 };
diff --git a/xbmc/guilib/GUIDialog.cpp b/xbmc/guilib/GUIDialog.cpp
index 841ced0..42aa62a 100644
--- a/xbmc/guilib/GUIDialog.cpp

   m_bEnableLegacyRes = false;
   m_bSystemScreenSaverEnable = false;
   m_pInertialScrollingHandler = new CInertialScrollingHandler();
@@ -4370,15 +4371,18 @@ bool CApplication::OnMessage(CGUIMessage& message)
 
       if (!m_pPlayer->IsPlayingVideo())
