--- a/libpurple/protocols/novell/nmrtf.c Tue Aug 23 04:43:01 2016 -0400 +++ b/libpurple/protocols/novell/nmrtf.c Tue Aug 23 22:03:02 2016 -0400 @@ -462,7 +462,7 @@ 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 @@ 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 @@ 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: