aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-06-23 21:45:30 +00:00
Code

Merge remote-tracking branch 'dmitry/next'

Browse Source 
Conflicts:
	src/windows.c
This commit is contained in:
James Booth 2013-01-05 01:14:18 +00:00
commit 7ae7b01e15
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/windows.c
View File

@ -208,21 +208,12 @@ ui_get_idle_time(void)
unsigned long result = info->idle;
XFree(info);
return result;
// if we couldn't get a screensaverinfo, use profanity interaction idle time
// this may occur if compiled with libxss, but then run in a bare terminal
} else {
gdouble seconds_elapsed = g_timer_elapsed(ui_idle_time, NULL);
unsigned long ms_elapsed = seconds_elapsed * 1000.0;
return ms_elapsed;
}
// if not compiled with libxss, just use profanity interaction idle time
#else
// if no libxss or xss idle time failed, use profanity idle time
#endif
gdouble seconds_elapsed = g_timer_elapsed(ui_idle_time, NULL);
unsigned long ms_elapsed = seconds_elapsed * 1000.0;
return ms_elapsed;
#endif
}
void