~mir-team/mir/development-branch

« back to all changes in this revision

Viewing changes to src/server/frontend/protobuf_message_processor.cpp

merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
309
309
 
310
310
void mfd::ProtobufMessageProcessor::send_response(::google::protobuf::uint32 id, mir::protobuf::Surface* response)
311
311
{
312
 
    if (response->has_buffer())
313
 
        sender->send_response(id, response, {extract_fds_from(response), extract_fds_from(response->mutable_buffer())});
 
312
    if (response->has_buffer_stream())
 
313
        sender->send_response(id, response,
 
314
            {extract_fds_from(response), extract_fds_from(response->mutable_buffer_stream()->mutable_buffer())});
314
315
    else
315
316
        sender->send_response(id, response, {extract_fds_from(response)});
316
317
}
318
319
void mfd::ProtobufMessageProcessor::send_response(
319
320
    ::google::protobuf::uint32 id, mir::protobuf::Screencast* response)
320
321
{
321
 
    if (response->has_buffer())
322
 
        sender->send_response(id, response, {extract_fds_from(response->mutable_buffer())});
 
322
    if (response->has_buffer_stream())
 
323
        sender->send_response(id, response,
 
324
            {extract_fds_from(response->mutable_buffer_stream()->mutable_buffer())});
323
325
    else
324
326
        sender->send_response(id, response, {});
325
327
}