/pidgin/main: 5c9865516e99: Make some indentation more consistent.
Elliott Sales de Andrade <[email protected]> Tue, 23 Aug 2016 22:51:06 -0400
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: 5c9865516e99784fa9737faa1515a0f64f8fffa8 Author: Elliott Sales de Andrade <[email protected]> Date: 2016-08-23 22:03 -0400 Branch: default URL: https://hg.pidgin.im/pidgin/main/rev/5c9865516e99 Description: Make some indentation more consistent. Not necessarily the standard, but at least consistent within the file. This fixes some new "misleading indentation" warning in gcc. diffstat: libpurple/protocols/bonjour/jabber.c | 4 ++-- libpurple/protocols/novell/nmrtf.c | 16 ++++++++-------- libpurple/protocols/zephyr/Zinternal.c | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diffs (83 lines): diff --git a/libpurple/protocols/bonjour/jabber.c b/libpurple/protocols/bonjour/jabber.c --- a/libpurple/protocols/bonjour/jabber.c +++ b/libpurple/protocols/bonjour/jabber.c @@ -1333,8 +1333,8 @@ xep_iq_parse(PurpleXmlNode *packet, Purp if(check_if_blocked(pb)) return; - account = purple_buddy_get_account(pb); - gc = purple_account_get_connection(account); + account = purple_buddy_get_account(pb); + gc = purple_account_get_connection(account); if (purple_xmlnode_get_child(packet, "si") != NULL || purple_xmlnode_get_child(packet, "error") != NULL) xep_si_parse(gc, packet, pb); diff --git a/libpurple/protocols/novell/nmrtf.c b/libpurple/protocols/novell/nmrtf.c --- a/libpurple/protocols/novell/nmrtf.c +++ b/libpurple/protocols/novell/nmrtf.c @@ -462,7 +462,7 @@ rtf_push_state(NMRtfContext *ctx) save->chp = ctx->chp; save->rds = ctx->rds; save->ris = ctx->ris; - ctx->saved = g_slist_prepend(ctx->saved, save); + ctx->saved = g_slist_prepend(ctx->saved, save); ctx->ris = NMRTF_STATE_NORMAL; (ctx->depth)++; return NMRTF_OK; @@ -475,21 +475,21 @@ static int rtf_pop_state(NMRtfContext *ctx) { NMRtfStateSave *save_old; - GSList *link_old; + GSList *link_old; if (ctx->saved == NULL) return NMRTF_STACK_UNDERFLOW; - save_old = ctx->saved->data; + save_old = ctx->saved->data; ctx->chp = save_old->chp; ctx->rds = save_old->rds; ctx->ris = save_old->ris; (ctx->depth)--; g_free(save_old); - link_old = ctx->saved; - ctx->saved = g_slist_remove_link(ctx->saved, link_old); - g_slist_free_1(link_old); + link_old = ctx->saved; + ctx->saved = g_slist_remove_link(ctx->saved, link_old); + g_slist_free_1(link_old); return NMRTF_OK; } @@ -674,8 +674,8 @@ rtf_apply_property(NMRtfContext *ctx, NM if (ctx->rds == NMRTF_STATE_SKIP) /* If we're skipping text, */ return NMRTF_OK; /* don't do anything. */ - /* Need to flush any temporary data before a property change*/ - rtf_flush_data(ctx); + /* Need to flush any temporary data before a property change*/ + rtf_flush_data(ctx); switch (prop) { case NMRTF_PROP_FONT_IDX: diff --git a/libpurple/protocols/zephyr/Zinternal.c b/libpurple/protocols/zephyr/Zinternal.c --- a/libpurple/protocols/zephyr/Zinternal.c +++ b/libpurple/protocols/zephyr/Zinternal.c @@ -254,12 +254,12 @@ Code_t Z_ReadWait() (struct sockaddr *)&from, &from_len); if (packet_len < 0) - return (errno); + return (errno); if (!packet_len) - return (ZERR_EOF); + return (ZERR_EOF); - packet[packet_len] = '\0'; + packet[packet_len] = '\0'; /* Ignore obviously non-Zephyr packets. */ zvlen = sizeof(ZVERSIONHDR) - 1; _______________________________________________ Commits mailing list [email protected] https://pidgin.im/cgi-bin/mailman/listinfo/commits