Mercurial > pidgin
changeset 24491:4f46eb13b540
Replace spaces wth tabs in indentation and tabs with spaces in line continuations.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sun, 23 Nov 2008 08:39:39 +0000 |
| parents | 3f80f211417e |
| children | e7a419e04da0 |
| files | libpurple/protocols/irc/cmds.c libpurple/protocols/irc/dcc_send.c libpurple/protocols/irc/msgs.c libpurple/protocols/irc/parse.c |
| diffstat | 4 files changed, 23 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/irc/cmds.c Sun Nov 23 04:12:43 2008 +0000 +++ b/libpurple/protocols/irc/cmds.c Sun Nov 23 08:39:39 2008 +0000 @@ -71,7 +71,7 @@ int irc_cmd_ctcp(struct irc_conn *irc, const char *cmd, const char *target, const char **args) { /* we have defined args as args[0] is target and args[1] is ctcp command */ - char *buf; + char *buf; GString *string; /* check if we have args */ @@ -141,11 +141,11 @@ action[strlen(action) - 1] = '\0'; if (purple_conversation_get_type(convo) == PURPLE_CONV_TYPE_CHAT) serv_got_chat_in(gc, purple_conv_chat_get_id(PURPLE_CONV_CHAT(convo)), - purple_connection_get_display_name(gc), - 0, action, time(NULL)); + purple_connection_get_display_name(gc), + 0, action, time(NULL)); else purple_conv_im_write(PURPLE_CONV_IM(convo), purple_connection_get_display_name(gc), - action, 0, time(NULL)); + action, 0, time(NULL)); g_free(action); } @@ -156,7 +156,6 @@ { char *buf; - if (!args || !args[0]) return 0;
--- a/libpurple/protocols/irc/dcc_send.c Sun Nov 23 04:12:43 2008 +0000 +++ b/libpurple/protocols/irc/dcc_send.c Sun Nov 23 08:39:39 2008 +0000 @@ -302,7 +302,7 @@ if (sock < 0) { purple_notify_error(gc, NULL, _("File Transfer Failed"), - _("Could not open a listening port.")); + _("Could not open a listening port.")); purple_xfer_cancel_local(xfer); return; } @@ -313,14 +313,14 @@ purple_debug_misc("irc", "port is %hu\n", port); /* Monitor the listening socket */ xfer->watcher = purple_input_add(sock, PURPLE_INPUT_READ, - irc_dccsend_send_connected, xfer); + irc_dccsend_send_connected, xfer); /* Send the intended recipient the DCC request */ arg[0] = xfer->who; inet_aton(purple_network_get_my_ip(irc->fd), &addr); arg[1] = tmp = g_strdup_printf("\001DCC SEND \"%s\" %u %hu %" G_GSIZE_FORMAT "\001", - xfer->filename, ntohl(addr.s_addr), - port, xfer->size); + xfer->filename, ntohl(addr.s_addr), + port, xfer->size); irc_cmd_privmsg(gc->proto_data, "msg", NULL, arg); g_free(tmp); @@ -343,7 +343,7 @@ if (xd->listen_data == NULL) { purple_xfer_unref(xfer); purple_notify_error(gc, NULL, _("File Transfer Failed"), - _("Could not open a listening port.")); + _("Could not open a listening port.")); purple_xfer_cancel_local(xfer); }
--- a/libpurple/protocols/irc/msgs.c Sun Nov 23 04:12:43 2008 +0000 +++ b/libpurple/protocols/irc/msgs.c Sun Nov 23 08:39:39 2008 +0000 @@ -123,10 +123,10 @@ void irc_msg_default(struct irc_conn *irc, const char *name, const char *from, char **args) { char *clean; - /* This, too, should be escaped somehow (smarter) */ - clean = purple_utf8_salvage(args[0]); + /* This, too, should be escaped somehow (smarter) */ + clean = purple_utf8_salvage(args[0]); purple_debug(PURPLE_DEBUG_INFO, "irc", "Unrecognized message: %s\n", clean); - g_free(clean); + g_free(clean); } void irc_msg_features(struct irc_conn *irc, const char *name, const char *from, char **args) @@ -814,8 +814,8 @@ purple_conversation_set_data(convo, IRC_NAMES_FLAG, GINT_TO_POINTER(FALSE)); /* Until purple_conversation_present does something that - * one would expect in Pidgin, this call produces buggy - * behavior both for the /join and auto-join cases. */ + * one would expect in Pidgin, this call produces buggy + * behavior both for the /join and auto-join cases. */ /* purple_conversation_present(convo); */ return; } @@ -1043,7 +1043,7 @@ return; /* Undernet likes to :-quote the channel name, for no good reason - * that I can see. This catches that. */ + * that I can see. This catches that. */ channel = (args[0][0] == ':') ? &args[0][1] : args[0]; convo = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, channel, irc->account); @@ -1056,8 +1056,8 @@ if (!purple_utf8_strcasecmp(nick, purple_connection_get_display_name(gc))) { char *escaped = g_markup_escape_text(args[1], -1); msg = g_strdup_printf(_("You have parted the channel%s%s"), - (args[1] && *args[1]) ? ": " : "", - (escaped && *escaped) ? escaped : ""); + (args[1] && *args[1]) ? ": " : "", + (escaped && *escaped) ? escaped : ""); g_free(escaped); purple_conv_chat_write(PURPLE_CONV_CHAT(convo), channel, msg, PURPLE_MESSAGE_SYSTEM, time(NULL)); g_free(msg); @@ -1168,7 +1168,7 @@ serv_got_chat_in(gc, purple_conv_chat_get_id(PURPLE_CONV_CHAT(convo)), nick, 0, msg, time(NULL)); else purple_debug_error("irc", "Got a %s on %s, which does not exist\n", - notice ? "NOTICE" : "PRIVMSG", to); + notice ? "NOTICE" : "PRIVMSG", to); } g_free(msg); g_free(nick);
--- a/libpurple/protocols/irc/parse.c Sun Nov 23 04:12:43 2008 +0000 +++ b/libpurple/protocols/irc/parse.c Sun Nov 23 08:39:39 2008 +0000 @@ -494,7 +494,7 @@ } } result[j] = '\0'; - return result; + return result; } const char *irc_nick_skip_mode(struct irc_conn *irc, const char *nick) @@ -732,9 +732,9 @@ static void irc_parse_error_cb(struct irc_conn *irc, char *input) { char *clean; - /* This really should be escaped somehow that you can tell what - * the junk was -- but as it is, it can crash glib. */ - clean = purple_utf8_salvage(input); + /* This really should be escaped somehow that you can tell what + * the junk was -- but as it is, it can crash glib. */ + clean = purple_utf8_salvage(input); purple_debug(PURPLE_DEBUG_WARNING, "irc", "Unrecognized string: %s\n", clean); - g_free(clean); + g_free(clean); }