/pidgin/main: 29d788c72350: Style: fix gg braces (part 1)
Tomasz Wasilczyk
twasilczyk at pidgin.im
Mon Feb 3 18:30:57 EST 2014
Changeset: 29d788c72350198c0b5b1bd3d4da4760631c65e3
Author: Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date: 2014-02-04 00:30 +0100
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/29d788c72350
Description:
Style: fix gg braces (part 1)
diffstat:
libpurple/protocols/gg/account.c | 31 +++------
libpurple/protocols/gg/avatar.c | 34 +++-------
libpurple/protocols/gg/blist.c | 9 +-
libpurple/protocols/gg/chat.c | 103 ++++++++++---------------------
libpurple/protocols/gg/deprecated.c | 3 +-
libpurple/protocols/gg/edisc.c | 6 +-
libpurple/protocols/gg/gg.c | 32 ++++-----
libpurple/protocols/gg/html.c | 12 +--
libpurple/protocols/gg/image.c | 46 +++++--------
libpurple/protocols/gg/libgadu-events.c | 12 +--
libpurple/protocols/gg/libgaduw.c | 18 ++---
11 files changed, 111 insertions(+), 195 deletions(-)
diffs (truncated from 948 to 300 lines):
diff --git a/libpurple/protocols/gg/account.c b/libpurple/protocols/gg/account.c
--- a/libpurple/protocols/gg/account.c
+++ b/libpurple/protocols/gg/account.c
@@ -72,16 +72,14 @@ void ggp_account_token_request(PurpleCon
purple_debug_info("gg", "ggp_account_token_request: "
"requesting token...\n");
- if (!ggp_deprecated_setup_proxy(gc))
- {
+ if (!ggp_deprecated_setup_proxy(gc)) {
callback(gc, NULL, user_data);
return;
}
h = gg_token(TRUE);
- if (!h)
- {
+ if (!h) {
callback(gc, NULL, user_data);
return;
}
@@ -106,8 +104,7 @@ static void ggp_account_token_response(s
if (cancelled)
purple_debug_info("gg", "ggp_account_token_handler: "
"cancelled\n");
- else if (success)
- {
+ else if (success) {
purple_debug_info("gg", "ggp_account_token_handler: "
"got token\n");
@@ -118,9 +115,7 @@ static void ggp_account_token_response(s
token->size = h->body_size;
token->data = g_memdup(h->body, token->size);
token->length = token_info->length;
- }
- else
- {
+ } else {
purple_debug_error("gg", "ggp_account_token_handler: error\n");
purple_notify_error(
purple_connection_get_account(reqdata->gc),
@@ -200,8 +195,7 @@ static void ggp_account_register_dialog(
purple_debug_info("gg", "ggp_account_register_dialog(%p, %p, %p)\n",
gc, token, _register_data);
- if (!token)
- {
+ if (!token) {
ggp_account_register_completed(register_data, FALSE);
return;
}
@@ -333,15 +327,13 @@ static void ggp_account_register_respons
g_assert(!(success && cancelled));
- if (cancelled)
- {
+ if (cancelled) {
purple_debug_info("gg", "ggp_account_register_response: "
"cancelled\n");
ggp_account_register_completed(register_data, FALSE);
return;
}
- if (!success || !register_result->success)
- {
+ if (!success || !register_result->success) {
/* TODO (libgadu 1.12.x): check register_result->error */
purple_debug_error("gg", "ggp_account_register_response: "
"error\n");
@@ -457,8 +449,7 @@ static void ggp_account_chpass_dialog(Pu
purple_debug_info("gg", "ggp_account_chpass_dialog(%p, %p, %p)\n",
gc, token, _chpass_data);
- if (!token)
- {
+ if (!token) {
ggp_account_chpass_data_free(chpass_data);
return;
}
@@ -618,15 +609,13 @@ static void ggp_account_chpass_response(
g_assert(!(success && cancelled));
- if (cancelled)
- {
+ if (cancelled) {
purple_debug_info("gg", "ggp_account_chpass_response: "
"cancelled\n");
ggp_account_chpass_data_free(chpass_data);
return;
}
- if (!success || !chpass_result->success)
- {
+ if (!success || !chpass_result->success) {
/* TODO (libgadu 1.12.x): check chpass_result->error */
purple_debug_error("gg", "ggp_account_chpass_response: "
"error\n");
diff --git a/libpurple/protocols/gg/avatar.c b/libpurple/protocols/gg/avatar.c
--- a/libpurple/protocols/gg/avatar.c
+++ b/libpurple/protocols/gg/avatar.c
@@ -99,8 +99,7 @@ void ggp_avatar_cleanup(PurpleConnection
purple_timeout_remove(avdata->timer);
- if (avdata->current_update != NULL)
- {
+ if (avdata->current_update != NULL) {
ggp_avatar_buddy_update_req *current_update =
avdata->current_update;
@@ -130,8 +129,7 @@ static gboolean ggp_avatar_timer_cb(gpoi
g_return_val_if_fail(PURPLE_CONNECTION_IS_VALID(gc), FALSE);
avdata = ggp_avatar_get_avdata(gc);
- if (avdata->current_update != NULL)
- {
+ if (avdata->current_update != NULL) {
if (purple_debug_is_verbose()) {
purple_debug_misc("gg", "ggp_avatar_timer_cb(%p): "
"there is already an update running\n", gc);
@@ -198,8 +196,7 @@ static gboolean ggp_avatar_buddy_update_
pending_update);
buddy = purple_blist_find_buddy(account, ggp_uin_to_str(pending_update->uin));
- if (!buddy)
- {
+ if (!buddy) {
if (ggp_str_to_uin(purple_account_get_username(account)) ==
pending_update->uin)
{
@@ -207,9 +204,7 @@ static gboolean ggp_avatar_buddy_update_
"ggp_avatar_buddy_update_next(%p): own "
"avatar update requested, but we don't have "
"ourselves on buddy list\n", gc);
- }
- else
- {
+ } else {
purple_debug_warning("gg",
"ggp_avatar_buddy_update_next(%p): "
"%u update requested, but he's not on buddy "
@@ -221,8 +216,7 @@ static gboolean ggp_avatar_buddy_update_
old_timestamp_str = purple_buddy_icons_get_checksum_for_user(buddy);
old_timestamp = old_timestamp_str ? g_ascii_strtoull(
old_timestamp_str, NULL, 10) : 0;
- if (old_timestamp == pending_update->timestamp)
- {
+ if (old_timestamp == pending_update->timestamp) {
if (purple_debug_is_verbose()) {
purple_debug_misc("gg",
"ggp_avatar_buddy_update_next(%p): "
@@ -231,8 +225,7 @@ static gboolean ggp_avatar_buddy_update_
}
return FALSE;
}
- if (old_timestamp > pending_update->timestamp)
- {
+ if (old_timestamp > pending_update->timestamp) {
purple_debug_warning("gg",
"ggp_avatar_buddy_update_next(%p): "
"saved timestamp for %u is newer than received "
@@ -272,8 +265,7 @@ static void ggp_avatar_buddy_update_rece
const gchar *got_data;
size_t got_len;
- if (!PURPLE_CONNECTION_IS_VALID(gc))
- {
+ if (!PURPLE_CONNECTION_IS_VALID(gc)) {
g_free(pending_update);
return;
}
@@ -282,8 +274,7 @@ static void ggp_avatar_buddy_update_rece
g_assert(pending_update == avdata->current_update);
avdata->current_update = NULL;
- if (!purple_http_response_is_successful(response))
- {
+ if (!purple_http_response_is_successful(response)) {
purple_debug_error("gg", "ggp_avatar_buddy_update_received: bad"
" response while getting avatar for %u: %s\n",
pending_update->uin,
@@ -295,8 +286,7 @@ static void ggp_avatar_buddy_update_rece
account = purple_connection_get_account(gc);
buddy = purple_blist_find_buddy(account, ggp_uin_to_str(pending_update->uin));
- if (!buddy)
- {
+ if (!buddy) {
purple_debug_warning("gg", "ggp_avatar_buddy_update_received: "
"buddy %u disappeared\n", pending_update->uin);
g_free(pending_update);
@@ -338,8 +328,7 @@ void ggp_avatar_own_set(PurpleConnection
own_data = ggp_avatar_get_avdata(gc)->own_data;
- if (img == NULL)
- {
+ if (img == NULL) {
purple_debug_warning("gg", "ggp_avatar_own_set: avatar removing"
" is probably not possible within old protocol");
return;
@@ -359,8 +348,7 @@ static void ggp_avatar_own_got_token(Pur
PurpleAccount *account = purple_connection_get_account(gc);
uin_t uin = ggp_str_to_uin(purple_account_get_username(account));
- if (img != own_data->img)
- {
+ if (img != own_data->img) {
purple_debug_warning("gg", "ggp_avatar_own_got_token: "
"avatar was changed in meantime\n");
return;
diff --git a/libpurple/protocols/gg/blist.c b/libpurple/protocols/gg/blist.c
--- a/libpurple/protocols/gg/blist.c
+++ b/libpurple/protocols/gg/blist.c
@@ -63,7 +63,7 @@ void ggp_buddylist_send(PurpleConnection
userlist[i] = ggp_str_to_uin(name);
types[i] = GG_USER_NORMAL;
purple_debug_info("gg", "ggp_buddylist_send: adding %d\n",
- userlist[i]);
+ userlist[i]);
}
ret = gg_notify_ex(info->session, userlist, types, size);
@@ -136,8 +136,8 @@ void ggp_buddylist_load(PurpleConnection
g_strfreev(group_tbl);
}
- buddy = purple_buddy_new(purple_connection_get_account(gc), name,
- strlen(show) ? show : NULL);
+ buddy = purple_buddy_new(purple_connection_get_account(gc),
+ name, strlen(show) ? show : NULL);
if (!(group = purple_blist_find_group(g))) {
group = purple_group_new(g);
@@ -164,7 +164,8 @@ char *ggp_buddylist_dump(PurpleAccount *
char *ptr;
for (buddies = purple_blist_find_buddies(account, NULL); buddies;
- buddies = g_slist_delete_link(buddies, buddies)) {
+ buddies = g_slist_delete_link(buddies, buddies))
+ {
PurpleBuddy *buddy = buddies->data;
PurpleGroup *group = purple_buddy_get_group(buddy);
const char *bname = purple_buddy_get_name(buddy);
diff --git a/libpurple/protocols/gg/chat.c b/libpurple/protocols/gg/chat.c
--- a/libpurple/protocols/gg/chat.c
+++ b/libpurple/protocols/gg/chat.c
@@ -130,9 +130,10 @@ static ggp_chat_local_info * ggp_chat_ge
ggp_chat_session_data *sdata = ggp_chat_get_sdata(gc);
int i;
- for (i = 0; i < sdata->chats_count; i++)
+ for (i = 0; i < sdata->chats_count; i++) {
if (sdata->chats[i].id == id)
return &sdata->chats[i];
+ }
return NULL;
}
@@ -146,8 +147,7 @@ static void ggp_chat_open_conv(ggp_chat_
chat->conv = serv_got_joined_chat(chat->gc, chat->local_id,
ggp_chat_get_name_from_id(chat->id));
- if (chat->previously_joined)
- {
+ if (chat->previously_joined) {
purple_conversation_write(PURPLE_CONVERSATION(chat->conv), NULL,
_("You have re-joined the chat"), PURPLE_MESSAGE_SYSTEM,
time(NULL));
@@ -155,10 +155,11 @@ static void ggp_chat_open_conv(ggp_chat_
chat->previously_joined = TRUE;
purple_chat_conversation_clear_users(chat->conv);
- for (i = 0; i < chat->participants_count; i++)
+ for (i = 0; i < chat->participants_count; i++) {
purple_chat_conversation_add_user(chat->conv,
ggp_uin_to_str(chat->participants[i]), NULL,
PURPLE_CHAT_USER_NONE, FALSE);
+ }
}
static ggp_chat_local_info * ggp_chat_get_local(PurpleConnection *gc,
@@ -167,9 +168,10 @@ static ggp_chat_local_info * ggp_chat_ge
ggp_chat_session_data *sdata = ggp_chat_get_sdata(gc);
int i;
- for (i = 0; i < sdata->chats_count; i++)
+ for (i = 0; i < sdata->chats_count; i++) {
if (sdata->chats[i].local_id == local_id)
return &sdata->chats[i];
+ }
return NULL;
}
@@ -180,33 +182,26 @@ void ggp_chat_got_event(PurpleConnection
ggp_chat_local_info *chat;
uint32_t i;
More information about the Commits
mailing list