From 4630862924102ce508132296670c7c712bc65ee2 Mon Sep 17 00:00:00 2001 From: vvaltman Date: Fri, 9 Jan 2015 14:54:46 +0300 Subject: [PATCH] Small fixes --- Makefile.in | 7 ++++--- Makefile.tgl | 4 ++-- interface.c | 4 +++- tgl | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile.in b/Makefile.in index 84d39151..340c0697 100644 --- a/Makefile.in +++ b/Makefile.in @@ -21,9 +21,6 @@ EXE_LIST=${EXE}/telegram-cli TG_OBJECTS=${OBJ}/main.o ${OBJ}/loop.o ${OBJ}/interface.o ${OBJ}/lua-tg.o -DEPENDENCE=$(subst ${OBJ}/,${DEP}/,$(patsubst %.o,%.d,${OBJ_LIST})) -DEPENDENCE_LIST=${DEPENDENCE} - INCLUDE=-I. -I${srcdir} CC=@CC@ @@ -42,6 +39,10 @@ include ${srcdir}/Makefile.tgl ${DIR_LIST}: @test -d $@ || mkdir -p $@ +OBJ_LIST=${TG_OBJECTS} ${TGL_OBJECTS} ${TGL_COMMON_OBJECTS} ${GENERATE_OBJECTS} ${TL_PARSER_OBJECTS} +DEPENDENCE=$(subst ${OBJ}/,${DEP}/,$(patsubst %.o,%.d,${OBJ_LIST})) +DEPENDENCE_LIST=${DEPENDENCE} + -include ${DEPENDENCE_LIST} ${TG_OBJECTS}: ${OBJ}/%.o: ${srcdir}/%.c | create_dirs_and_headers diff --git a/Makefile.tgl b/Makefile.tgl index 8f11a606..adf65d07 100644 --- a/Makefile.tgl +++ b/Makefile.tgl @@ -1,4 +1,4 @@ -TGL_OBJECTS=${OBJ}/mtproto-common.o ${OBJ}/mtproto-client.o ${OBJ}/queries.o ${OBJ}/structures.o ${OBJ}/binlog.o ${OBJ}/tgl.o ${OBJ}/updates.o ${OBJ}/tgl-net.o ${OBJ}/tgl-timers.o ${OBJ}/tg-mime-types.o +TGL_OBJECTS=${OBJ}/mtproto-common.o ${OBJ}/mtproto-client.o ${OBJ}/queries.o ${OBJ}/structures.o ${OBJ}/binlog.o ${OBJ}/tgl.o ${OBJ}/updates.o ${OBJ}/tgl-net.o ${OBJ}/tgl-timers.o ${OBJ}/tg-mime-types.o ${OBJ}/mtproto-utils.o TLD_OBJECTS=${OBJ}/dump-tl-file.o GENERATE_OBJECTS=${OBJ}/generate.o TGL_COMMON_OBJECTS=${OBJ}/tools.o @@ -27,7 +27,7 @@ ${EXE}/generate: ${GENERATE_OBJECTS} ${TGL_COMMON_OBJECTS} ${AUTO}/scheme.tlo: ${AUTO}/scheme.tl ${EXE}/tl-parser ${EXE}/tl-parser -e $@ ${AUTO}/scheme.tl -${AUTO}/scheme.tl: ${srcdir}/tgl/scheme.tl ${srcdir}/tgl/encrypted_scheme.tl ${srcdir}/tgl/binlog.tl ${srcdir}/tgl/append.tl | ${AUTO} +${AUTO}/scheme.tl: ${srcdir}/tgl/scheme.tl ${srcdir}/tgl/encrypted_scheme.tl ${srcdir}/tgl/binlog.tl ${srcdir}/tgl/append.tl ${srcdir}/tgl/mtproto.tl | ${AUTO} cat $^ > $@ ${AUTO}/scheme2.tl: ${AUTO}/scheme.tl ${EXE}/tl-parser diff --git a/interface.c b/interface.c index ac0b8bca..a719c45c 100644 --- a/interface.c +++ b/interface.c @@ -1603,7 +1603,9 @@ void print_chat_info_gw (struct tgl_state *TLSR, void *extra, int success, struc void print_user_status (struct tgl_user_status *S, struct in_ev *ev) { if (S->online > 0) { - mprintf (ev, "online"); + mprintf (ev, "online (was online "); + print_date_full (ev, S->when); + mprintf (ev, ")"); } else { if (S->online == 0) { mprintf (ev, "offline"); diff --git a/tgl b/tgl index be0fb033..0205b668 160000 --- a/tgl +++ b/tgl @@ -1 +1 @@ -Subproject commit be0fb0335bf68c07202f6dd24825db65a4ea1e59 +Subproject commit 0205b668d3abcf35a348556776d1180439d115d9