Merge lp://staging/~ted/url-dispatcher/bad-url-prompt into lp://staging/url-dispatcher/16.10
Proposed by
Ted Gould
| Status: | Superseded | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~ted/url-dispatcher/bad-url-prompt | ||||
| Merge into: | lp://staging/url-dispatcher/16.10 | ||||
| Diff against target: |
866 lines (+369/-104) 30 files modified
CMakeLists.txt (+1/-0) data/CMakeLists.txt (+10/-0) data/bad-url.qml (+42/-0) debian/apparmor/url-dispatcher-bad-url-helper (+15/-0) debian/control (+4/-0) debian/rules (+1/-0) debian/url-dispatcher.install (+3/-0) po/CMakeLists.txt (+39/-0) po/POTFILES.in (+1/-0) po/genpotfiles.sh (+6/-0) service/CMakeLists.txt (+5/-12) service/bad-url/CMakeLists.txt (+14/-0) service/bad-url/exec-tool.c (+42/-0) service/dispatcher.c (+4/-0) service/overlay-tracker-iface.h (+1/-0) service/overlay-tracker-mir.cpp (+69/-39) service/overlay-tracker-mir.h (+22/-8) service/overlay-tracker.cpp (+9/-0) service/overlay-tracker.h (+1/-0) service/url-overlay/CMakeLists.txt (+14/-0) tests/app-id-test.cc (+10/-28) tests/click-data/manifests/com.test.good.manifest (+1/-1) tests/click-data/manifests/com.test.multiple.manifest (+3/-3) tests/dispatcher-test.cc (+1/-0) tests/overlay-tracker-mock.h (+6/-0) tests/overlay-tracker-test.cpp (+41/-12) tests/test-config.h.in (+1/-1) tests/ual-link-farm/com.test.good_app1_1.2.3.desktop (+1/-0) tests/ual-link-farm/com.test.multiple_app-first_1.2.3.desktop (+1/-0) tests/xdg-data/applications/foo-bar.desktop (+1/-0) |
||||
| To merge this branch: | bzr merge lp://staging/~ted/url-dispatcher/bad-url-prompt | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Indicator Applet Developers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2016-08-18.
Commit message
Show error dialog over apps that use Bad URLs
To post a comment you must log in.
Unmerged revisions
- 113. By Ted Gould
-
Adding some translation framework
- 112. By Ted Gould
-
Make it so that we can get translations for these strings
- 111. By Ted Gould
-
Make sure to only have the protocol in the error
- 110. By Ted Gould
-
Installing the apparmor profile
- 109. By Ted Gould
-
Fix the control file
- 108. By Ted Gould
-
Move all the overlay management into common functions
- 107. By Ted Gould
-
Grabbing the snappy test fix branch
- 106. By Ted Gould
-
Adding in apparmor config for the helper
- 105. By Ted Gould
-
Switch the AppID to be something defined staticly
- 104. By Ted Gould
-
Looks like a large rename, but I started this revision months ago and just got back to it, not entirely sure
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
