diff options
| author | Diogo Sousa <diogogsousa@gmail.com> | 2013-10-08 23:59:36 +0100 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2013-10-09 21:34:02 -0400 |
| commit | 5ad955236528d3962e63ce486bcbda2ee6896a63 (patch) | |
| tree | 660321d8b6c38b47db64307c8585c826959d3c7c /src/common | |
| parent | 111a58f1ef3948d3e15c3aff5c5cbdbb7f1a4123 (diff) | |
Fix messages with server-time not showing as new activity
Added a parameter to fe_print_text() to say that the message does not represent new activity. This is used when a log from an old session is loaded. This used to be implicit whenever the timestamp was non-zero, but with server-time this no longer makes sense. Fixes issue #746.
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/fe.h | 3 | ||||
| -rw-r--r-- | src/common/text.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/common/fe.h b/src/common/fe.h index 91bf0a5b..24fde989 100644 --- a/src/common/fe.h +++ b/src/common/fe.h @@ -86,7 +86,8 @@ void fe_text_clear (struct session *sess, int lines); void fe_close_window (struct session *sess); void fe_progressbar_start (struct session *sess); void fe_progressbar_end (struct server *serv); -void fe_print_text (struct session *sess, char *text, time_t stamp); +void fe_print_text (struct session *sess, char *text, time_t stamp, + gboolean no_activity); void fe_userlist_insert (struct session *sess, struct User *newuser, int row, int sel); int fe_userlist_remove (struct session *sess, struct User *user); void fe_userlist_rehash (struct session *sess, struct User *user); diff --git a/src/common/text.c b/src/common/text.c index d18b9c1a..0b66c5fd 100644 --- a/src/common/text.c +++ b/src/common/text.c @@ -314,7 +314,7 @@ scrollback_load (session *sess) text = strip_color (text + 1, -1, STRIP_COLOR); } - fe_print_text (sess, text, stamp); + fe_print_text (sess, text, stamp, TRUE); if (prefs.hex_text_stripcolor_replay) { @@ -340,7 +340,7 @@ scrollback_load (session *sess) text = ctime (&stamp); text[24] = 0; /* get rid of the \n */ buf = g_strdup_printf ("\n*\t%s %s\n\n", _("Loaded log from"), text); - fe_print_text (sess, buf, 0); + fe_print_text (sess, buf, 0, TRUE); g_free (buf); /*EMIT_SIGNAL (XP_TE_GENMSG, sess, "*", buf, NULL, NULL, NULL, 0);*/ } @@ -895,7 +895,7 @@ PrintTextTimeStamp (session *sess, char *text, time_t timestamp) log_write (sess, text); scrollback_save (sess, text); - fe_print_text (sess, text, timestamp); + fe_print_text (sess, text, timestamp, FALSE); if (conv) g_free (conv); |