diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-20 10:51:16 +0100 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-20 10:51:16 +0100 |
| commit | b40042c598476bc14f578b1d121c14eb9da59c3e (patch) | |
| tree | 94fb05b3fa40a82fc0f05748c02b6977ce5dde4c /src/jingle-session.h | |
| parent | 2aff6d0ac4102835c5e125850eef6062011d910d (diff) | |
| parent | 7a0e8d7f6edf24c96857a72af39940b555a1cf8c (diff) | |
| download | telepathy-gabble-b40042c598476bc14f578b1d121c14eb9da59c3e.tar.gz | |
Merge remote-tracking branch 'tester/call1-addcontent-direction' into call1call1
Conflicts:
tests/twisted/jingle/call-dtmf.py
Diffstat (limited to 'src/jingle-session.h')
| -rw-r--r-- | src/jingle-session.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/jingle-session.h b/src/jingle-session.h index 44ba3b34d..c0a70801d 100644 --- a/src/jingle-session.h +++ b/src/jingle-session.h @@ -93,6 +93,7 @@ void gabble_jingle_session_remove_content (GabbleJingleSession *sess, GabbleJingleContent * gabble_jingle_session_add_content (GabbleJingleSession *sess, JingleMediaType mtype, + JingleContentSenders senders, const char *name, const gchar *content_ns, const gchar *transport_ns); |