Mercurial > pidgin
annotate libpurple/marshallers.list @ 26044:b04508e5cc6c
merge of 'd43b253ca7568a3f07aa77bf397fe4351db73a90'
and 'dcc53c9783aecbdde6269c4310ec4b0cf511bd9e'
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 12 Jan 2009 19:27:55 +0000 |
parents | 7d2e06b29f88 |
children | 4e1286e76f1f |
rev | line source |
---|---|
23797
e1c8ec1259de
Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
diff
changeset
|
1 VOID:BOXED,BOXED |
23821
12a16471f94e
Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
23797
diff
changeset
|
2 VOID:POINTER,POINTER,OBJECT |
24983
18b71033ea6e
Remove connection attribute from PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
24938
diff
changeset
|
3 BOOLEAN:OBJECT,POINTER,STRING |
24938
bd598b606ca4
Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
23872
diff
changeset
|
4 VOID:STRING,STRING |
24993
7d2e06b29f88
Add state-changed signal to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
24983
diff
changeset
|
5 VOID:ENUM,STRING,STRING |