# HG changeset patch # User Mikael Berthe # Date 1193476218 -7200 # Node ID e30a9d907105e8c286ca8a5fac2f28a1d03e44ea # Parent bde2dc51c06b61c6d7eb6b16dcf6bc370342d1a6 Minor coding style adjustments diff -r bde2dc51c06b -r e30a9d907105 mcabber/src/commands.c --- a/mcabber/src/commands.c Sat Oct 27 11:10:12 2007 +0200 +++ b/mcabber/src/commands.c Sat Oct 27 11:10:18 2007 +0200 @@ -133,9 +133,10 @@ 0, &do_move); cmd_add("msay", "Send a multi-lines message to the selected buddy", COMPL_MULTILINE, 0, &do_msay); + cmd_add("otr", "Manage OTR settings", COMPL_OTR, COMPL_JID, &do_otr); + cmd_add("otrpolicy", "Manage OTR policies", COMPL_JID, COMPL_OTRPOLICY, + &do_otrpolicy); cmd_add("pgp", "Manage PGP settings", COMPL_PGP, COMPL_JID, &do_pgp); - cmd_add("otr", "Manage OTR settings", COMPL_OTR, COMPL_JID, &do_otr); - cmd_add("otrpolicy", "Manage OTR policies", COMPL_JID, COMPL_OTRPOLICY, &do_otrpolicy); cmd_add("quit", "Exit the software", 0, 0, NULL); cmd_add("rawxml", "Send a raw XML string", 0, 0, &do_rawxml); cmd_add("rename", "Rename the current buddy", 0, 0, &do_rename); @@ -705,8 +706,13 @@ } if (!strcasecmp(subcmd, "roster")) { + char *status, *wildcard, *color; char **arglist = split_arg(arg, 3, 0); - char *status = *arglist, *wildcard = to_utf8(arglist[1]), *color = arglist[2]; + + status = *arglist; + wildcard = to_utf8(arglist[1]); + color = arglist[2]; + if (status && !strcmp(status, "clear")) { // Not a color command, clear all scr_RosterClearColor(); update_roster = TRUE; @@ -1080,7 +1086,7 @@ } // Hook - if(!isroom) + if (!isroom) hk_message_out(bare_jid, rp, 0, hmsg, crypted); send_message_to_return: @@ -1117,13 +1123,13 @@ char **parlist = split_arg(*arg, 2, 1); const char *result = NULL; //Is it any good parameter? - if(parlist && *parlist) { - if(!strcmp("-n", *parlist)) { + if (parlist && *parlist) { + if (!strcmp("-n", *parlist)) { result = TMSG_NORMAL; - } else if(!strcmp("-h", *parlist)) { + } else if (!strcmp("-h", *parlist)) { result = TMSG_HEADLINE; } - if(result || (!strcmp("--", *parlist))) + if (result || (!strcmp("--", *parlist))) *arg += strlen(*arg) - (parlist[1] ? strlen(parlist[1]) : 0); } //Anything found? -> skip it @@ -1153,7 +1159,7 @@ } buddy_setflags(bud, ROSTER_FLAG_LOCK, TRUE); - if(parse_flags) + if (parse_flags) msgtype = scan_mtype(&arg); arg = to_utf8(arg); send_message(arg, NULL, msgtype); @@ -2396,7 +2402,8 @@ scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO, 0); snprintf(buffer, 4095, "Status : [%c] %s", imstatus2char[rstatus], rst_msg); - scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); + scr_WriteIncomingMessage(bjid, buffer, + 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); if (rst_time) { char tbuf[128]; @@ -2414,11 +2421,14 @@ } snprintf(buffer, 4095, "Role : %s", strrole[role]); - scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); + scr_WriteIncomingMessage(bjid, buffer, + 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); snprintf(buffer, 4095, "Affiliat.: %s", straffil[affil]); - scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); + scr_WriteIncomingMessage(bjid, buffer, + 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); snprintf(buffer, 4095, "Priority : %d", rprio); - scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); + scr_WriteIncomingMessage(bjid, buffer, + 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); scr_WriteIncomingMessage(bjid, "End of WHOIS", 0, HBB_PREFIX_INFO, 0); @@ -2475,7 +2485,8 @@ sbuf = g_string_new(""); - scr_WriteIncomingMessage(NULL, "List of MUC bookmarks:", 0, HBB_PREFIX_INFO, 0); + scr_WriteIncomingMessage(NULL, "List of MUC bookmarks:", + 0, HBB_PREFIX_INFO, 0); for (bmp = bm; bmp; bmp = g_slist_next(bmp)) { g_string_printf(sbuf, "<%s>", (char*)bmp->data); @@ -2982,7 +2993,7 @@ return; } - if(op == otr_k) + if (op == otr_k) otr_key(); else { // Allow special jid "" or "." (current buddy) @@ -3106,7 +3117,7 @@ return; } - if(!strcasecmp(fjid, "default") || !strcasecmp(fjid, "*")){ + if (!strcasecmp(fjid, "default") || !strcasecmp(fjid, "*")) { /*set default policy*/ settings_otr_setpolicy(NULL, p); free_arg_lst(paramlst); diff -r bde2dc51c06b -r e30a9d907105 mcabber/src/jab_iq.c --- a/mcabber/src/jab_iq.c Sat Oct 27 11:10:12 2007 +0200 +++ b/mcabber/src/jab_iq.c Sat Oct 27 11:10:18 2007 +0200 @@ -354,19 +354,22 @@ p = xmlnode_get_tag_data(ansqry, "name"); if (p) { buf = g_strdup_printf("Name: %s", p); - scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); + scr_WriteIncomingMessage(bjid, buf, + 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); g_free(buf); } p = xmlnode_get_tag_data(ansqry, "version"); if (p) { buf = g_strdup_printf("Version: %s", p); - scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); + scr_WriteIncomingMessage(bjid, buf, + 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); g_free(buf); } p = xmlnode_get_tag_data(ansqry, "os"); if (p) { buf = g_strdup_printf("OS: %s", p); - scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); + scr_WriteIncomingMessage(bjid, buf, + 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); g_free(buf); } return 0; @@ -419,19 +422,22 @@ p = xmlnode_get_tag_data(ansqry, "utc"); if (p) { buf = g_strdup_printf("UTC: %s", p); - scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); + scr_WriteIncomingMessage(bjid, buf, + 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); g_free(buf); } p = xmlnode_get_tag_data(ansqry, "tz"); if (p) { buf = g_strdup_printf("TZ: %s", p); - scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); + scr_WriteIncomingMessage(bjid, buf, + 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); g_free(buf); } p = xmlnode_get_tag_data(ansqry, "display"); if (p) { buf = g_strdup_printf("Time: %s", p); - scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); + scr_WriteIncomingMessage(bjid, buf, + 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); g_free(buf); } return 0; diff -r bde2dc51c06b -r e30a9d907105 mcabber/src/jabglue.c --- a/mcabber/src/jabglue.c Sat Oct 27 11:10:12 2007 +0200 +++ b/mcabber/src/jabglue.c Sat Oct 27 11:10:18 2007 +0200 @@ -1714,7 +1714,7 @@ #ifdef HAVE_LIBOTR otr_msg = otr_receive((char **)&body, bjid, &free_msg); - if(!body){ + if (!body) { g_free(bjid); return; } @@ -1748,7 +1748,7 @@ g_free(bjid); g_free(decrypted); - if(free_msg) + if (free_msg) g_free((char *)body); buddylist_build(); @@ -1770,7 +1770,7 @@ } g_free(bjid); g_free(decrypted); - if(free_msg) + if (free_msg) g_free((char *)body); } diff -r bde2dc51c06b -r e30a9d907105 mcabber/src/screen.c --- a/mcabber/src/screen.c Sat Oct 27 11:10:12 2007 +0200 +++ b/mcabber/src/screen.c Sat Oct 27 11:10:18 2007 +0200 @@ -293,7 +293,8 @@ } } //Need to redraw? - if (chatmode && ((buddy_search_jid(muc) == current_buddy) || !strcmp(muc, "*"))) + if (chatmode && + ((buddy_search_jid(muc) == current_buddy) || !strcmp(muc, "*"))) scr_UpdateBuddyWindow(); } @@ -302,8 +303,10 @@ // not used if the room is in the "preset" mode void scr_MucNickColor(const char *nick, const char *color) { - char *snick = g_strdup_printf("<%s>", nick), *mnick = g_strdup_printf("*%s ", nick); + char *snick, *mnick; bool need_update = false; + snick = g_strdup_printf("<%s>", nick); + mnick = g_strdup_printf("*%s ", nick); if (!strcmp(color, "-")) {//Remove the color if (nickcolors) { nickcolor *nc = g_hash_table_lookup(nickcolors, snick); @@ -1098,7 +1101,8 @@ wattrset(win_entry->win, get_color(color)); } - wprintw(win_entry->win, "%s", line->text+line->mucnicklen); // Display text line + // Display text line + wprintw(win_entry->win, "%s", line->text+line->mucnicklen); wclrtoeol(win_entry->win); // Return the color back @@ -1252,7 +1256,8 @@ g_free(nicktmp); } hbuf_add_line(&win_entry->bd->hbuf, text_locale, timestamp, prefix_flags, - maxX - Roster_Width - getprefixwidth(), num_history_blocks, mucnicklen); + maxX - Roster_Width - getprefixwidth(), num_history_blocks, + mucnicklen); g_free(text_locale); if (win_entry->bd->cleared) { @@ -1936,7 +1941,8 @@ roster_elt = roster_find(jidto, jidsearch, ROSTER_TYPE_USER|ROSTER_TYPE_AGENT|ROSTER_TYPE_ROOM); - scr_WriteMessage(jidto, text, 0, prefix|HBB_PREFIX_OUT|HBB_PREFIX_HLIGHT_OUT, 0); + scr_WriteMessage(jidto, text, + 0, prefix|HBB_PREFIX_OUT|HBB_PREFIX_HLIGHT_OUT, 0); // Show jidto's buffer unless the buddy is not in the buddylist if (roster_elt && g_list_position(buddylist, roster_elt->data) != -1) @@ -2945,9 +2951,9 @@ !iswalnum(get_char(prev_char(ptr_inputline, inputLine)))) i--; - for( ; - ptr_inputline > inputLine; - ptr_inputline = prev_char(ptr_inputline, inputLine)) { + for ( ; + ptr_inputline > inputLine; + ptr_inputline = prev_char(ptr_inputline, inputLine)) { if (!iswalnum(get_char(ptr_inputline))) { if (i) { ptr_inputline = next_char(ptr_inputline); diff -r bde2dc51c06b -r e30a9d907105 mcabber/src/screen.h --- a/mcabber/src/screen.h Sat Oct 27 11:10:12 2007 +0200 +++ b/mcabber/src/screen.h Sat Oct 27 11:10:18 2007 +0200 @@ -162,7 +162,8 @@ void scr_RosterUnreadMessage(int); void scr_RosterJumpAlternate(void); void scr_BufferScrollUpDown(int updown, unsigned int nblines); -bool scr_RosterColor(const char *status, const char *wildcard, const char *color); +bool scr_RosterColor(const char *status, const char *wildcard, + const char *color); void scr_RosterClearColor(void); void scr_MucColor(const char *muc, muccoltype type); void scr_MucNickColor(const char *nick, const char *color);