Mercurial > pidgin
annotate libpurple/marshallers.list @ 26380:b0a9c48b5f69
merge of '2d0e977ba883c0b9d24d52360839cfed7cf1f2a6'
and 'e9514d92cd62759a80a75f93b308e4fd05afe673'
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Mon, 30 Mar 2009 04:15:53 +0000 |
parents | 4e1286e76f1f |
children | a78adf8b4b28 |
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 |
26366
4e1286e76f1f
Create purple_media_stream_info. Add local parameter to stream-info signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
24993
diff
changeset
|
6 VOID:ENUM,STRING,STRING,BOOLEAN |