lp:~morphis/ubuntu-system-settings/fix-lp1539158
- Get this branch:
- bzr branch lp:~morphis/ubuntu-system-settings/fix-lp1539158
Branch merges
- PS Jenkins bot: Needs Fixing (continuous-integration)
- Ken VanDine: Needs Fixing
- Konrad ZapaĆowicz (community): Approve
-
Diff: 205 lines (+52/-27)5 files modifiedplugins/bluetooth/agent.cpp (+24/-14)
plugins/bluetooth/agent.h (+2/-0)
plugins/bluetooth/device.cpp (+1/-0)
plugins/bluetooth/devicemodel.cpp (+22/-11)
plugins/bluetooth/devicemodel.h (+3/-2)
Related bugs
Related blueprints
Branch information
Recent revisions
- 1609. By Simon Fels
-
Merge trunk
* Rework Bluetooth device discovery handling
[ Ken VanDine ]
* Added status tracking for updates to be used for system updates.
Added handling of started signal from system-image-dbus as well as
ForceAllowGSMDownload (LP: #1508081)
[ Ken VanDine ]
* Enable mouse test and use LD_PRELOAD to fix crash running with Xvfb
* Hide MouseDoubleClickSpeed and TouchpadDoubleC lickSpeed settings
because they are not supported by USC yet.
* Use accountsservice for properties instead of gsettings - 1607. By Simon Fels
-
Create new device objects for those we don't know yet but bluez asks us
to work with. - 1605. By Jonas G. Drange
-
Drop our own InputInfo implementation and use QSystemInfo 5.5. Fixes: #1549314
Approved by: Ken VanDine - 1602. By dobey
-
Add InAppPurchases to privacy plug-in.
Update translation template.
Fix translation template to not include full path to settings.js file. Fixes: #1524943
Approved by: Ken VanDine - 1600. By Ken VanDine
-
Subtract amount used by apps when computing otherSize
Fixes: #1524424
Approved by: Sebastien Bacher
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu-system-settings