Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 02:33:02 +01:00
Code Issues Projects Releases Wiki Activity

Merge https://github.com/irungentoo/ProjectTox-Core

Browse Source
This commit is contained in:
Sean Qureshi 2013-08-08 03:07:41 -07:00
commit 7475d4fea3
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chat.c
View File

@ -161,7 +161,7 @@ void execute(ToxWindow *self, ChatContext *ctx, char *cmd)
return; return;
} }
msg++; msg++;
m_set_userstatus(USERSTATUS_KIND_RETAIN, (uint8_t*) msg, strlen(msg)+1); m_set_statusmessage((uint8_t*) msg, strlen(msg)+1);
wprintw(ctx->history, "Status set to: %s\n", msg); wprintw(ctx->history, "Status set to: %s\n", msg);
} }

4
friendlist.c
View File

@ -20,7 +20,7 @@ extern int active_window;
typedef struct { typedef struct {
uint8_t name[MAX_NAME_LENGTH]; uint8_t name[MAX_NAME_LENGTH];
uint8_t status[MAX_USERSTATUS_LENGTH]; uint8_t status[MAX_STATUSMESSAGE_LENGTH];
int num; int num;
int chatwin; int chatwin;
} friend_t; } friend_t;
@ -74,7 +74,7 @@ void friendlist_onNickChange(ToxWindow *self, int num, uint8_t *str, uint16_t le
void friendlist_onStatusChange(ToxWindow *self, int num, uint8_t *str, uint16_t len) void friendlist_onStatusChange(ToxWindow *self, int num, uint8_t *str, uint16_t len)
{ {
if (len >= MAX_USERSTATUS_LENGTH || num >= num_friends) if (len >= MAX_STATUSMESSAGE_LENGTH || num >= num_friends)
return; return;
memcpy((char*) &friends[num].status, (char*) str, len); memcpy((char*) &friends[num].status, (char*) str, len);

20
prompt.c
View File

@ -193,27 +193,22 @@ static void execute(ToxWindow *self, char *u_cmd)
return; return;
} }
status++; status++;
USERSTATUS_KIND status_kind; USERSTATUS status_kind;
if (!strncmp(status, "online", strlen("online"))) { if (!strncmp(status, "online", strlen("online"))) {
status_kind = USERSTATUS_KIND_ONLINE; status_kind = USERSTATUS_NONE;
status_text = "ONLINE"; status_text = "ONLINE";
} }
else if (!strncmp(status, "away", strlen("away"))) { else if (!strncmp(status, "away", strlen("away"))) {
status_kind = USERSTATUS_KIND_AWAY; status_kind = USERSTATUS_AWAY;
status_text = "AWAY"; status_text = "AWAY";
} }
else if (!strncmp(status, "busy", strlen("busy"))) { else if (!strncmp(status, "busy", strlen("busy"))) {
status_kind = USERSTATUS_KIND_BUSY; status_kind = USERSTATUS_BUSY;
status_text = "BUSY"; status_text = "BUSY";
} }
else if (!strncmp(status, "offline", strlen("offline"))) {
status_kind = USERSTATUS_KIND_OFFLINE;
status_text = "OFFLINE";
}
else else
{ {
wprintw(self->window, "Invalid status.\n"); wprintw(self->window, "Invalid status.\n");
@ -222,12 +217,13 @@ static void execute(ToxWindow *self, char *u_cmd)
msg = strchr(status, ' '); msg = strchr(status, ' ');
if (msg == NULL) { if (msg == NULL) {
m_set_userstatus_kind(status_kind); m_set_userstatus(status_kind);
wprintw(self->window, "Status set to: %s\n", status_text); wprintw(self->window, "Status set to: %s\n", status_text);
} }
else { else {
msg++; msg++;
m_set_userstatus(status_kind, (uint8_t*) msg, strlen(msg)+1); m_set_userstatus(status_kind);
m_set_statusmessage((uint8_t*) msg, strlen(msg)+1);
wprintw(self->window, "Status set to: %s, %s\n", status_text, msg); wprintw(self->window, "Status set to: %s, %s\n", status_text, msg);
} }
} }
@ -239,7 +235,7 @@ static void execute(ToxWindow *self, char *u_cmd)
return; return;
} }
msg++; msg++;
m_set_userstatus(USERSTATUS_KIND_RETAIN, (uint8_t*) msg, strlen(msg)+1); m_set_statusmessage((uint8_t*) msg, strlen(msg)+1);
wprintw(self->window, "Status set to: %s\n", msg); wprintw(self->window, "Status set to: %s\n", msg);
} }