lp:~unity-api-team/indicator-network/merge-secret-agent-into-indicator
Created by
Pete Woods
and last modified
- Get this branch:
- bzr branch lp:~unity-api-team/indicator-network/merge-secret-agent-into-indicator
Members of
Unity API Team
can upload to this branch. Log in for directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Marcus Tomlinson (community): Approve
- PS Jenkins bot (community): Approve (continuous-integration)
-
Diff: 956 lines (+225/-277)34 files modifiedCMakeLists.txt (+11/-3)
data/CMakeLists.txt (+0/-15)
data/indicator-secret-agent.conf.in (+0/-8)
debian/indicator-network.install (+0/-2)
src/CMakeLists.txt (+0/-1)
src/indicator/CMakeLists.txt (+12/-0)
src/indicator/agent/PasswordMenu.cpp (+8/-1)
src/indicator/agent/PasswordMenu.h (+5/-3)
src/indicator/agent/SecretAgent.cpp (+9/-5)
src/indicator/agent/SecretAgent.h (+12/-7)
src/indicator/agent/SecretAgentInclude.h (+2/-4)
src/indicator/agent/SecretRequest.cpp (+8/-3)
src/indicator/agent/SecretRequest.h (+6/-4)
src/indicator/factory.cpp (+6/-0)
src/indicator/factory.h (+3/-0)
src/indicator/main.cpp (+8/-2)
src/indicator/menuitems/wifi-link-item.cpp (+1/-0)
src/indicator/menuitems/wwan-link-item.cpp (+1/-0)
src/indicator/root-state.cpp (+3/-4)
src/indicator/sections/quick-access-section.cpp (+2/-0)
src/indicator/sections/wifi-section.cpp (+2/-0)
src/indicator/sections/wwan-section.cpp (+2/-0)
src/indicator/sim-unlock-dialog.cpp (+1/-0)
src/indicator/util/localisation.h (+26/-0)
src/menumodel-cpp/CMakeLists.txt (+0/-9)
src/menumodel-cpp/gio-helpers/util.h (+0/-3)
src/qdbus-stubs/CMakeLists.txt (+14/-0)
src/secret-agent/CMakeLists.txt (+0/-77)
src/secret-agent/DBusTypes.h (+0/-36)
src/secret-agent/Localisation.h (+0/-28)
src/secret-agent/main.cpp (+0/-55)
tests/unit/secret-agent/CMakeLists.txt (+26/-5)
tests/unit/secret-agent/TestSecretAgent.cpp (+2/-2)
tests/unit/secret-agent/secret-agent-main.cpp (+55/-0)
Superseded
for merging
into
lp:indicator-network/15.04
- PS Jenkins bot (community): Approve (continuous-integration)
- Indicator Applet Developers: Pending requested
-
Diff: 956 lines (+225/-277)34 files modifiedCMakeLists.txt (+11/-3)
data/CMakeLists.txt (+0/-15)
data/indicator-secret-agent.conf.in (+0/-8)
debian/indicator-network.install (+0/-2)
src/CMakeLists.txt (+0/-1)
src/indicator/CMakeLists.txt (+12/-0)
src/indicator/agent/PasswordMenu.cpp (+8/-1)
src/indicator/agent/PasswordMenu.h (+5/-3)
src/indicator/agent/SecretAgent.cpp (+9/-5)
src/indicator/agent/SecretAgent.h (+12/-7)
src/indicator/agent/SecretAgentInclude.h (+2/-4)
src/indicator/agent/SecretRequest.cpp (+8/-3)
src/indicator/agent/SecretRequest.h (+6/-4)
src/indicator/factory.cpp (+6/-0)
src/indicator/factory.h (+3/-0)
src/indicator/main.cpp (+8/-2)
src/indicator/menuitems/wifi-link-item.cpp (+1/-0)
src/indicator/menuitems/wwan-link-item.cpp (+1/-0)
src/indicator/root-state.cpp (+3/-4)
src/indicator/sections/quick-access-section.cpp (+2/-0)
src/indicator/sections/wifi-section.cpp (+2/-0)
src/indicator/sections/wwan-section.cpp (+2/-0)
src/indicator/sim-unlock-dialog.cpp (+1/-0)
src/indicator/util/localisation.h (+26/-0)
src/menumodel-cpp/CMakeLists.txt (+0/-9)
src/menumodel-cpp/gio-helpers/util.h (+0/-3)
src/qdbus-stubs/CMakeLists.txt (+14/-0)
src/secret-agent/CMakeLists.txt (+0/-77)
src/secret-agent/DBusTypes.h (+0/-36)
src/secret-agent/Localisation.h (+0/-28)
src/secret-agent/main.cpp (+0/-55)
tests/unit/secret-agent/CMakeLists.txt (+26/-5)
tests/unit/secret-agent/TestSecretAgent.cpp (+2/-2)
tests/unit/secret-agent/secret-agent-main.cpp (+55/-0)
Branch information
Recent revisions
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:indicator-network/15.04