pidgin/pidgin

Merged in CMaiku/pidgin (pull request #132)

2016-09-21, Gary Kramlich
e28230152c49
Parents 2bb56551e37e04b0e644919c
Children 87389b7f746541f47eb1aa19d56df7c18807fa7ddb1b66f1
Merged in CMaiku/pidgin (pull request #132)

queuedoutputstream: parent_class should be static to avoid conflicts
1 files changed, 1 insertions(+), 1 deletions(-)
  • +1 -1
    libpurple/queuedoutputstream.c
    • --- a/libpurple/queuedoutputstream.c Wed Sep 21 12:34:03 2016 -0500
    +++ b/libpurple/queuedoutputstream.c Wed Sep 21 23:49:50 2016 -0500
    @@ -29,7 +29,7 @@
    GBytes *next;
    };
    -GObjectClass *parent_class = NULL;
    +static GObjectClass *parent_class = NULL;
    #define PURPLE_QUEUED_OUTPUT_STREAM_GET_PRIVATE(obj) \
    (G_TYPE_INSTANCE_GET_PRIVATE((obj), \