diff options
| author | Michael Terry <[email protected]> | 2012-09-11 14:27:08 -0400 |
|---|---|---|
| committer | git-ubuntu importer <[email protected]> | 2012-09-11 18:40:09 +0000 |
| commit | a4681a111fe227565758f15eaeb819d3f4134af7 (patch) | |
| tree | 4a83dfbcad40ddeafc59b7bbb6acf8b88176c05a | |
| parent | 2c431f8ee6b0b51eac5421adedc83e739aad747e (diff) | |
| parent | e29ec464045e912215c9dcb09b3eef9f12f1fabb (diff) | |
12.10.2-0ubuntu5 (patches applied)applied/12.10.2-0ubuntu5
Imported using git-ubuntu import.
| -rw-r--r-- | data/com.canonical.unity-greeter.gschema.xml | 4 | ||||
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/02_use_remote_login_hint.patch | 41 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | src/settings.vala | 1 | ||||
| -rw-r--r-- | src/user-list.vala | 3 |
7 files changed, 55 insertions, 7 deletions
diff --git a/data/com.canonical.unity-greeter.gschema.xml b/data/com.canonical.unity-greeter.gschema.xml index 8e3d3488..0631cd57 100644 --- a/data/com.canonical.unity-greeter.gschema.xml +++ b/data/com.canonical.unity-greeter.gschema.xml @@ -82,9 +82,5 @@ <default>true</default> <summary>Whether to play sound when greeter is ready</summary> </key> - <key name="enable-remote-login" type="b"> - <default>false</default> - <summary>Whether to enable Remote Login or not</summary> - </key> </schema> </schemalist> diff --git a/debian/changelog b/debian/changelog index 0e9dbd00..2a74dbcc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +unity-greeter (12.10.2-0ubuntu5) quantal; urgency=low + + * debian/patches/02_use_remote_login_hint.patch: + - Use new greeter hint to control whether remote login is enabled, + rather than a gsettings key for the lightdm user. + * debian/control: + - Bump lightdm version to latest for above greeter hint + + -- Michael Terry <[email protected]> Tue, 11 Sep 2012 14:27:08 -0400 + unity-greeter (12.10.2-0ubuntu4) quantal; urgency=low * Whoops, and Recommend remote-login-service and friends to pull diff --git a/debian/control b/debian/control index ad02bb9b..be302f3e 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 7.0.50~), libcanberra-dev, libgtk-3-dev, libindicator3-dev, - liblightdm-gobject-1-dev (>= 1.3.3), + liblightdm-gobject-1-dev (>= 1.3.3-0ubuntu4), valac-0.16, Homepage: https://launchpad.net/unity-greeter Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/unity-greeter/ubuntu diff --git a/debian/patches/02_use_remote_login_hint.patch b/debian/patches/02_use_remote_login_hint.patch new file mode 100644 index 00000000..fe5d57a7 --- /dev/null +++ b/debian/patches/02_use_remote_login_hint.patch @@ -0,0 +1,41 @@ +=== modified file 'data/com.canonical.unity-greeter.gschema.xml' +Index: unity-greeter-12.10.2/data/com.canonical.unity-greeter.gschema.xml +=================================================================== +--- unity-greeter-12.10.2.orig/data/com.canonical.unity-greeter.gschema.xml 2012-08-23 17:16:11.000000000 -0400 ++++ unity-greeter-12.10.2/data/com.canonical.unity-greeter.gschema.xml 2012-09-11 11:49:59.562924014 -0400 +@@ -82,9 +82,5 @@ + <default>true</default> + <summary>Whether to play sound when greeter is ready</summary> + </key> +- <key name="enable-remote-login" type="b"> +- <default>false</default> +- <summary>Whether to enable Remote Login or not</summary> +- </key> + </schema> + </schemalist> +Index: unity-greeter-12.10.2/src/settings.vala +=================================================================== +--- unity-greeter-12.10.2.orig/src/settings.vala 2012-08-27 20:53:06.000000000 -0400 ++++ unity-greeter-12.10.2/src/settings.vala 2012-09-11 11:49:59.562924014 -0400 +@@ -37,7 +37,6 @@ + public static const string KEY_HIGH_CONTRAST = "high-contrast"; + public static const string KEY_SCREEN_READER = "screen-reader"; + public static const string KEY_PLAY_READY_SOUND = "play-ready-sound"; +- public static const string KEY_ENABLE_REMOTE_LOGIN = "enable-remote-login"; + + public static bool get_boolean (string key) + { +Index: unity-greeter-12.10.2/src/user-list.vala +=================================================================== +--- unity-greeter-12.10.2.orig/src/user-list.vala 2012-08-30 12:07:14.000000000 -0400 ++++ unity-greeter-12.10.2/src/user-list.vala 2012-09-11 11:49:59.566924014 -0400 +@@ -129,7 +129,8 @@ + + connect_to_lightdm (); + +- if (!UnityGreeter.test_mode && UGSettings.get_boolean (UGSettings.KEY_ENABLE_REMOTE_LOGIN)) ++ if (!UnityGreeter.test_mode && ++ UnityGreeter.greeter.show_remote_login_hint) + remote_login_service_watch = Bus.watch_name (BusType.SESSION, + "com.canonical.RemoteLogin", + BusNameWatcherFlags.AUTO_START, diff --git a/debian/patches/series b/debian/patches/series index 7e66da58..217d9f4a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 01_add_remote_login_help_icon.patch +02_use_remote_login_hint.patch diff --git a/src/settings.vala b/src/settings.vala index 854f829f..33fbd7ab 100644 --- a/src/settings.vala +++ b/src/settings.vala @@ -37,7 +37,6 @@ public class UGSettings public static const string KEY_HIGH_CONTRAST = "high-contrast"; public static const string KEY_SCREEN_READER = "screen-reader"; public static const string KEY_PLAY_READY_SOUND = "play-ready-sound"; - public static const string KEY_ENABLE_REMOTE_LOGIN = "enable-remote-login"; public static bool get_boolean (string key) { diff --git a/src/user-list.vala b/src/user-list.vala index 29ce25a9..754ab0b2 100644 --- a/src/user-list.vala +++ b/src/user-list.vala @@ -129,7 +129,8 @@ public class UserList : GreeterList connect_to_lightdm (); - if (!UnityGreeter.test_mode && UGSettings.get_boolean (UGSettings.KEY_ENABLE_REMOTE_LOGIN)) + if (!UnityGreeter.test_mode && + UnityGreeter.greeter.show_remote_login_hint) remote_login_service_watch = Bus.watch_name (BusType.SESSION, "com.canonical.RemoteLogin", BusNameWatcherFlags.AUTO_START, |