Merge github.com:vysheng/tg

README.md

@@ -5,12 +5,17 @@ Command-line interface for [Telegram](http://telegram.org). Uses readline interf
 ### API, Protocol documentation
 
 Documentation for Telegram API is available here: http://core.telegram.org/api
+
 Documentation for MTproto protocol is available here: http://core.telegram.org/mtproto
 
 ### Installation
 
 Just run `make`
 
+#### Requirements
+
+Currently only Linux OS is supported. But if you manage to launch it on OS X or other UNIX, please let me know.
+
 ### Usage
 
     ./telegram -k <public-server-key>

interface.c

@@ -64,6 +64,7 @@ char *commands[] = {
   "send_video",
   "send_text",
   "chat_info",
+  "show_license",
   0 };
 
 int commands_flags[] = {
@@ -77,6 +78,7 @@ int commands_flags[] = {
   0732,
   0732,
   074,
+  07,
 };
 
 char *a = 0;
@@ -365,6 +367,13 @@ void interpreter (char *line UU) {
     pop_color ();
     print_end ();
     printf ("\033[1K\033H");
+  } else if (!memcmp (line, "show_license", 12)) {
+    char *b = 
+#include "LICENSE.h"
+    ;
+    print_start ();
+    printf ("%s", b);
+    print_end ();
   }
 }
 

main.c

@@ -244,6 +244,13 @@ int main (int argc, char **argv) {
   signal (SIGABRT, sig_handler);
   running_for_first_time ();
 
+  printf (
+    "Telegram-client version " TG_VERSION ", Copyright (C) 2013 Vitaly Valtman\n"
+    "Telegram-client comes with ABSOLUTELY NO WARRANTY; for details type `show_license'.\n"
+    "This is free software, and you are welcome to redistribute it\n"
+    "under certain conditions; type `show_license' for details.\n"
+  );
+
   get_terminal_attributes ();
 
   args_parse (argc, argv);

net.h

@@ -27,6 +27,8 @@ struct dc;
 #define TG_APP_HASH "36722c72256a24c1225de00eb6a1ca74"
 #define TG_APP_ID 2899
 
+#define TG_VERSION "0.01-beta"
+
 #define ACK_TIMEOUT 60
 #define MAX_DC_ID 10
 

queries.c

@@ -59,7 +59,6 @@ int alarm_query (struct query *q) {
   if (verbosity) {
     logprintf ("Alarm query %lld\n", q->msg_id);
   }
-  tree_delete_query (queries_tree, q);
   q->ev.timeout = get_double_time () + QUERY_TIMEOUT;
   insert_event_timer (&q->ev);