# HG changeset patch # User mikael # Date 1111949531 0 # Node ID 7eeda3a06b213e43a15c1d53fe8e2f297692f680 # Parent e97f323c8aa2c35ff843702c92e9c30c1f7e2ba7 [/trunk] Changeset 36 by mikael * Translations, cleanups. diff -r e97f323c8aa2 -r 7eeda3a06b21 mcabber/main.c --- a/mcabber/main.c Thu Mar 24 22:02:21 2005 +0000 +++ b/mcabber/main.c Sun Mar 27 18:52:11 2005 +0000 @@ -66,10 +66,7 @@ int main(int argc, char **argv) { - //int i; char configFile[4096]; - //char *buffer; - //char *secbuffer; char *username, *password, *resource; char *servername; char *idsession; @@ -224,12 +221,6 @@ case KEY_DC: bud_DeleteBuddy(sock); break; - case KEY_DOWN: - bud_RosterDown(); - break; - case KEY_UP: - bud_RosterUp(); - break; case KEY_RESIZE: endwin(); @@ -237,41 +228,11 @@ printf("Reinicie Cabber.\n\n\n"); exit(EXIT_FAILURE); break; - - case 'z': - case KEY_F(1): - buffer = (char *) calloc(1, 4096); - secbuffer = (char *) calloc(1, 4096); - - sprintf(secbuffer, "INS = %s ", i18n("Add contact")); - i = strlen(secbuffer); - strcpy(buffer, secbuffer); - sprintf(secbuffer, "DEL = %s ", i18n("Delete contact")); - strcat(buffer, secbuffer); - sprintf(secbuffer, "SPACE = %s ", i18n("View buddy window")); - strcat(buffer, secbuffer); - sprintf(secbuffer, "INTRO = %s ", i18n("Send message")); - strcat(buffer, secbuffer); - sprintf(secbuffer, "ESC = %s ", i18n("Exit")); - strcat(buffer, secbuffer); - - scr_CreatePopup(i18n("help"), buffer, i, 0, NULL); - free(buffer); - free(secbuffer); - break; - - case '\n': - scr_WriteMessage(sock); - break; - - case ' ': - scr_ShowBuddyWindow(); - break; } */ } if (update_roaster) { - scr_LogPrint("Update roaster"); + // scr_LogPrint("Update roaster"); bud_DrawRoster(scr_GetRosterWindow()); } } diff -r e97f323c8aa2 -r 7eeda3a06b21 mcabber/screen.c --- a/mcabber/screen.c Thu Mar 24 22:02:21 2005 +0000 +++ b/mcabber/screen.c Sun Mar 27 18:52:11 2005 +0000 @@ -307,8 +307,6 @@ keypad(inputWnd, TRUE); } - - void scr_RoolWindow(void) { } @@ -380,7 +378,7 @@ dont_show = TRUE; else if ((!force_show) && ((!currentWindow || (currentWindow != tmp)))) dont_show = TRUE; - scr_LogPrint("dont_show=%d", dont_show); + // scr_LogPrint("dont_show=%d", dont_show); if (tmp == NULL) { tmp = scr_CreatePanel(winId, 20, 0, CHAT_WIN_HEIGHT, maxX - 20, dont_show); @@ -491,11 +489,10 @@ logPanel = new_panel(logWnd); wbkgd(logWnd, COLOR_PAIR(COLOR_GENERAL)); //wattrset(logWnd, COLOR_PAIR(COLOR_GENERAL)); - wprintw(logWnd, "Here we are\n"); - scr_LogPrint("Here we are :-)"); + scr_LogPrint("Start up."); scrollok(logWnd,TRUE); - idlok(logWnd,TRUE); // XXX Necessary? + //idlok(logWnd,TRUE); // XXX Necessary? inputWnd = newwin(1, maxX, maxY-1, 0); inputPanel = new_panel(inputWnd); @@ -545,47 +542,6 @@ doupdate(); } -void scr_WriteMessage(int sock) -{ - char **submsgs; - int n, i; - char *buffer = (char *) calloc(1, 1024); - char *buffer2 = (char *) calloc(1, 1024); - buddy_entry_t *tmp = bud_SelectedInfo(); - - scr_ShowWindow(tmp->jid); - - ut_CenterMessage(i18n("write your message here"), 60, buffer2); - - scr_CreatePopup(tmp->jid, buffer2, 60, 1, buffer); - - if (strlen(buffer)) { - sprintf(buffer2, "--> %s", buffer); - - submsgs = - ut_SplitMessage(buffer2, &n, - maxX - scr_WindowHeight(rosterWnd) - 20); - for (i = 0; i < n; i++) { - if (i == 0) - scr_WriteInWindow(tmp->jid, submsgs[i], TRUE, TRUE); - else - scr_WriteInWindow(tmp->jid, submsgs[i], FALSE, TRUE); - } - - for (i = 0; i < n; i++) - free(submsgs[i]); - free(submsgs); - - move(CHAT_WIN_HEIGHT - 1, maxX - 1); - refresh(); - sprintf(buffer2, "%s@%s/%s", cfg_read("username"), - cfg_read("server"), cfg_read("resource")); - srv_sendtext(sock, tmp->jid, buffer, buffer2); - } - free(buffer); - free(buffer2); -} - int scr_Getch(void) { int ch; diff -r e97f323c8aa2 -r 7eeda3a06b21 mcabber/screen.h --- a/mcabber/screen.h Thu Mar 24 22:02:21 2005 +0000 +++ b/mcabber/screen.h Sun Mar 27 18:52:11 2005 +0000 @@ -38,7 +38,6 @@ char *returnstring); void scr_WriteInWindow(char *nombreVentana, char *texto, int TimeStamp, int force_show); -void scr_WriteMessage(int sock); void scr_WriteIncomingMessage(char *jidfrom, char *text); void scr_RoolWindow(void); void scr_ShowBuddyWindow(void); diff -r e97f323c8aa2 -r 7eeda3a06b21 mcabber/server.c --- a/mcabber/server.c Thu Mar 24 22:02:21 2005 +0000 +++ b/mcabber/server.c Sun Mar 27 18:52:11 2005 +0000 @@ -94,7 +94,7 @@ } if ((sock = sk_conn((struct sockaddr *) &name)) < 0) { - fprintf(stderr, "Cant connect to \"%s:%u\"\n", server, port); + fprintf(stderr, "Can't connect to \"%s:%u\"\n", server, port); return -1; } @@ -132,8 +132,7 @@ if (strstr(response, "error")) { /* fprintf(stderr, "Response not valid:\n%s\n\n", response); */ scr_CreatePopup("Error", - "El servidor no esta respondiendo correctamente", - 60, 0, NULL); + "Bad answer from the server", 60, 0, NULL); return NULL; } aux = response; @@ -167,10 +166,11 @@ if (strstr(response, "error")) { /* fprintf(stderr, "Response not valid:\n%s\n\n", response);*/ scr_CreatePopup("Error", - "Cuenta no creada o contraseņa incorrecta", 60, 0, + "Account doesn't exist, or bad password", 60, 0, NULL); - scr_CreatePopup("Info", "Intentando crear la cuenta...", 60, 0, NULL); + /* + scr_CreatePopup("Info", "Trying to create the account...", 60, 0, NULL); strcpy(stringtosend, "'; *p2++ = 0; //fprintf(stderr, "TAG=\"%s\"\n", mtag); } else { + scr_LogPrint("Realloc %d [%d]", i-1, n); + if (!n) + break; retval = realloc(retval, (tambuffer * i) + 1); strncat(retval, buffer, tambuffer + 1); } diff -r e97f323c8aa2 -r 7eeda3a06b21 mcabber/utils.c --- a/mcabber/utils.c Thu Mar 24 22:02:21 2005 +0000 +++ b/mcabber/utils.c Sun Mar 27 18:52:11 2005 +0000 @@ -13,7 +13,7 @@ FILE *fp = fopen("/tmp/mcabberlog", "w"); DebugEnabled = level; - fprintf(fp, "Debug inicializado...\n" + fprintf(fp, "Debugging mode started...\n" "-----------------------------------\n"); fclose(fp); }