zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-10 12:23:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

remove GTimeVal following glib 2.61.2 deprecation

Browse source
This commit is contained in:
ailin-nemui 2019-12-06 10:56:25 +01:00
commit 1cdb4bc311
14 changed files with 74 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/fe-text/gui-readline.c
View file

@ -58,7 +58,7 @@ static int escape_next_key;
static int readtag;
static unichar prev_key;
static GTimeVal last_keypress;
static gint64 last_keypress;
static int paste_detect_time, paste_verify_line_count;
static char *paste_entry;
@ -395,8 +395,8 @@ static void insert_paste_prompt(void)
static void sig_gui_key_pressed(gpointer keyp)
{
GTimeVal now;
unichar key;
gint64 now;
unichar key;
char str[20];
int ret;
@ -407,7 +407,7 @@ static void sig_gui_key_pressed(gpointer keyp)
return;
}
g_get_current_time(&now);
now = g_get_real_time();
if (key < 32) {
/* control key */
@ -875,7 +875,7 @@ static void key_paste_start(void)
time_t get_idle_time(void)
{
return last_keypress.tv_sec;
return last_keypress / G_TIME_SPAN_SECOND;
}
static void key_scroll_backward(void)
@ -1154,8 +1154,8 @@ void gui_readline_init(void)
paste_old_prompt = NULL;
paste_timeout_id = -1;
paste_bracketed_mode = FALSE;
g_get_current_time(&last_keypress);
input_listen_init(STDIN_FILENO);
last_keypress = g_get_real_time();
input_listen_init(STDIN_FILENO);
settings_add_bool("lookandfeel", "term_appkey_mode", TRUE);
settings_add_str("history", "scroll_page_count", "/2");

6
src/fe-text/statusbar-items.c
View file

@ -333,15 +333,15 @@ static int get_lag(SERVER_REC *server, int *unknown)
return 0;
}
if (server->lag_sent.tv_sec == 0) {
if (server->lag_sent == 0) {
/* no lag queries going on currently */
return server->lag;
}
/* we're not sure about our current lag.. */
/* we're not sure about our current lag.. */
*unknown = TRUE;
lag = (long) (time(NULL)-server->lag_sent.tv_sec);
lag = (long) (time(NULL) - (server->lag_sent / G_TIME_SPAN_SECOND));
if (server->lag/1000 > lag) {
/* we've been waiting the lag reply less time than
what last known lag was -> use the last known lag */