# HG changeset patch # User Myhailo Danylenko # Date 1343502612 -10800 # Node ID 46a21258ad914803a8742e85dcbf813255dbe9b6 # Parent 33483d3324cff36fcf3b712c50656a9b2b9288be Fix some compiler warnings diff -r 33483d3324cf -r 46a21258ad91 mcabber/mcabber/commands.c --- a/mcabber/mcabber/commands.c Sat Jul 28 22:10:10 2012 +0300 +++ b/mcabber/mcabber/commands.c Sat Jul 28 22:10:12 2012 +0300 @@ -1949,13 +1949,11 @@ enum imstatus rstatus; const char *rst_msg; time_t rst_time; - struct pgp_data *rpgp; rprio = buddy_getresourceprio(bud, p_res->data); rstatus = buddy_getstatus(bud, p_res->data); rst_msg = buddy_getstatusmsg(bud, p_res->data); rst_time = buddy_getstatustime(bud, p_res->data); - rpgp = buddy_resource_pgp(bud, p_res->data); snprintf(buffer, 4095, "Resource: [%c] (%d) %s", imstatus2char[rstatus], rprio, (char*)p_res->data); @@ -1974,6 +1972,8 @@ 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); } #ifdef HAVE_GPGME + struct pgp_data *rpgp = buddy_resource_pgp(bud, p_res->data); + if (rpgp && rpgp->sign_keyid) { snprintf(buffer, 4095, "PGP key id: %s", rpgp->sign_keyid); scr_WriteIncomingMessage(bjid, buffer, diff -r 33483d3324cf -r 46a21258ad91 mcabber/mcabber/xmpp_helper.c --- a/mcabber/mcabber/xmpp_helper.c Sat Jul 28 22:10:10 2012 +0300 +++ b/mcabber/mcabber/xmpp_helper.c Sat Jul 28 22:10:12 2012 +0300 @@ -22,6 +22,7 @@ #include #include +#include // snprintf #include "xmpp_helper.h" #include "settings.h"