diff -Nru unity-settings-daemon-15.04.1+18.04.20180413/debian/bzr-builder.manifest unity-settings-daemon-15.04.1+19.04.20181122/debian/bzr-builder.manifest --- unity-settings-daemon-15.04.1+18.04.20180413/debian/bzr-builder.manifest 2018-10-25 14:12:13.000000000 +0000 +++ unity-settings-daemon-15.04.1+19.04.20181122/debian/bzr-builder.manifest 2018-11-30 14:48:03.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debversion}+201810251412 -lp:~khurshid-alam/unity-settings-daemon/media-keys-fix revid:khurshid.alam@linuxmail.org-20181025140617-7qpzftebabn0vds0 +# bzr-builder format 0.3 deb-version {debversion}+201811301447 +lp:~khurshid-alam/unity-settings-daemon/media-keys-fix revid:khurshid.alam@linuxmail.org-20181130104030-t33jeded1427bdup diff -Nru unity-settings-daemon-15.04.1+18.04.20180413/debian/changelog unity-settings-daemon-15.04.1+19.04.20181122/debian/changelog --- unity-settings-daemon-15.04.1+18.04.20180413/debian/changelog 2018-10-25 14:12:13.000000000 +0000 +++ unity-settings-daemon-15.04.1+19.04.20181122/debian/changelog 2018-11-30 14:48:03.000000000 +0000 @@ -1,8 +1,25 @@ -unity-settings-daemon (15.04.1+18.04.20180413-0ubuntu2+201810251412~ubuntu18.10.1) cosmic; urgency=low +unity-settings-daemon (15.04.1+19.04.20181122-0ubuntu1+201811301447~ubuntu18.10.1) cosmic; urgency=low * Auto build. - -- Khurshid Alam Thu, 25 Oct 2018 14:12:13 +0000 + -- Khurshid Alam Fri, 30 Nov 2018 14:48:03 +0000 + +unity-settings-daemon (15.04.1+19.04.20181122-0ubuntu1) disco; urgency=medium + + [ Khurshid Alam ] + * Add sharing plugin (LP: #1741027) + + -- Marco Trevisan (TreviƱo) Thu, 22 Nov 2018 00:21:48 +0000 + +unity-settings-daemon (15.04.1+18.04.20180413-0ubuntu4) disco; urgency=medium + + [ Dariusz Gadomski ] + * gnome-settings-daemon/display-name.c: + - some vendors record the screen ratio (e.g 16/9) in the EDID instead + of including the screen size, detect those cases and display + the product name instead of the screen diagonal. (lp: #1755490) + + -- Sebastien Bacher Tue, 20 Nov 2018 16:07:31 +0100 unity-settings-daemon (15.04.1+18.04.20180413-0ubuntu2) cosmic; urgency=medium diff -Nru unity-settings-daemon-15.04.1+18.04.20180413/gnome-settings-daemon/display-name.c unity-settings-daemon-15.04.1+19.04.20181122/gnome-settings-daemon/display-name.c --- unity-settings-daemon-15.04.1+18.04.20180413/gnome-settings-daemon/display-name.c 2018-10-25 14:12:11.000000000 +0000 +++ unity-settings-daemon-15.04.1+19.04.20181122/gnome-settings-daemon/display-name.c 2018-11-30 14:48:00.000000000 +0000 @@ -88,12 +88,23 @@ return inches; } +static gboolean +has_aspect_as_size(int width_mm, int height_mm) +{ + return (width_mm == 1600 && height_mm == 900) || + (width_mm == 1600 && height_mm == 1000) || + (width_mm == 160 && height_mm == 90) || + (width_mm == 160 && height_mm == 100) || + (width_mm == 16 && height_mm == 9) || + (width_mm == 16 && height_mm == 10); +} + char * make_display_name (const MonitorInfo *info) { const char *vendor; int width_mm, height_mm; - char *inches, *ret; + char *suffix, *ret; if (info) { @@ -123,22 +134,27 @@ height_mm = -1; } - if (width_mm != -1 && height_mm != -1) + // are we dealing with aspect coded in EDID size fields? + if (has_aspect_as_size(width_mm, height_mm)) + { + suffix = g_strdup(info->dsc_product_name); + } + else if (width_mm != -1 && height_mm != -1) { double d = sqrt (width_mm * width_mm + height_mm * height_mm); - inches = diagonal_to_str (d / 25.4); + suffix = diagonal_to_str (d / 25.4); } else { - inches = NULL; + suffix = NULL; } - if (!inches) + if (!suffix) return g_strdup (vendor); - ret = g_strdup_printf ("%s %s", vendor, inches); - g_free (inches); + ret = g_strdup_printf ("%s %s", vendor, suffix); + g_free (suffix); return ret; } diff -Nru unity-settings-daemon-15.04.1+18.04.20180413/plugins/media-keys/gsd-media-keys-manager.c unity-settings-daemon-15.04.1+19.04.20181122/plugins/media-keys/gsd-media-keys-manager.c --- unity-settings-daemon-15.04.1+18.04.20180413/plugins/media-keys/gsd-media-keys-manager.c 2018-10-25 14:12:11.000000000 +0000 +++ unity-settings-daemon-15.04.1+19.04.20181122/plugins/media-keys/gsd-media-keys-manager.c 2018-11-30 14:48:00.000000000 +0000 @@ -2019,7 +2019,8 @@ manager->priv->cancellable = NULL; if (error != NULL) { - g_warning ("Unable to call '%s': %s", action, error->message); + if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + g_warning ("Failed to complete XRandR action: %s", error->message); g_error_free (error); } else { g_variant_unref (variant);