Network Menu

Merge lp://staging/~pete-woods/indicator-network/sim-unlock-label-lp1449925 into lp://staging/indicator-network/15.10

  1. sim-unlock-label-lp1449925
  2. Merge into trunk.15.10
Proposed by Pete Woods
Status: Merged
Approved by: Pete Woods
Approved revision: 512
Merged at revision: 509
Proposed branch: lp://staging/~pete-woods/indicator-network/sim-unlock-label-lp1449925
Merge into: lp://staging/indicator-network/15.10
Diff against target: 2029 lines (+682/-363)
25 files modified
CMakeLists.txt (+0/-7)
debian/control (+0/-1)
src/indicator/CMakeLists.txt (+0/-1)
src/indicator/agent/PasswordMenu.cpp (+4/-1)
src/indicator/agent/SecretAgent.cpp (+8/-7)
src/indicator/agent/SecretAgent.h (+9/-4)
src/indicator/agent/SecretRequest.cpp (+15/-27)
src/indicator/agent/SecretRequest.h (+4/-3)
src/indicator/factory.cpp (+18/-2)
src/indicator/main.cpp (+8/-17)
src/indicator/nmofono/manager-impl.cpp (+3/-2)
src/indicator/nmofono/manager-impl.h (+6/-1)
src/indicator/sim-unlock-dialog.cpp (+7/-18)
src/indicator/sim-unlock-dialog.h (+2/-1)
src/notify-cpp/CMakeLists.txt (+4/-1)
src/notify-cpp/notification-manager.cpp (+76/-0)
src/notify-cpp/notification-manager.h (+67/-0)
src/notify-cpp/notification.cpp (+138/-61)
src/notify-cpp/notification.h (+43/-22)
src/notify-cpp/snapdecision/sim-unlock.cpp (+41/-29)
src/notify-cpp/snapdecision/sim-unlock.h (+4/-3)
src/qdbus-stubs/dbus-types.h (+6/-0)
tests/integration/indicator-network-test-base.h (+5/-1)
tests/integration/test-indicator.cpp (+210/-152)
tests/unit/secret-agent/test-secret-agent.cpp (+4/-2)
To merge this branch: bzr merge lp://staging/~pete-woods/indicator-network/sim-unlock-label-lp1449925
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Indicator Applet Developers Pending
Review via email: mp+266725@code.staging.launchpad.net

Commit message

* Fix SIM PIN unlock dialog mis-titled
* Move from libnotify to internal notify-cpp

Description of the change

* Fix SIM PIN unlock dialog mis-titled
* Move from libnotify to internal notify-cpp

To post a comment you must log in.
lp://staging/~pete-woods/indicator-network/sim-unlock-label-lp1449925 updated
502. By Pete Woods

Sync GCC5 landing

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:505
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/379/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/31/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/379/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:506
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/380/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/32/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/380/rebuild

review: Approve (continuous-integration)
lp://staging/~pete-woods/indicator-network/sim-unlock-label-lp1449925 updated
503. By Pete Woods

Add hotspot management.
Approved by: PS Jenkins bot

504. By Pete Woods

Hold a wakelock when the hotspot is active. Fixes: #1458046
Approved by: PS Jenkins bot

505. By Pete Woods

Simplify wifi/flight toggles
Approved by: PS Jenkins bot

506. By Pete Woods

Don't show access points when hotspot is enabled Fixes: #1478160
Approved by: PS Jenkins bot

507. By Pete Woods

Seed the random number generator Fixes: #1478157

508. By CI Train Bot Account

Releasing 0.5.2+15.10.20150810.1-0ubuntu1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches