1 # HG changeset patch

     2 # Parent b5ea7efbf1f97502016888c5c7f463bae703c13e

     3 Fix some compiler warnings

     4 

     5 diff -r b5ea7efbf1f9 mcabber/mcabber/commands.c

     6 --- a/mcabber/mcabber/commands.c	Thu Jul 19 08:03:37 2012 +0300

     7 +++ b/mcabber/mcabber/commands.c	Thu Jul 19 08:04:52 2012 +0300

     8 @@ -1949,13 +1949,11 @@

     9        enum imstatus rstatus;

    10        const char *rst_msg;

    11        time_t rst_time;

    12 -      struct pgp_data *rpgp;

    13  

    14        rprio   = buddy_getresourceprio(bud, p_res->data);

    15        rstatus = buddy_getstatus(bud, p_res->data);

    16        rst_msg = buddy_getstatusmsg(bud, p_res->data);

    17        rst_time = buddy_getstatustime(bud, p_res->data);

    18 -      rpgp = buddy_resource_pgp(bud, p_res->data);

    19  

    20        snprintf(buffer, 4095, "Resource: [%c] (%d) %s", imstatus2char[rstatus],

    21                 rprio, (char*)p_res->data);

    22 @@ -1974,6 +1972,8 @@

    23                                   0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0);

    24        }

    25  #ifdef HAVE_GPGME

    26 +      struct pgp_data *rpgp = buddy_resource_pgp(bud, p_res->data);

    27 +

    28        if (rpgp && rpgp->sign_keyid) {

    29          snprintf(buffer, 4095, "PGP key id: %s", rpgp->sign_keyid);

    30          scr_WriteIncomingMessage(bjid, buffer,

    31 diff -r b5ea7efbf1f9 mcabber/mcabber/xmpp_helper.c

    32 --- a/mcabber/mcabber/xmpp_helper.c	Thu Jul 19 08:03:37 2012 +0300

    33 +++ b/mcabber/mcabber/xmpp_helper.c	Thu Jul 19 08:04:52 2012 +0300

    34 @@ -22,6 +22,7 @@

    35  

    36  #include <string.h>

    37  #include <stdlib.h>

    38 +#include <stdio.h>   // snprintf

    39  

    40  #include "xmpp_helper.h"

    41  #include "settings.h"