Mercurial > pidgin.yaz
changeset 23730:5aba1f0f36b0
Fix up some whitespace problems.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Tue, 05 Aug 2008 02:55:24 +0000 |
parents | d88fd0d9cb57 |
children | 59f8890ae8cf |
files | libpurple/protocols/msn/msn.c |
diffstat | 1 files changed, 22 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/msn.c Mon Aug 04 03:46:33 2008 +0000 +++ b/libpurple/protocols/msn/msn.c Tue Aug 05 02:55:24 2008 +0000 @@ -490,23 +490,19 @@ void msn_send_privacy(PurpleConnection *gc) { - PurpleAccount *account; - MsnSession *session; - MsnCmdProc *cmdproc; - - account = purple_connection_get_account(gc); - session = gc->proto_data; - cmdproc = session->notification->cmdproc; - - if (account->perm_deny == PURPLE_PRIVACY_ALLOW_ALL || - account->perm_deny == PURPLE_PRIVACY_DENY_USERS) - { - msn_cmdproc_send(cmdproc, "BLP", "%s", "AL"); - } - else - { - msn_cmdproc_send(cmdproc, "BLP", "%s", "BL"); - } + PurpleAccount *account; + MsnSession *session; + MsnCmdProc *cmdproc; + + account = purple_connection_get_account(gc); + session = gc->proto_data; + cmdproc = session->notification->cmdproc; + + if (account->perm_deny == PURPLE_PRIVACY_ALLOW_ALL || + account->perm_deny == PURPLE_PRIVACY_DENY_USERS) + msn_cmdproc_send(cmdproc, "BLP", "%s", "AL"); + else + msn_cmdproc_send(cmdproc, "BLP", "%s", "BL"); } static void @@ -955,7 +951,7 @@ if (!purple_ssl_is_supported()) { - purple_connection_error_reason (gc, + purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT, _("SSL support is needed for MSN. Please install a supported " "SSL library.")); @@ -986,7 +982,7 @@ purple_account_set_username(account, username); if (!msn_session_connect(session, host, port, http_method)) - purple_connection_error_reason (gc, + purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Failed to connect to server.")); } @@ -1119,7 +1115,7 @@ char *msgtext; const char *username; - purple_debug_info("msn", "send IM {%s} to %s\n",message,who); + purple_debug_info("msn", "send IM {%s} to %s\n", message, who); account = purple_connection_get_account(gc); username = purple_account_get_username(account); @@ -1137,9 +1133,9 @@ } msn_import_html(message, &msgformat, &msgtext); - if (msn_user_is_online(account, who)|| + if (msn_user_is_online(account, who) || msn_user_is_yahoo(account, who) || - swboard != NULL){ + swboard != NULL) { /*User online or have a swboard open because it's invisible * and sent us a message,then send Online Instant Message*/ @@ -1165,11 +1161,11 @@ GSList *smileys; GString *emoticons = NULL; - if(msn_user_is_yahoo(account,who)){ + if (msn_user_is_yahoo(account, who)) { /*we send the online and offline Message to Yahoo User via UBM*/ purple_debug_info("msn", "send to Yahoo User\n"); - uum_send_msg(session,msg); - }else{ + uum_send_msg(session, msg); + } else { purple_debug_info("msn", "send via switchboard\n"); swboard = msn_session_get_swboard(session, who, MSN_SB_FLAG_IM); smileys = msn_msg_grab_emoticons(message, username); @@ -1817,7 +1813,7 @@ { p += strlen(PHOTO_URL); } - if (p && (strncmp(p, "http://",strlen("http://")) == 0) && ((q = strchr(p, '"')) != NULL)) + if (p && (strncmp(p, "http://", strlen("http://")) == 0) && ((q = strchr(p, '"')) != NULL)) return g_strndup(p, q - p); return NULL;