diff options
| author | John Brooks <john.brooks@dereferenced.net> | 2012-08-02 20:10:34 -0400 |
|---|---|---|
| committer | Marko Saukko <marko.saukko@jollamobile.com> | 2012-11-14 15:45:49 +0000 |
| commit | a680ab50cf8d3eb55ead145f6f1366d585c5f71b (patch) | |
| tree | 3bec535a20d96d40ba3fce1915bb3c649599a261 | |
| parent | 67d7133e892c032ff4bb1791cb69c650cd41ecf6 (diff) | |
Allow TargetID to be present in channel requests
MC sends both TargetID and TargetHandle. Ignore the TargetID, since
the two can be assumed to be equivalent.
| -rw-r--r-- | src/ring-media-manager.c | 1 | ||||
| -rw-r--r-- | src/ring-text-manager.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/ring-media-manager.c b/src/ring-media-manager.c index e2aaf1b..1eccecd 100644 --- a/src/ring-media-manager.c +++ b/src/ring-media-manager.c @@ -526,6 +526,7 @@ ring_call_channel_fixed_properties(void) static char const * const ring_call_channel_allowed_properties[] = { TP_IFACE_CHANNEL ".TargetHandle", + TP_IFACE_CHANNEL ".TargetID", TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialAudio", TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialVideo", NULL diff --git a/src/ring-text-manager.c b/src/ring-text-manager.c index ad70c7c..89b285c 100644 --- a/src/ring-text-manager.c +++ b/src/ring-text-manager.c @@ -480,6 +480,7 @@ static char const * const ring_text_channel_fixed_properties_list[] = static char const * const ring_text_channel_allowed_properties[] = { TP_IFACE_CHANNEL ".TargetHandle", + TP_IFACE_CHANNEL ".TargetID", #if HAVE_TP_SMS_CHANNEL TP_IFACE_CHANNEL_INTERFACE_SMS ".SMSChannel", #endif |