diff -Nru kylin-greeter-18.04.1/autogen.sh kylin-greeter-18.04.2/autogen.sh --- kylin-greeter-18.04.1/autogen.sh 2018-02-28 02:52:08.000000000 +0000 +++ kylin-greeter-18.04.2/autogen.sh 2018-03-14 07:39:17.000000000 +0000 @@ -14,8 +14,12 @@ exit 1 } -which gnome-autogen.sh || { - echo "You need to install gnome-common from the GNOME CVS" +which mate-autogen || { + echo "You need to install mate-common from the MATE Git" exit 1 } -USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh + +USE_MATE2_MACROS=1 +USE_COMMON_DOC_BUILD=yes + +. mate-autogen diff -Nru kylin-greeter-18.04.1/configure.ac kylin-greeter-18.04.2/configure.ac --- kylin-greeter-18.04.1/configure.ac 2018-02-28 02:52:08.000000000 +0000 +++ kylin-greeter-18.04.2/configure.ac 2018-03-14 07:39:17.000000000 +0000 @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(kylin-greeter, 17.04.0) +AC_INIT(kylin-greeter, 18.04.0) AC_CONFIG_MACRO_DIR(m4) AM_INIT_AUTOMAKE AM_PROG_CC_C_O @@ -36,9 +36,9 @@ #INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4` #AC_SUBST(INDICATORDIR) -MSD_BINARY=`$PKG_CONFIG --variable=binary mate-settings-daemon` +MSD_BINARY=`$PKG_CONFIG --variable=binary ukui-settings-daemon` if test -z "$MSD_BINARY"; then - AC_MSG_ERROR([Could not find path to mate-settings-daemon binary]) + AC_MSG_ERROR([Could not find path to ukui-settings-daemon binary]) fi AC_DEFINE_UNQUOTED([MSD_BINARY], ["$MSD_BINARY"], [Path to g-s-d]) Binary files /tmp/tmpA0c8FV/52nveYPrNS/kylin-greeter-18.04.1/data/background.png and /tmp/tmpA0c8FV/u4ud3diSaA/kylin-greeter-18.04.2/data/background.png differ diff -Nru kylin-greeter-18.04.1/debian/changelog kylin-greeter-18.04.2/debian/changelog --- kylin-greeter-18.04.1/debian/changelog 2018-02-28 02:52:08.000000000 +0000 +++ kylin-greeter-18.04.2/debian/changelog 2018-03-14 07:39:17.000000000 +0000 @@ -1,7 +1,15 @@ +kylin-greeter (18.04.2) bionic; urgency=medium + + * Use ukui-settings-daemon instead of mate-settings-daemon. + * Use mate-common instead of gnome-common. + * Resize when screen resolution changed. (LP: #1755386) + + -- handsome_feng Wed, 14 Mar 2018 15:39:17 +0800 + kylin-greeter (18.04.1) bionic; urgency=medium * Add show/hide password function to the text entry. - * Update the log and background from 17.10 to 18.04. + * Update the logo and background from 17.10 to 18.04. (LP: #1755373) -- handsome_feng Wed, 28 Feb 2018 10:52:08 +0800 diff -Nru kylin-greeter-18.04.1/debian/control kylin-greeter-18.04.2/debian/control --- kylin-greeter-18.04.1/debian/control 2018-02-28 02:52:08.000000000 +0000 +++ kylin-greeter-18.04.2/debian/control 2018-03-14 07:39:17.000000000 +0000 @@ -2,12 +2,12 @@ Section: x11 Priority: optional Maintainer: Ubuntu Kylin Team -Standards-Version: 4.1.2 +Standards-Version: 4.1.3 Build-Depends: at-spi2-core, dbus-x11, debhelper (>= 11), - gnome-common, - mate-settings-daemon-dev, + mate-common, + ukui-settings-daemon-dev, libcanberra-dev, libgnome-desktop-3-dev, libgtk-3-dev, @@ -24,7 +24,7 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, - mate-settings-daemon, + ukui-settings-daemon, Provides: lightdm-greeter Description: Ubuntu Kylin Greeter The greeter for the Kylin desktop fork from unity-greeter. diff -Nru kylin-greeter-18.04.1/debian/copyright kylin-greeter-18.04.2/debian/copyright --- kylin-greeter-18.04.1/debian/copyright 2018-02-28 02:52:08.000000000 +0000 +++ kylin-greeter-18.04.2/debian/copyright 2018-03-14 07:39:17.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: https://launchpad.net/kylin-greeter Files: * diff -Nru kylin-greeter-18.04.1/src/main-window.vala kylin-greeter-18.04.2/src/main-window.vala --- kylin-greeter-18.04.1/src/main-window.vala 2018-02-28 02:52:08.000000000 +0000 +++ kylin-greeter-18.04.2/src/main-window.vala 2018-03-08 02:07:52.000000000 +0000 @@ -18,6 +18,7 @@ * Authors: Robert Ancell * Michael Terry * Modified by : zhangchao + * handsome_feng */ public class MainWindow : Gtk.Window @@ -239,6 +240,7 @@ { var screen = get_screen (); screen.monitors_changed.connect (monitors_changed_cb); + screen.size_changed.connect (size_changed_cb); monitors_changed_cb (screen); } } @@ -362,10 +364,16 @@ } + private void size_changed_cb (Gdk.Screen screen) + { + debug ("Size changed, screen is %dx%d pixels", screen.get_width (), screen.get_height ()); + stack.queue_resize (); + } + private void monitors_changed_cb (Gdk.Screen screen) { int primary = screen.get_primary_monitor (); - debug ("Screen is %dx%d pixels", screen.get_width (), screen.get_height ()); + debug ("Monitors changed, screen is %dx%d pixels", screen.get_width (), screen.get_height ()); monitors = new List (); primary_monitor = null; diff -Nru kylin-greeter-18.04.1/src/settings-daemon.vala kylin-greeter-18.04.2/src/settings-daemon.vala --- kylin-greeter-18.04.1/src/settings-daemon.vala 2018-02-28 02:52:08.000000000 +0000 +++ kylin-greeter-18.04.2/src/settings-daemon.vala 2018-03-14 07:39:17.000000000 +0000 @@ -28,28 +28,28 @@ public void start () { - string[] disabled = { "org.mate.SettingsDaemon.plugins.background", - "org.mate.SettingsDaemon.plugins.clipboard", - "org.mate.SettingsDaemon.plugins.font", - "org.mate.SettingsDaemon.plugins.gconf", - "org.mate.SettingsDaemon.plugins.gsdwacom", - "org.mate.SettingsDaemon.plugins.housekeeping", - "org.mate.SettingsDaemon.plugins.keybindings", - "org.mate.SettingsDaemon.plugins.keyboard", - "org.mate.SettingsDaemon.plugins.media-keys", - "org.mate.SettingsDaemon.plugins.mouse", - "org.mate.SettingsDaemon.plugins.print-notifications", - "org.mate.SettingsDaemon.plugins.smartcard", - "org.mate.SettingsDaemon.plugins.sound", - "org.mate.SettingsDaemon.plugins.wacom" }; - - string[] enabled = { "org.mate.SettingsDaemon.plugins.a11y-keyboard", - "org.mate.SettingsDaemon.plugins.a11y-settings", - "org.mate.SettingsDaemon.plugins.color", - "org.mate.SettingsDaemon.plugins.cursor", - "org.mate.SettingsDaemon.plugins.power", - "org.mate.SettingsDaemon.plugins.xrandr", - "org.mate.SettingsDaemon.plugins.xsettings" }; + string[] disabled = { "org.ukui.SettingsDaemon.plugins.background", + "org.ukui.SettingsDaemon.plugins.clipboard", + "org.ukui.SettingsDaemon.plugins.font", + "org.ukui.SettingsDaemon.plugins.gconf", + "org.ukui.SettingsDaemon.plugins.gsdwacom", + "org.ukui.SettingsDaemon.plugins.housekeeping", + "org.ukui.SettingsDaemon.plugins.keybindings", + "org.ukui.SettingsDaemon.plugins.keyboard", + "org.ukui.SettingsDaemon.plugins.media-keys", + "org.ukui.SettingsDaemon.plugins.mouse", + "org.ukui.SettingsDaemon.plugins.print-notifications", + "org.ukui.SettingsDaemon.plugins.smartcard", + "org.ukui.SettingsDaemon.plugins.sound", + "org.ukui.SettingsDaemon.plugins.wacom" }; + + string[] enabled = { "org.ukui.SettingsDaemon.plugins.a11y-keyboard", + "org.ukui.SettingsDaemon.plugins.a11y-settings", + "org.ukui.SettingsDaemon.plugins.color", + "org.ukui.SettingsDaemon.plugins.cursor", + "org.ukui.SettingsDaemon.plugins.power", + "org.ukui.SettingsDaemon.plugins.xrandr", + "org.ukui.SettingsDaemon.plugins.xsettings" }; foreach (var schema in disabled) set_plugin_enabled (schema, false); @@ -158,7 +158,7 @@ if (n_names != 0) return; - debug ("All bus names acquired, starting mate-settings-daemon"); + debug ("All bus names acquired, starting ukui-settings-daemon"); try { @@ -166,7 +166,7 @@ } catch (SpawnError e) { - debug ("Could not start mate-settings-daemon: %s", e.message); + debug ("Could not start ukui-settings-daemon: %s", e.message); } } }