diff -Nru unity-greeter-0.2.9/debian/changelog unity-greeter-0.2.9/debian/changelog --- unity-greeter-0.2.9/debian/changelog 2014-04-30 03:47:42.000000000 +0000 +++ unity-greeter-0.2.9/debian/changelog 2015-02-02 13:52:26.000000000 +0000 @@ -1,3 +1,16 @@ +unity-greeter (0.2.9-0ubuntu1.5) precise; urgency=medium + + * Show network manager applet in greeter: (LP: #1240088) + * debian/control: + - Recommend network-manager-gnome version that supports working in greeter + * debian/install: + * debian/unity-greeter.pkla: + - Install PolicyKit policy for unity-greeter + * debian/patches/show-nm-applet.patch: + - Show network manager applet + + -- Seyeong Kim Tue, 20 Jan 2015 11:11:41 -0600 + unity-greeter (0.2.9-0ubuntu1.4) precise; urgency=medium * debian/patches/post-login-messages.patch: diff -Nru unity-greeter-0.2.9/debian/control unity-greeter-0.2.9/debian/control --- unity-greeter-0.2.9/debian/control 2014-04-30 03:47:42.000000000 +0000 +++ unity-greeter-0.2.9/debian/control 2015-02-02 13:51:21.000000000 +0000 @@ -25,8 +25,10 @@ indicator-power, indicator-session, indicator-sound, + network-manager-gnome, lightdm Provides: lightdm-greeter -Breaks: edubuntu-artwork (<< 12.01.1~) +Breaks: edubuntu-artwork (<< 12.01.1~), + network-manager-gnome (<< 0.9.4.1-0ubuntu2.3) Description: Unity Greeter The greeter for the Unity desktop. diff -Nru unity-greeter-0.2.9/debian/install unity-greeter-0.2.9/debian/install --- unity-greeter-0.2.9/debian/install 1970-01-01 00:00:00.000000000 +0000 +++ unity-greeter-0.2.9/debian/install 2015-02-02 13:51:21.000000000 +0000 @@ -0,0 +1 @@ +debian/unity-greeter.pkla /var/lib/polkit-1/localauthority/10-vendor.d/ diff -Nru unity-greeter-0.2.9/debian/patches/post-login-messages.patch unity-greeter-0.2.9/debian/patches/post-login-messages.patch --- unity-greeter-0.2.9/debian/patches/post-login-messages.patch 2014-04-30 03:47:42.000000000 +0000 +++ unity-greeter-0.2.9/debian/patches/post-login-messages.patch 2015-02-02 13:51:21.000000000 +0000 @@ -1,7 +1,9 @@ === modified file 'src/unity-greeter.vala' ---- old/src/unity-greeter.vala 2014-02-05 09:09:24 +0000 -+++ new/src/unity-greeter.vala 2014-04-30 03:24:55 +0000 -@@ -48,6 +48,7 @@ +Index: unity-greeter-0.2.9/src/unity-greeter.vala +=================================================================== +--- unity-greeter-0.2.9.orig/src/unity-greeter.vala ++++ unity-greeter-0.2.9/src/unity-greeter.vala +@@ -48,6 +48,7 @@ public class UnityGreeter private LightDM.Greeter greeter; private bool prompted = false; @@ -9,7 +11,7 @@ private bool clear_messages = false; private List active_prompts; -@@ -83,6 +84,7 @@ +@@ -83,6 +84,7 @@ public class UnityGreeter { "four-layouts", "Four Layouts", "*", "de\tdvorak;ca;gb;fr\toss", false, false, null }, { "hy-layout", "Layout Is 'hy'", "*", "am\teastern-alt", false, false, null }, // inherits parent layout's short_desc { "no-response", "No Response", "*", null, false, false, null }, @@ -17,7 +19,7 @@ { "", "", null, null, false, false, null } }; private List test_backgrounds; -@@ -361,6 +363,7 @@ +@@ -361,6 +363,7 @@ public class UnityGreeter private void show_message_cb (string text, LightDM.MessageType type) { @@ -25,7 +27,7 @@ if (clear_messages) { user_list.clear_messages (); -@@ -443,8 +446,8 @@ +@@ -443,8 +446,8 @@ public class UnityGreeter if (is_authenticated) { @@ -36,7 +38,7 @@ { user_list.login_complete (); if (!test_mode) -@@ -517,6 +520,7 @@ +@@ -517,6 +520,7 @@ public class UnityGreeter private void start_authentication () { prompted = false; @@ -44,7 +46,7 @@ active_prompts = new List (); /* Reset manual username */ -@@ -601,6 +605,8 @@ +@@ -601,6 +605,8 @@ public class UnityGreeter private void respond_to_prompt_cb (string text) { @@ -53,7 +55,7 @@ /* Prompt complete */ active_prompts.remove_link (active_prompts.first ()); Prompt? next_prompt = null; -@@ -691,6 +697,12 @@ +@@ -691,6 +697,12 @@ public class UnityGreeter show_message_cb ("Account is locked", LightDM.MessageType.ERROR); authentication_complete_cb (); break; @@ -66,7 +68,7 @@ default: test_is_authenticated = text == "password"; authentication_complete_cb (); -@@ -718,7 +730,10 @@ +@@ -718,7 +730,10 @@ public class UnityGreeter /* Finish authentication (again) or restart it */ if (is_authenticated) @@ -77,4 +79,3 @@ else { user_list.clear_messages (); - diff -Nru unity-greeter-0.2.9/debian/patches/series unity-greeter-0.2.9/debian/patches/series --- unity-greeter-0.2.9/debian/patches/series 2014-04-30 03:47:42.000000000 +0000 +++ unity-greeter-0.2.9/debian/patches/series 2015-02-02 13:51:21.000000000 +0000 @@ -2,3 +2,4 @@ user_selection.patch dont-focus-destroyed-window.patch post-login-messages.patch +show-nm-applet.patch diff -Nru unity-greeter-0.2.9/debian/patches/show-nm-applet.patch unity-greeter-0.2.9/debian/patches/show-nm-applet.patch --- unity-greeter-0.2.9/debian/patches/show-nm-applet.patch 1970-01-01 00:00:00.000000000 +0000 +++ unity-greeter-0.2.9/debian/patches/show-nm-applet.patch 2015-02-02 13:51:21.000000000 +0000 @@ -0,0 +1,26 @@ +Index: unity-greeter-0.2.9/src/unity-greeter.vala +=================================================================== +--- unity-greeter-0.2.9.orig/src/unity-greeter.vala ++++ unity-greeter-0.2.9/src/unity-greeter.vala +@@ -976,6 +976,21 @@ public class UnityGreeter + debug ("Showing greeter"); + greeter.show (); + ++ if (!test_mode) ++ { ++ /* Make nm-applet hide items the user does not have permissions to interact with */ ++ Environment.set_variable ("NM_APPLET_HIDE_POLICY_ITEMS", "1", true); ++ ++ try ++ { ++ Process.spawn_command_line_async ("nm-applet"); ++ } ++ catch (Error e) ++ { ++ warning ("Error starting nm-applet: %s", e.message); ++ } ++ } ++ + /* Launch the unity_support_test tool as an async process to cache + its result */ + var exec = new string[1]; diff -Nru unity-greeter-0.2.9/debian/unity-greeter.pkla unity-greeter-0.2.9/debian/unity-greeter.pkla --- unity-greeter-0.2.9/debian/unity-greeter.pkla 1970-01-01 00:00:00.000000000 +0000 +++ unity-greeter-0.2.9/debian/unity-greeter.pkla 2015-02-02 13:51:21.000000000 +0000 @@ -0,0 +1,44 @@ +# DO NOT EDIT THIS FILE, it will be overwritten on update +# Place your local configurations under /etc/polkit-1/localauthority/ + +[Disable Controlling of Network Devices] +Identity=unix-user:lightdm +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; +ResultActive=no +ResultInactive=no +ResultsAny=no + +[Disable Sleep and Wake] +Identity=unix-user:lightdm +Action=org.freedesktop.NetworkManager.sleep-wake +ResultActive=no +ResultInactive=no +ResultsAny=no + +[Disable WiFi Sharing] +Identity=unix-user:lightdm +Action=org.freedesktop.NetworkManager.wifi.share.protected;org.freedesktop.NetworkManager.wifi.share.open +ResultActive=no +ResultInactive=no +ResultsAny=no + +[Disable Settings Modifications] +Identity=unix-user:lightdm +Action=org.freedesktop.NetworkManager.settings.modify.own;org.freedesktop.NetworkManager.settings.modify.system;org.freedesktop.NetworkManager.settings.modify.hostname +ResultActive=no +ResultInactive=no +ResultsAny=no + +[Disable User Connections] +Identity=unix-user:lightdm +Action=org.freedesktop.NetworkManager.use-user-connections +ResultActive=no +ResultInactive=no +ResultsAny=no + +[Enable Controlling of Network Connections] +Identity=unix-user:lightdm +Action=org.freedesktop.NetworkManager.network-control +ResultActive=yes +ResultInactive=no +ResultsAny=no