Merge branch 'release-1.2' into dev
This commit is contained in:
		
						commit
						93bf628ca5
					
				@ -6,7 +6,7 @@ case "$1" in
 | 
				
			|||||||
  "locked")
 | 
					  "locked")
 | 
				
			||||||
    # Read timeout from KDE
 | 
					    # Read timeout from KDE
 | 
				
			||||||
    SCREENSAVER_TIMEOUT=$(kreadconfig5 --file powermanagementprofilesrc --group AC --group DPMSControl --key idleTime_screenSaver)
 | 
					    SCREENSAVER_TIMEOUT=$(kreadconfig5 --file powermanagementprofilesrc --group AC --group DPMSControl --key idleTime_screenSaver)
 | 
				
			||||||
    TIMEOUT="${NORMAL_TIMEOUT:-$SCREENSAVER_TIMEOUT_DEFAULT}"
 | 
					    TIMEOUT="${SCREENSAVER_TIMEOUT:-$SCREENSAVER_TIMEOUT_DEFAULT}"
 | 
				
			||||||
    ;;
 | 
					    ;;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  "unlocked")
 | 
					  "unlocked")
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user