Merge lp:~alan-griffiths/platform-api/delete-dead-code-that-uses-Mir-PrivateProtobuf-API-without-ABI-break into lp:platform-api

Proposed by Alan Griffiths
Status: Rejected
Rejected by: Alan Griffiths
Proposed branch: lp:~alan-griffiths/platform-api/delete-dead-code-that-uses-Mir-PrivateProtobuf-API-without-ABI-break
Merge into: lp:platform-api
Diff against target: 34 lines (+4/-9)
1 file modified
src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp (+4/-9)
To merge this branch: bzr merge lp:~alan-griffiths/platform-api/delete-dead-code-that-uses-Mir-PrivateProtobuf-API-without-ABI-break
Reviewer Review Type Date Requested Status
Gerry Boland (community) Needs Fixing
PS Jenkins bot continuous-integration Approve
Ubuntu Unity PS integration team Pending
Review via email: mp+238194@code.launchpad.net

This proposal supersedes a proposal from 2014-10-06.

Commit message

Delete obsolete implementation of clipboard.

Description of the change

Delete obsolete implementation of clipboard.

It uses a Mir API I want to remove.

To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) wrote : Posted in a previous version of this proposal

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No.

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Not sure how to test - Gerry says this code is unused.

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) wrote : Posted in a previous version of this proposal

The removal looks ok.

However this is an ABI breaking change, so to land it we need a silo to rebuild all the packages that depend on it (20+ at last count I think). With RTM coming up, we don't need that kind of code-churn for a cosmetic change.

So we think a sane intermediary step would be to void the function bodies to prevent breaking ABI. Then later when things have calmed down, we can do the ABI break.

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) wrote :

debian/control still has "protobuf-compiler" listed as a dependency, I expect that's unnecessary now

I guess a generic Checklist is needed for this MR too

review: Needs Fixing
279. By Alan Griffiths

Remove protobuf-compiler from Build-Depends

Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No.

 * Did you perform an exploratory manual test run of your code change and any related functionality?
No but Gerry did

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Yes

Unmerged revisions

280. By Alan Griffiths

merge lp:platform-api

279. By Alan Griffiths

Remove protobuf-compiler from Build-Depends

278. By Alan Griffiths

Delete obsolete implementation of clipboard

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp'
2--- src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp 2014-10-13 10:11:24 +0000
3+++ src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp 2014-10-14 16:11:55 +0000
4@@ -34,7 +34,6 @@
5 #include <ubuntu/application/sensors/light.h>
6
7 #include <mir_toolkit/mir_client_library.h>
8-#include <mir/client/private.h>
9
10 #include <stdlib.h>
11 #include <assert.h>
12@@ -142,18 +141,14 @@
13 (void) instance;
14 }
15
16-void ua_ui_set_clipboard_content(void* /*content*/, size_t /*content_size*/)
17+void ua_ui_set_clipboard_content(void*, size_t)
18 {
19- // TODO<papi>: Fix API and implement it
20- printf("ERROR: ua_ui_set_clipboard_content() is not implemented!\n");
21+ // obsolete
22 }
23
24-void ua_ui_get_clipboard_content(void** out_content, size_t* out_content_size)
25+void ua_ui_get_clipboard_content(void**, size_t*)
26 {
27- // TODO<papi>: Fix API and implement it
28- printf("ERROR: ua_ui_get_clipboard_content() is not implemented!\n");
29- *out_content = nullptr;
30- *out_content_size = 0;
31+ // obsolete
32 }
33
34 //

Subscribers

People subscribed via source and target branches