Merge lp://staging/~unity-api-team/indicator-network/dont-expect-preferred-languages into lp://staging/indicator-network
Proposed by
Antti Kaijanmäki
| Status: | Merged |
|---|---|
| Approved by: | Charles Kerr |
| Approved revision: | 610 |
| Merged at revision: | 612 |
| Proposed branch: | lp://staging/~unity-api-team/indicator-network/dont-expect-preferred-languages |
| Merge into: | lp://staging/indicator-network |
| Diff against target: |
245 lines (+36/-36) 9 files modified
src/connectivity-api/connectivity-qt/connectivityqt/sim.cpp (+3/-0) src/connectivity-api/connectivity-qt/connectivityqt/sim.h (+2/-1) src/connectivity-api/connectivity-qt/connectivityqt/sims-list-model.cpp (+7/-0) src/indicator/connectivity-service/dbus-sim.cpp (+6/-0) src/indicator/connectivity-service/dbus-sim.h (+1/-0) src/indicator/nmofono/wwan/qofono-sim-wrapper.cpp (+1/-32) src/indicator/nmofono/wwan/qofono-sim-wrapper.h (+0/-1) src/indicator/nmofono/wwan/sim.cpp (+13/-1) src/indicator/nmofono/wwan/sim.h (+3/-1) |
| To merge this branch: | bzr merge lp://staging/~unity-api-team/indicator-network/dont-expect-preferred-languages |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Charles Kerr (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Don't expect to have PreferredLanguages on a SIM.
Description of the change
-
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM