# HG changeset patch # User Mark Doliner # Date 1268899723 0 # Node ID 855620e59e0e6b2b37d08ede4a85b684d05485f3 # Parent 80933c92c080353dde7cd54b3d98da7a1b70dfb9 Minor whitespace changes diff -r 80933c92c080 -r 855620e59e0e libpurple/protocols/oscar/oscar.c --- a/libpurple/protocols/oscar/oscar.c Thu Mar 18 08:05:29 2010 +0000 +++ b/libpurple/protocols/oscar/oscar.c Thu Mar 18 08:08:43 2010 +0000 @@ -480,7 +480,7 @@ charsetstr1 = "UTF-8"; charsetstr2 = purple_account_get_string(account, "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING); } - + purple_debug_info("oscar", "Parsing IM part, charset=0x%04hx, charsubset=0x%04hx, datalen=%" G_GSIZE_FORMAT ", choice1=%s, choice2=%s, choice3=%s\n", charset, charsubset, datalen, charsetstr1, charsetstr2, (charsetstr3 ? charsetstr3 : "")); @@ -3331,9 +3331,9 @@ /* Split at (carriage return/newline)'s, then rejoin later with BRs between. */ statusmsg = oscar_icqstatus(state); splitmsg = g_strsplit(msg, "\r\n", 0); - + user_info = purple_notify_user_info_new(); - + purple_notify_user_info_add_pair(user_info, _("UIN"), who); purple_notify_user_info_add_pair(user_info, _("Status"), statusmsg); purple_notify_user_info_add_section_break(user_info); @@ -4758,8 +4758,8 @@ img = purple_buddy_icons_find_account_icon(account); if (img) { gconstpointer data = purple_imgstore_get_data(img); - args.iconlen = purple_imgstore_get_size(img); - args.iconsum = aimutil_iconsum(data, args.iconlen); + args.iconlen = purple_imgstore_get_size(img); + args.iconsum = aimutil_iconsum(data, args.iconlen); args.iconstamp = purple_buddy_icons_get_account_icon_timestamp(account); if ((args.iconlen != bi->ico_me_len) || (args.iconsum != bi->ico_me_csum) || (args.iconstamp != bi->ico_me_time)) { @@ -5368,7 +5368,7 @@ { /* If not in server list then prune from local list */ GSList *cur, *next; GSList *buddies = purple_find_buddies(account, NULL); - + /* Buddies */ cur = NULL; @@ -6389,7 +6389,7 @@ purple_value_new(PURPLE_TYPE_STRING), NULL); status_types = g_list_prepend(status_types, type); - + type = purple_status_type_new_with_attrs(PURPLE_STATUS_AVAILABLE, OSCAR_STATUS_ID_EVIL, _("Evil"), TRUE, is_icq, FALSE, @@ -6651,23 +6651,22 @@ * window. Let the user know that we canceled the Direct IM. */ conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, name); purple_conversation_write(conv, NULL, _("You closed the connection."), - PURPLE_MESSAGE_SYSTEM, time(NULL)); - } -} - -static void oscar_get_icqxstatusmsg (PurpleBlistNode *node, gpointer ignore) + PURPLE_MESSAGE_SYSTEM, time(NULL)); + } +} + +static void oscar_get_icqxstatusmsg(PurpleBlistNode *node, gpointer ignore) { PurpleBuddy *buddy; PurpleConnection *gc; PurpleAccount *account; - - + g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node)); buddy = (PurpleBuddy *)node; gc = purple_account_get_connection(buddy->account); account = purple_connection_get_account(gc); - purple_debug_info("oscar", "Manual X-Status Get From %s to %s:\n", purple_buddy_get_name(buddy), account->username); + purple_debug_info("oscar", "Manual X-Status Get From %s to %s:\n", purple_buddy_get_name(buddy), account->username); icq_im_xstatus_request(gc->proto_data, purple_buddy_get_name(buddy)); }