git.iko.soy/unity8
on xenial help sign in
Add pkla and nerf indicators as much as possible until we have proper app launching
commitdb05f4681d7920dd1d4be5593c8359e2f5e40824 authorMichael Terry <michael.terry@canonical.com> dateWed 8 Jun 2016, 17:52 (10 years ago) parent57d5998
4 files changed+52−2
compare with xenial
unifiedsplit
data/unity8-greeter.pkla+44 debian/unity8-greeter.install+1 plugins/Unity/Indicators/indicatorsmanager.cpp+1−1 qml/Shell.qml+6−1
data/unity8-greeter.pklanew file+44
@@ -0,0 +1,44 @@
1+# DO NOT EDIT THIS FILE, it will be overwritten on update
2+# Place your local configurations under /etc/polkit-1/localauthority/
3+
4+[Disable Controlling of Network Devices]
5+Identity=unix-user:lightdm
6+Action=org.freedesktop.NetworkManager.enable-disable-network;org.freedesktop.NetworkManager.enable-disable-wifi;org.freedesktop.NetworkManager.enable-disable-wwan;org.freedesktop.NetworkManager.enable-disable-wimax;
7+ResultActive=no
8+ResultInactive=no
9+ResultsAny=no
10+
11+[Disable Sleep and Wake]
12+Identity=unix-user:lightdm
13+Action=org.freedesktop.NetworkManager.sleep-wake
14+ResultActive=no
15+ResultInactive=no
16+ResultsAny=no
17+
18+[Disable WiFi Sharing]
19+Identity=unix-user:lightdm
20+Action=org.freedesktop.NetworkManager.wifi.share.protected;org.freedesktop.NetworkManager.wifi.share.open
21+ResultActive=no
22+ResultInactive=no
23+ResultsAny=no
24+
25+[Disable Settings Modifications]
26+Identity=unix-user:lightdm
27+Action=org.freedesktop.NetworkManager.settings.modify.own;org.freedesktop.NetworkManager.settings.modify.system;org.freedesktop.NetworkManager.settings.modify.hostname
28+ResultActive=no
29+ResultInactive=no
30+ResultsAny=no
31+
32+[Disable User Connections]
33+Identity=unix-user:lightdm
34+Action=org.freedesktop.NetworkManager.use-user-connections
35+ResultActive=no
36+ResultInactive=no
37+ResultsAny=no
38+
39+[Enable Controlling of Network Connections]
40+Identity=unix-user:lightdm
41+Action=org.freedesktop.NetworkManager.network-control
42+ResultActive=yes
43+ResultInactive=no
44+ResultsAny=no
debian/unity8-greeter.install+1
@@ -1,4 +1,5 @@
11data/unity8-greeter-wrapper usr/bin/
22data/unity8-greeter-init.conf usr/share/upstart/sessions/
3+data/unity8-greeter.pkla /var/lib/polkit-1/localauthority/10-vendor.d/
34usr/share/lightdm/greeters/unity8-greeter.desktop
45usr/share/lightdm/lightdm.conf.d/51-unity8-greeter.conf
plugins/Unity/Indicators/indicatorsmanager.cpp+1−1
@@ -291,7 +291,7 @@ Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)
291291 // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
292292 if ((new_indicator->identifier() == QStringLiteral("indicator-session"))
293293 || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {
294− new_indicator->setProfile(QStringLiteral("desktop"));
294+ new_indicator->setProfile(m_profile.replace(QStringLiteral("phone"), QStringLiteral("desktop")));
295295 } else {
296296 new_indicator->setProfile(m_profile);
297297 }
qml/Shell.qml+6−1
@@ -531,7 +531,12 @@ StyledItem {
531531
532532 indicatorsModel: Indicators.IndicatorsModel {
533533 // tablet and phone both use the same profile
534− profile: "phone"
534+ // FIXME: use just "phone" for greeter too, but first fix
535+ // greeter app launching to either load the app inside the
536+ // greeter or tell the session to load the app. This will
537+ // involve taking the url-dispatcher dbus name and using
538+ // SessionBroadcast to tell the session.
539+ profile: shell.mode === "greeter" ? "desktop_greeter" : "phone"
535540 Component.onCompleted: load();
536541 }
537542 }