Bruce Cowan · Boyuan Yang · Nathan Follens · Danial Behzadi · Alexander Shopov · David Härdeman
--- a/NEWS
+++ b/NEWS
+============
+Version 44.1
+============
+- Translation updates
+- Build improvements
+
+Power:
+- Connect to light sensor asynchronously
+- Initialize check for VM environment earlier
+
+Rfkill:
+- Monitor WwanEnabled property changes properly
+
+Smartcards:
+- Check for the addition of new smartcard readers
+
+Xsettings:
+- Do not force deprecated High Contrast icon theme
+
 ============
 Version 44.0
 ============

--- a/meson.build
+++ b/meson.build
 project(
  'gnome-settings-daemon', 'c',
-  version: '44.0',
+  version: '44.1',
  license: [ 'GPL2+', 'LGPLv2+' ],
  meson_version: '>= 0.57.0'
 )
@@ -100,7 +100,6 @@ gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 42'
 gtk_dep = dependency('gtk+-3.0', version: '>= 3.15.3')
 gtk_x11_dep = dependency('gtk+-x11-3.0')
 gweather_dep = dependency('gweather4')
-lcms_dep = dependency('lcms2', version: '>= 2.2')
 libcanberra_gtk_dep = dependency('libcanberra-gtk3')
 libgeoclue_dep = dependency('libgeoclue-2.0', version: '>= 2.3.1')
 libnotify_dep = dependency('libnotify', version: '>= 0.7.3')

--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -1186,10 +1186,48 @@ action_hibernate (GsdPowerManager *manager)
                           "Error calling Hibernate");
 }

+
+static void
+light_claimed_cb (GObject      *source_object,
+                  GAsyncResult *res,
+                  gpointer      user_data)
+{
+        GsdPowerManager *manager = user_data;
+        g_autoptr(GError) error = NULL;
+        g_autoptr(GVariant) result = NULL;
+
+        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
+                                           res,
+                                           &error);
+        if (result == NULL) {
+                g_warning ("Claiming light sensor failed: %s", error->message);
+                return;
+        }
+        iio_proxy_changed (manager);
+}
+
+
+static void
+light_released_cb (GObject      *source_object,
+                   GAsyncResult *res,
+                   gpointer      user_data)
+{
+        g_autoptr(GError) error = NULL;
+        g_autoptr(GVariant) result = NULL;
+
+        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
+                                           res,
+                                           &error);
+        if (result == NULL) {
+                g_warning ("Release of light sensors failed: %s", error->message);
+                return;
+        }
+}
+
+
 static void
 iio_proxy_claim_light (GsdPowerManager *manager, gboolean active)
 {
-        GError *error = NULL;
        if (manager->iio_proxy == NULL)
                return;
        if (!manager->backlight)
@@ -1211,19 +1249,14 @@ iio_proxy_claim_light (GsdPowerManager *manager, gboolean active)
                g_signal_connect (manager->iio_proxy, "g-properties-changed",
                                  G_CALLBACK (iio_proxy_changed_cb), manager);

-        if (!g_dbus_proxy_call_sync (manager->iio_proxy,
-                                     active ? "ClaimLight" : "ReleaseLight",
-                                     NULL,
-                                     G_DBUS_CALL_FLAGS_NONE,
-                                     -1,
-                                     NULL,
-                                     &error)) {
-                g_warning ("Call to iio-proxy failed: %s", error->message);
-                g_error_free (error);
-        }
-
-        if (active)
-                iio_proxy_changed (manager);
+        g_dbus_proxy_call (manager->iio_proxy,
+                           active ? "ClaimLight" : "ReleaseLight",
+                           NULL,
+                           G_DBUS_CALL_FLAGS_NONE,
+                           -1,
+                           manager->cancellable,
+                           active ? light_claimed_cb : light_released_cb,
+                           manager);
 }

 static void
@@ -2871,9 +2904,6 @@ on_rr_screen_acquired (GObject      *object,
        if (!gnome_settings_is_wayland ())
                manager->xscreensaver_watchdog_timer_id = gsd_power_enable_screensaver_watchdog ();

-        /* don't blank inside a VM */
-        manager->is_virtual_machine = gsd_power_is_hardware_a_vm ();
-
        /* queue a signal in case the proxy from gnome-shell was created before we got here
           (likely, considering that to get here we need a reply from gnome-shell)
        */
@@ -3003,6 +3033,9 @@ gsd_power_manager_start (GsdPowerManager *manager,
        g_debug ("Starting power manager");
        gnome_settings_profile_start (NULL);

+        /* Check whether we are running in a VM */
+        manager->is_virtual_machine = gsd_power_is_hardware_a_vm ();
+
        /* Check whether we have a lid first */
        manager->up_client = up_client_new ();
        manager->lid_is_present = up_client_get_lid_is_present (manager->up_client);

--- a/plugins/rfkill/gsd-rfkill-manager.c
+++ b/plugins/rfkill/gsd-rfkill-manager.c
@@ -679,27 +679,20 @@ sync_wwan_enabled (GsdRfkillManager *manager)
 }

 static void
-nm_signal (GDBusProxy *proxy,
-           char       *sender_name,
-           char       *signal_name,
-           GVariant   *parameters,
-           gpointer    user_data)
+nm_properties_changed (GDBusProxy *proxy,
+                       GVariant   *changed,
+                       gchar     **invalidated,
+                       gpointer    user_data)
 {
        GsdRfkillManager *manager = user_data;
-        GVariant *changed;
        GVariant *property;

-        if (g_strcmp0 (signal_name, "PropertiesChanged") == 0) {
-                changed = g_variant_get_child_value (parameters, 0);
-                property = g_variant_lookup_value (changed, "WwanEnabled", G_VARIANT_TYPE ("b"));
-                g_dbus_proxy_set_cached_property (proxy, "WwanEnabled", property);
+        property = g_variant_lookup_value (changed, "WwanEnabled", G_VARIANT_TYPE ("b"));
+        g_dbus_proxy_set_cached_property (proxy, "WwanEnabled", property);

-                if (property != NULL) {
-                        sync_wwan_enabled (manager);
-                        g_variant_unref (property);
-                }
-
-                g_variant_unref (changed);
+        if (property != NULL) {
+                sync_wwan_enabled (manager);
+                g_variant_unref (property);
        }
 }

@@ -726,8 +719,8 @@ on_nm_proxy_gotten (GObject      *source,

        manager->nm_client = proxy;

-        g_signal_connect (manager->nm_client, "g-signal",
-                          G_CALLBACK (nm_signal), manager);
+        g_signal_connect (manager->nm_client, "g-properties-changed",
+                          G_CALLBACK (nm_properties_changed), manager);
        sync_wwan_enabled (manager);

 out:

--- a/plugins/smartcard/gsd-smartcard-manager.c
+++ b/plugins/smartcard/gsd-smartcard-manager.c
@@ -212,7 +212,12 @@ watch_one_event_from_driver (GsdSmartcardManager       *self,
                error_code = PORT_GetError ();

                if (error_code == SEC_ERROR_NO_EVENT) {
-                    g_usleep (1 * G_USEC_PER_SEC);
+                    int old_slot_count = operation->driver->slotCount;
+                    SECMOD_UpdateSlotList (operation->driver);
+                    if (operation->driver->slotCount != old_slot_count)
+                        g_debug ("Slot count change %i -> %i", old_slot_count, operation->driver->slotCount);
+                    else
+                        g_usleep (1 * G_USEC_PER_SEC);

                    return TRUE;
                }

--- a/plugins/xsettings/gsd-xsettings-manager.c
+++ b/plugins/xsettings/gsd-xsettings-manager.c
@@ -510,7 +510,7 @@ static TranslationEntry translations [] = {
        { "org.gnome.desktop.interface", "cursor-blink-time",      "Net/CursorBlinkTime",     translate_int_int },
        { "org.gnome.desktop.interface", "cursor-blink-timeout",   "Gtk/CursorBlinkTimeout",  translate_int_int },
        { "org.gnome.desktop.interface", "gtk-theme",              "Net/ThemeName",           translate_theme_name },
-        { "org.gnome.desktop.interface", "icon-theme",             "Net/IconThemeName",       translate_theme_name },
+        { "org.gnome.desktop.interface", "icon-theme",             "Net/IconThemeName",       translate_string_string },
        { "org.gnome.desktop.interface", "cursor-theme",           "Gtk/CursorThemeName",     translate_string_string },
        { "org.gnome.desktop.interface", "gtk-enable-primary-paste", "Gtk/EnablePrimaryPaste", translate_bool_int },
        { "org.gnome.desktop.interface", "overlay-scrolling",      "Gtk/OverlayScrolling",    translate_bool_int },

--- a/po/bg.po
+++ b/po/bg.po
--- a/po/en_GB.po
+++ b/po/en_GB.po
--- a/po/fa.po
+++ b/po/fa.po
--- a/po/nl.po
+++ b/po/nl.po
--- a/po/zh_CN.po
+++ b/po/zh_CN.po