[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pidgin-commits
Subject:    /pidgin/main: e28230152c49: Merged in CMaiku/pidgin (pull reques...
From:       Gary Kramlich <grim () reaperworld ! com>
Date:       2016-09-22 4:50:06
Message-ID: hg.e28230152c49.1474519806.-874508059 () rock ! pidgin ! im
[Download RAW message or body]

Changeset: e28230152c49846f73f52589b647e42519712c8e
Author:	 Gary Kramlich <grim@reaperworld.com>
Date:	 2016-09-21 23:49 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/e28230152c49

Description:

Merged in CMaiku/pidgin (pull request #132)

queuedoutputstream: parent_class should be static to avoid conflicts

diffstat:

 libpurple/queuedoutputstream.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff --git a/libpurple/queuedoutputstream.c b/libpurple/queuedoutputstream.c
--- a/libpurple/queuedoutputstream.c
+++ b/libpurple/queuedoutputstream.c
@@ -29,7 +29,7 @@ struct _PurpleQueuedOutputStreamPrivate 
 	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), \

_______________________________________________
Commits mailing list
Commits@pidgin.im
https://pidgin.im/cgi-bin/mailman/listinfo/commits
[prev in list] [next in list] [prev in thread] [next in thread]