NetworkManager

Merge lp://qastaging/~phablet-team/network-manager/ofono-rm-unused-code into lp://qastaging/~network-manager/network-manager/ubuntu

ofono-rm-unused-code
Merge into ubuntu

Proposed by Tony Espy on 2015-04-06

Status:	Merged
Approved by:	Ricardo Salveti on 2015-04-09
Approved revision:	958
Merged at revision:	956
Proposed branch:	lp://qastaging/~phablet-team/network-manager/ofono-rm-unused-code
Merge into:	lp://qastaging/~network-manager/network-manager/ubuntu
Prerequisite:	lp://qastaging/~phablet-team/network-manager/lp1418077
Diff against target:	333 lines (+2/-253) 1 file modified debian/patches/0001-wwan-add-support-for-using-oFono-as-a-modem-manager.patch (+2/-253)
To merge this branch:	bzr merge lp://qastaging/~phablet-team/network-manager/ofono-rm-unused-code
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Mathieu Trudel-Lapierre		Abstain on 2015-04-07
Ricardo Salveti (community)	2015-04-06	Approve on 2015-04-07
Review via email: mp+255305@code.qastaging.launchpad.net

Description of the change

This merge proposal is a general cleanup of the NM ofono code ( src/devices/wwan/nm-modem-ofono.c ), getting rid of unused and/or code that was commented out.

lp://qastaging/~phablet-team/network-manager/ofono-rm-unused-code updated on 2015-04-06

958. By Tony Espy on 2015-04-06: Remove unused nm-modem-ofono.c function: do_context_prepare()

Revision history for this message

Ricardo Salveti (rsalveti) wrote on 2015-04-07:

Looks good, makes it easier to fix bugs and maintain the code as we go (and also for possible vivid specific issues), so good to land soon if possible.

review: Approve

Revision history for this message

Mathieu Trudel-Lapierre (cyphermox) wrote on 2015-04-07:

Changeset is fine, but given that the unused/commented code is obvious and straightforward, I'd rather avoid making cosmetic changes two weeks away from Vivid release, even when bundled with bugfixes. I don't see why it couldn't wait two more weeks and land in the next release cycle.

Call me extra careful, but it's *very* late in the release so I'd defer the decision of landing this despite it being cosmetic changes to the release team. Could you please bring it up to them?

review: Abstain

Revision history for this message

Ricardo Salveti (rsalveti) wrote on 2015-04-07:

The thing about not waiting for two more extra weeks (for next release) is because we're still going to maintain this code base (vivid based) for RTM for a few months.

Revision history for this message

Tony Espy (awe) wrote on 2015-04-07:

Also this code has *nothing* to do with any code run on the desktop.

The only way any of the deleted static functions could possibly be used is if they were referenced in a function table, which none of them are.

The rest of the changes are super straight-forward, private variables that aren't ever used after being initialized, and code that's commented out, or ifdef'd out.