← Back to branch summary

~ubuntu-branches/ubuntu/trusty/pidgin/trusty

« back to all changes in this revision

Viewing changes to libpurple/media.c

  • Committer: Package Import Robot
  • Author(s): Ken VanDine
  • Date: 2012-04-04 17:02:58 UTC
  • Revision ID: package-import@ubuntu.com-20120404170258-m6yhyj8syg6m6fbc
Tags: 1:2.10.2-1ubuntu2
* debian/patches/70_farstream_rename.patch
  - updated patch from the upstream bug report
    http://developer.pidgin.im/ticket/14936

Show diffs side-by-side

added added

removed removed

Lines of Context:
libpurple/media.c
1067
1067
{
1068
1068
#ifdef USE_VV
1069
1069
        PurpleMediaSession *session;
1070
 
        PurpleMediaStream *stream = NULL;
1071
1070
 
1072
1071
        g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE);
1073
1072
 
1103
1102
        }
1104
1103
 
1105
1104
        if (purple_media_get_stream(media, sess_id, who) == NULL) {
1106
 
                stream = purple_media_insert_stream(session, who, initiator);
 
1105
                purple_media_insert_stream(session, who, initiator);
1107
1106
 
1108
1107
                g_signal_emit(media, purple_media_signals[STATE_CHANGED],
1109
1108
                                0, PURPLE_MEDIA_STATE_NEW,