Mercurial > pidgin
diff libpurple/protocols/jabber/jabber.c @ 31086:a8cc50c2279f
Remove trailing whitespace
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Tue, 04 Jan 2011 06:55:30 +0000 |
parents | b07841f6cd15 |
children | 05c45d8f2ce3 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Tue Jan 04 06:42:45 2011 +0000 +++ b/libpurple/protocols/jabber/jabber.c Tue Jan 04 06:55:30 2011 +0000 @@ -240,7 +240,7 @@ jabber_send_raw(js, "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1); return TRUE; - } else { + } else { purple_debug_warning("jabber", "No libpurple TLS/SSL support found."); } #endif @@ -1717,8 +1717,8 @@ (PurpleUtilFetchUrlData *) js->google_relay_requests->data; purple_util_fetch_url_cancel(url_data); g_free(url_data); - js->google_relay_requests = - g_list_delete_link(js->google_relay_requests, + js->google_relay_requests = + g_list_delete_link(js->google_relay_requests, js->google_relay_requests); } } @@ -2145,9 +2145,9 @@ if (jb) { JabberBuddyResource *jbr = jabber_buddy_find_resource(jb, NULL); if (jbr) { - const gchar *client_type = + const gchar *client_type = jabber_resource_get_identity_category_type(jbr, "client"); - + if (client_type) { if (strcmp(client_type, "phone") == 0) { return "mobile"; @@ -2162,7 +2162,7 @@ } } } - + return NULL; } @@ -2312,7 +2312,7 @@ purple_notify_user_info_add_pair(user_info, _("Mood"), moodplustext); g_free(moodplustext); } else - purple_notify_user_info_add_pair(user_info, _("Mood"), + purple_notify_user_info_add_pair(user_info, _("Mood"), description ? _(description) : mood); } if (purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_TUNE)) { @@ -2376,7 +2376,7 @@ NULL); types = g_list_prepend(types, type); - + type = purple_status_type_new_with_attrs(PURPLE_STATUS_MOOD, "mood", NULL, TRUE, TRUE, TRUE, PURPLE_MOOD_NAME, _("Mood Name"), purple_value_new(PURPLE_TYPE_STRING), @@ -3138,7 +3138,7 @@ gchar *description; PurpleBuddy *buddy; const char *alias; - PurpleAttentionType *attn = + PurpleAttentionType *attn = purple_get_attention_type_from_code(conv->account, 0); if (!args || !args[0]) { @@ -3157,10 +3157,10 @@ alias = purple_buddy_get_contact_alias(buddy); else alias = who; - - description = + + description = g_strdup_printf(purple_attention_type_get_outgoing_desc(attn), alias); - purple_conversation_write(conv, NULL, description, + purple_conversation_write(conv, NULL, description, PURPLE_MESSAGE_NOTIFY | PURPLE_MESSAGE_SYSTEM, time(NULL)); g_free(description); return _jabber_send_buzz(js, who, error) ? PURPLE_CMD_RET_OK : PURPLE_CMD_RET_FAILED; @@ -3518,7 +3518,7 @@ } if (has_resources_without_caps) { - /* there is at least one resource which we don't have caps for, + /* there is at least one resource which we don't have caps for, let's assume they can receive files... */ return TRUE; } else {