qulogic/pidgin

Merged in CMaiku/pidgin (pull request #354)

2018-05-24, Gary Kramlich
1c7ddad24701
Parents d00b918ce1903997b9da75e8
Children 0b21ea1f05d9
Merged in CMaiku/pidgin (pull request #354)

jabber: Fix assignment from incompatible pointer type warning

Approved-by: Eion Robb
Approved-by: Gary Kramlich
1 files changed, 1 insertions(+), 1 deletions(-)
  • +1 -1
    libpurple/protocols/jabber/message.c
    • --- a/libpurple/protocols/jabber/message.c Thu May 24 14:13:35 2018 -0500
    +++ b/libpurple/protocols/jabber/message.c Thu May 24 22:12:43 2018 +0000
    @@ -571,7 +571,7 @@
    JabberMessageRemoteSmileyAddData *data = NULL;
    data = g_slice_new(JabberMessageRemoteSmileyAddData);
    - data->conv = g_object_ref(G_OBJECT(conv));
    + data->conv = g_object_ref(conv);
    data->shortcut = g_strdup(shortcut);
    purple_debug_info("jabber", "smiley data is unknown, "