misc/nameservers

@@ -0,0 +1 @@
+toxme.io 1A39E7A5D5FA9CF155C751570A32E625698A60A55F6D88028F949F66144F4F25

src/groupchats.c

@@ -1679,15 +1679,7 @@ static void groupchat_onDraw(ToxWindow *self, Tox *m)
         wattron(ctx->sidebar, A_BOLD);
 
         pthread_mutex_lock(&Winthread.lock);
-
-        if (chat->num_peers > 1) {
-            wprintw(ctx->sidebar, "Peers: %d\n", chat->num_peers);
-        } else if (tox_group_is_connected(m, self->num, NULL)) {
-            wprintw(ctx->sidebar, "Connecting...\n");
-        } else {
-            wprintw(ctx->sidebar, "Disconnected\n");
-        }
-
+        wprintw(ctx->sidebar, "Peers: %d\n", chat->num_peers);
         pthread_mutex_unlock(&Winthread.lock);
 
         wattroff(ctx->sidebar, A_BOLD);

src/help.c

@@ -188,7 +188,6 @@ static void help_draw_global(ToxWindow *self)
     wprintw(win, "  /log <on> or <off>         : Enable/disable logging\n");
     wprintw(win, "  /myid                      : Print your Tox ID\n");
     wprintw(win, "  /group <name>              : Create a new group chat\n");
-    wprintw(win, "  /join <chatid>             : Join a groupchat using a Chat ID\n");
 #ifdef GAMES
     wprintw(win, "  /game                      : Play a game\n");
 #endif /* GAMES */
@@ -246,10 +245,8 @@ static void help_draw_chat(ToxWindow *self)
     wprintw(win, "Chat Commands:\n");
     wattroff(win, A_BOLD | COLOR_PAIR(RED));
 
-    wprintw(win, "  /cinvite <n>               : Invite contact to a conference \n");
-    wprintw(win, "  /cjoin                     : Join a pending conference\n");
-    wprintw(win, "  /invite <n>                : Invite contact to a groupchat \n");
-    wprintw(win, "  /gaccept <password>        : Accept a pending groupchat invite\n");
+    wprintw(win, "  /invite <n>                : Invite contact to a conference \n");
+    wprintw(win, "  /join                      : Join a pending conference\n");
     wprintw(win, "  /sendfile <path>           : Send a file\n");
     wprintw(win, "  /savefile <id>             : Receive a file\n");
     wprintw(win, "  /cancel <type> <id>        : Cancel file transfer where type: in|out\n");
@@ -438,13 +435,13 @@ void help_onKey(ToxWindow *self, wint_t key)
 #elif AUDIO
             help_init_window(self, 21, 80);
 #else
-            help_init_window(self, 13, 80);
+            help_init_window(self, 11, 80);
 #endif
             self->help->type = HELP_CHAT;
             break;
 
         case L'g':
-            height = 23;
+            height = 22;
 #ifdef VIDEO
             height += 8;
 #elif AUDIO

src/name_lookup.c

@@ -365,7 +365,7 @@ on_exit:
 void name_lookup(ToxWindow *self, Tox *m, const char *id_bin, const char *addr, const char *message)
 {
     if (t_data.disabled) {
-        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "nameservers list is empty or does not exist.");
+        line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "name lookups are disabled.");
         return;
     }