annotate libpurple/marshallers.list @ 30096:8de1ce16087c

merge of '1f6b3e2158dd96486ec32995b3f4f93d6b376780' and '84c7f6ba2f4be4be1e1698201fae77872ac21fee'
author Daniel Atallah <daniel.atallah@gmail.com>
date Wed, 26 May 2010 13:50:08 +0000
parents 0ae9306de1f6
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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
1 VOID:POINTER,POINTER,OBJECT
24983
18b71033ea6e Remove connection attribute from PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24938
diff changeset
2 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
3 VOID:STRING,STRING
27849
c8ff0a9cf8cc Unlink the local audio volume and mute between sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26421
diff changeset
4 VOID:STRING,STRING,DOUBLE
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
29131
e144a461cf3c Added the ui-caps-changed signal to the media manager.
maiku@pidgin.im
parents: 27849
diff changeset
7 VOID:FLAGS,FLAGS
29145
0ae9306de1f6 Add a media backend interface to handle different backends in addition to
maiku@pidgin.im
parents: 29131
diff changeset
8 VOID:STRING,STRING,OBJECT,OBJECT