pidgin/android/libpurple2

silc: Use appropriate datatype for SilcMessageFlags
release-2.x.y
2013-02-26, Daniel Atallah
ab26d8e3da97
Parents abc9e0edacc9
Children 23927269a23a
silc: Use appropriate datatype for SilcMessageFlags
4 files changed, 6 insertions(+), 7 deletions(-)
  • +2 -2
    libpurple/protocols/silc/chat.c
  • +2 -3
    libpurple/protocols/silc/silc.c
  • +1 -1
    libpurple/protocols/silc/silcpurple.h
  • +1 -1
    libpurple/protocols/silc/util.c
    • --- a/libpurple/protocols/silc/chat.c Tue Feb 26 20:39:20 2013 -0500
    +++ b/libpurple/protocols/silc/chat.c Tue Feb 26 21:20:25 2013 -0500
    @@ -151,7 +151,7 @@
    }
    if (channel->mode) {
    - g_string_append_printf(s, _("<br><b>Channel Modes:</b> "));
    + g_string_append(s, _("<br><b>Channel Modes:</b> "));
    silcpurple_get_chmode_string(channel->mode, tmp, sizeof(tmp));
    g_string_append(s, tmp);
    }
    @@ -1225,7 +1225,7 @@
    SilcChannelUser chu;
    SilcChannelEntry channel = NULL;
    SilcChannelPrivateKey key = NULL;
    - SilcUInt32 flags;
    + SilcMessageFlags flags;
    int ret = 0;
    char *msg2, *tmp;
    gboolean found = FALSE;
    --- a/libpurple/protocols/silc/silc.c Tue Feb 26 20:39:20 2013 -0500
    +++ b/libpurple/protocols/silc/silc.c Tue Feb 26 21:20:25 2013 -0500
    @@ -1388,8 +1388,7 @@
    /* Check for images */
    if (im->gflags & PURPLE_MESSAGE_IMAGES) {
    - list = silcpurple_image_message(im->message,
    - (SilcUInt32 *)(void *)&im->flags);
    + list = silcpurple_image_message(im->message, &im->flags);
    if (list) {
    /* Send one or more MIME message. If more than one, they
    are MIME fragments due to over large message */
    @@ -1438,7 +1437,7 @@
    SilcClientConnection conn = sg->conn;
    SilcDList clients;
    SilcClientEntry client_entry;
    - SilcUInt32 mflags;
    + SilcMessageFlags mflags;
    char *msg, *tmp;
    int ret = 0;
    gboolean sign = purple_account_get_bool(sg->account, "sign-verify", FALSE);
    --- a/libpurple/protocols/silc/silcpurple.h Tue Feb 26 20:39:20 2013 -0500
    +++ b/libpurple/protocols/silc/silcpurple.h Tue Feb 26 21:20:25 2013 -0500
    @@ -153,7 +153,7 @@
    char **tzstr, char **geostr);
    void silcpurple_buddy_set_icon(PurpleConnection *gc, PurpleStoredImage *img);
    char *silcpurple_file2mime(const char *filename);
    -SilcDList silcpurple_image_message(const char *msg, SilcUInt32 *mflags);
    +SilcDList silcpurple_image_message(const char *msg, SilcMessageFlags *mflags);
    #ifdef _WIN32
    typedef int uid_t;
    --- a/libpurple/protocols/silc/util.c Tue Feb 26 20:39:20 2013 -0500
    +++ b/libpurple/protocols/silc/util.c Tue Feb 26 21:20:25 2013 -0500
    @@ -648,7 +648,7 @@
    there are multiple images and/or text with images multipart MIME
    message is created. */
    -SilcDList silcpurple_image_message(const char *msg, SilcUInt32 *mflags)
    +SilcDList silcpurple_image_message(const char *msg, SilcMessageFlags *mflags)
    {
    SilcMime mime = NULL, p;
    SilcDList list, parts = NULL;