1
=== modified file 'src/client/mir_connection_api.cpp'
2
--- src/client/mir_connection_api.cpp	2015-02-04 15:01:59 +0000
3
+++ src/client/mir_connection_api.cpp	2015-02-09 21:38:34 +0000
4
@@ -1,5 +1,5 @@
5
1
/*
1
/*
7
2
 * Copyright © 2014 Canonical Ltd.
2
 * Copyright © 2014,2015 Canonical Ltd.
8
3
 *
3
 *
9
4
 * This program is free software: you can redistribute it and/or modify it
4
 * This program is free software: you can redistribute it and/or modify it
10
5
 * under the terms of the GNU Lesser General Public License version 3,
5
 * under the terms of the GNU Lesser General Public License version 3,
11
@@ -305,7 +305,20 @@
12
305
        connection->available_surface_formats(formats, format_size, *num_valid_formats);
305
        connection->available_surface_formats(formats, format_size, *num_valid_formats);
13
306
}
306
}
14
307
307
16
308
MirWaitHandle* mir_connection_platform_operation(
308
extern "C"
17
309
{
18
310
MirWaitHandle* new_mir_connection_platform_operation(
19
311
    MirConnection* connection,
20
312
    MirPlatformMessage const* request,
21
313
    mir_platform_operation_callback callback, void* context);
22
314
MirWaitHandle* old_mir_connection_platform_operation(
23
315
    MirConnection* connection, int /* opcode */,
24
316
    MirPlatformMessage const* request,
25
317
    mir_platform_operation_callback callback, void* context);
26
318
}
27
319
28
320
__asm__(".symver new_mir_connection_platform_operation,mir_connection_platform_operation@@MIR_CLIENT_8.3");
29
321
MirWaitHandle* new_mir_connection_platform_operation(
30
309
    MirConnection* connection,
322
    MirConnection* connection,
31
310
    MirPlatformMessage const* request,
323
    MirPlatformMessage const* request,
32
311
    mir_platform_operation_callback callback, void* context)
324
    mir_platform_operation_callback callback, void* context)
33
@@ -322,6 +335,16 @@
34
322
335
35
323
}
336
}
36
324
337
37
338
// TODO: Remove when we bump so name
38
339
__asm__(".symver old_mir_connection_platform_operation,mir_connection_platform_operation@MIR_CLIENT_8");
39
340
MirWaitHandle* old_mir_connection_platform_operation(
40
341
    MirConnection* connection, int /* opcode */,
41
342
    MirPlatformMessage const* request,
42
343
    mir_platform_operation_callback callback, void* context)
43
344
{
44
345
    return new_mir_connection_platform_operation(connection, request, callback, context);
45
346
}
46
347
47
325
/**************************
348
/**************************
48
326
 * DRM specific functions *
349
 * DRM specific functions *
49
327
 **************************/
350
 **************************/
50
@@ -390,7 +413,7 @@
51
390
413
52
391
    mir_platform_message_set_data(msg.get(), &request, sizeof(request));
414
    mir_platform_message_set_data(msg.get(), &request, sizeof(request));
53
392
415
55
393
    return mir_connection_platform_operation(
416
    return new_mir_connection_platform_operation(
56
394
        connection,
417
        connection,
57
395
        msg.get(),
418
        msg.get(),
58
396
        platform_operation_to_auth_magic_callback,
419
        platform_operation_to_auth_magic_callback,
59
@@ -411,7 +434,7 @@
60
411
    static int const success{0};
434
    static int const success{0};
61
412
    int status{-1};
435
    int status{-1};
62
413
436
64
414
    auto wh = mir_connection_platform_operation(
437
    auto wh = new_mir_connection_platform_operation(
65
415
        connection,
438
        connection,
66
416
        msg.get(),
439
        msg.get(),
67
417
        assign_set_gbm_device_status,
440
        assign_set_gbm_device_status,
68
418
441
69
=== modified file 'src/client/symbols-debug.map'
70
--- src/client/symbols-debug.map	2014-08-14 05:03:46 +0000
71
+++ src/client/symbols-debug.map	2015-02-09 21:38:34 +0000
72
@@ -1,5 +1,13 @@
74
1
{
1
MIR_CLIENT_DEBUG_8 {
75
2
 global: 
2
 global: 
76
3
   mir_debug_*;
3
   mir_debug_*;
77
4
 local: *;
4
 local: *;
78
5
};
5
};
79
6
80
7
MIR_CLIENT_8 {
81
8
    local: mir_connection_platform_operation;
82
9
};
83
10
84
11
MIR_CLIENT_8.3 {
85
12
    local: mir_connection_platform_operation;
86
13
};
87
6
14
88
=== modified file 'src/client/symbols.map'
89
--- src/client/symbols.map	2015-02-04 13:56:37 +0000
90
+++ src/client/symbols.map	2015-02-09 21:38:34 +0000
91
@@ -1,5 +1,7 @@
92
1
MIR_CLIENT_8 {
1
MIR_CLIENT_8 {
94
2
 global: mir_*;
2
 global:
95
3
 mir_connection_platform_operation;
96
4
 mir_*;
97
3
  extern "C++" { 
5
  extern "C++" { 
98
4
   # used by PrivateProtobuf
6
   # used by PrivateProtobuf
99
5
   mir::client::the_rpc_channel*;
7
   mir::client::the_rpc_channel*;
100
@@ -40,4 +42,5 @@
101
40
    mir_connection_create_spec_for_menu;
42
    mir_connection_create_spec_for_menu;
102
41
    mir_connection_create_spec_for_tooltip;
43
    mir_connection_create_spec_for_tooltip;
103
42
    mir_connection_create_spec_for_dialog;
44
    mir_connection_create_spec_for_dialog;
104
45
    mir_connection_platform_operation;
105
43
} MIR_CLIENT_8.2;
46
} MIR_CLIENT_8.2;
Reviewer	Review Type	Date Requested	Status
Alan Griffiths			Approve on 2015-02-10
PS Jenkins bot (community)	continuous-integration		Approve on 2015-02-10
Kevin DuBois (community)			Approve on 2015-02-09
Alexandros Frantzis (community)			Approve on 2015-02-09
Daniel van Vugt		2015-02-06	Abstain on 2015-02-06
Chris Halse Rogers			Approve on 2015-02-06
Review via email: mp+248899@code.launchpad.net