changeset
Merged in CMaiku/pidgin (pull request #132)
Wed, 21 Sep 2016 23:49:50 -0500
- author
- Gary Kramlich <grim@reaperworld.com>
- date
- Wed, 21 Sep 2016 23:49:50 -0500
- changeset 38053
- e28230152c49
- parent 38051
- 2bb56551e37e (current diff)
- parent 38052
- 04b0e644919c (diff)
- child 38056
- 87389b7f7465
- child 38057
- 41f47eb1aa19
- child 38060
- d56df7c18807
- child 38869
- fa7ddb1b66f1
Merged in CMaiku/pidgin (pull request #132)
queuedoutputstream: parent_class should be static to avoid conflicts
--- 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), \
