update to 1.20.2

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -26,5 +26,18 @@
 /mate-settings-daemon-1.11.0.tar.xz
 /mate-settings-daemon-1.12.0.tar.xz
 /mate-settings-daemon-1.12.1.tar.xz
+/mate-settings-daemon-1.13.0.tar.xz
 /mate-settings-daemon-1.14.0.tar.xz
-/mate-settings-daemon-1.14.1.tar.xz
+/mate-settings-daemon-1.15.0.tar.xz
+/mate-settings-daemon-1.15.1.tar.xz
+/mate-settings-daemon-1.16.0.tar.xz
+/mate-settings-daemon-1.17.0.tar.xz
+/mate-settings-daemon-1.17.1.tar.xz
+/mate-settings-daemon-1.18.0.tar.xz
+/mate-settings-daemon-1.18.1.tar.xz
+/mate-settings-daemon-1.19.0.tar.xz
+/mate-settings-daemon-1.19.1.tar.xz
+/mate-settings-daemon-1.19.2.tar.xz
+/mate-settings-daemon-1.20.0.tar.xz
+/mate-settings-daemon-1.20.1.tar.xz
+/mate-settings-daemon-1.20.2.tar.xz

mate-settings-daemon.spec

@@ -2,7 +2,7 @@
 %global rel_build 1
 
 # This is needed, because src-url contains branched part of versioning-scheme.
-%global branch 1.14
+%global branch 1.20
 
 # Settings used for build from snapshots.
 %{!?rel_build:%global commit 83fe1f587f5c6328b10a899a880275d79bf88921}
@@ -13,11 +13,11 @@
 %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
 
 Name:           mate-settings-daemon
-Version:        %{branch}.1
+Version:        %{branch}.2
 %if 0%{?rel_build}
 Release:        1%{?dist}
 %else
-Release:        0.1%{?git_rel}%{?dist}
+Release:        0.6%{?git_rel}%{?dist}
 %endif
 Summary:        MATE Desktop settings daemon
 License:        GPLv2+
@@ -29,23 +29,37 @@ URL:            http://mate-desktop.org
 # Source for snapshot-builds.
 %{!?rel_build:Source0:    http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
 
+# fix rhbz (#1140329)
+%if 0%{?rhel}
+Patch1:         mate-settings-daemon_fix-xrdb-plugin-for-rhel.patch
+%endif
+# xrandr-applet improvements from upstream
+Patch2:         mate-settings-daemon_0001-xrandr-applet-don-t-hard-code-label-colors-in-menu.patch
+Patch3:         mate-settings-daemon_0002-xrandr-applet-drop-non-working-bg-from-menu.patch
+Patch4:         mate-settings-daemon_0003-xrandr-applet-add-a-style-class-for-menuitems.patch
+Patch5:         mate-settings-daemon_0004-xrandr-applet-popup-add-monitor-icons-to-monitor-lab.patch
+Patch6:         mate-settings-daemon_0005-xrandr-applet-popup-use-colored-bg-again-in-monitor-.patch
+Patch7:         mate-settings-daemon_0006-xrandr-applet-popup-add-a-border-to-colored-monitor-.patch
+Patch8:         mate-settings-daemon_0007-xrandr-applet-popup-allow-themes-to-override-monitor.patch
+Patch9:         mate-settings-daemon_0008-xrandr-fix-indent.patch
+Patch10:        mate-settings-daemon_0009-xrander-applet-popup-remove-draw-callback.patch
+Patch11:        mate-settings-daemon_0010-Xrandr-applet-popup-Special-case-the-GNOME-themes-fo.patch
+Patch12:        mate-settings-daemon_0011-xrandr-applet-popup-handle-Greybird-etc-XFCE-themes.patch
+Patch13:        mate-settings-daemon_0012-xrandr-applet-popup-show-icon-only-if-menus-have-ico.patch
+
 BuildRequires:  dbus-glib-devel
 BuildRequires:  dconf-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  gtk2-devel
+BuildRequires:  gtk3-devel
 BuildRequires:  libmatemixer-devel
 BuildRequires:  libcanberra-devel
-# needed for f23
-%if 0%{?fedora} > 22
-BuildRequires: libcanberra-gtk2
-%endif
 BuildRequires:  libmatekbd-devel
 BuildRequires:  libnotify-devel
 BuildRequires:  libSM-devel
 BuildRequires:  libXxf86misc-devel
 BuildRequires:  mate-common
 BuildRequires:  mate-desktop-devel
-BuildRequires:  mate-polkit-devel
+BuildRequires:  polkit-devel
 BuildRequires:  nss-devel
 BuildRequires:  pulseaudio-libs-devel
 
@@ -68,7 +82,11 @@ various parameters of a MATE session and the applications that run
 under it.
 
 %prep
-%setup -q%{!?rel_build:n %{name}-%{commit}}
+%if 0%{?rel_build}
+%autosetup -p1
+%else
+%autosetup -n %{name}-%{commit} -p1
+%endif
 
 %if 0%{?rel_build}
 #NOCONFIGURE=1 ./autogen.sh
@@ -85,8 +103,7 @@ NOCONFIGURE=1 ./autogen.sh
    --disable-schemas-compile           \
    --enable-polkit                     \
    --with-x                            \
-   --with-nssdb                        \
+   --with-nssdb
-   --with-gtk=2.0
 
 make %{?_smp_mflags} V=1
 
@@ -99,24 +116,8 @@ desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/mate-settings-dae
 
 %find_lang %{name} --with-gnome --all-name
 
-%post
+%post -p /sbin/ldconfig
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
-/bin/touch --no-create %{_datadir}/icons/mate &> /dev/null || :
-/bin/touch --no-create %{_datadir}/hicolor/mate &> /dev/null || :
-
-%postun
-/sbin/ldconfig
-if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons/mate &> /dev/null || :
-    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/mate &> /dev/null || :
-    /usr/bin/gtk-update-icon-cache %{_datadir}/hicolor/mate &> /dev/null || :
-    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/mate &> /dev/null || :
-/usr/bin/gtk-update-icon-cache %{_datadir}/hicolor/mate &> /dev/null || :
-/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %files -f %{name}.lang
@@ -146,12 +147,96 @@ fi
 
 
 %changelog
-* Fri Aug 12 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.14.1-1
+* Sun Jun 03 2018 Wolfgang Ulbrich <fedora@raveit.de> - 1.20.2-1
-- update to 1.14.1 release
+- update to 1.20.2
+- use xrandr-applet improvements from upstream
 
-* Sun Jun 12 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.14.0-1
+* Wed Apr 18 2018 Wolfgang Ulbrich <fedora@raveit.de> - 1.20.1-2
+- improve background handling for HIDPI monitors
+- use https://github.com/mate-desktop/mate-settings-daemon/pull/217
+
+* Tue Mar 27 2018 Wolfgang Ulbrich <fedora@raveit.de> - 1.20.1-1
+- update to 1.20.1
+- drop IconCache rpm scriptlet
+
+* Sun Feb 11 2018 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.20.0-1
+- update to 1.20.0 release
+- drop GSettings Schema rpm scriplet
+- switch to autosetup
+- use BR polkit-devel instead of mate-polkit-devel
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jan 25 2018 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.19.2-1
+- update to  1.19.2
+
+* Mon Jan 01 2018 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.19.1-1
+- update to 1.19.1
+
+* Wed Nov 29 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.19.0-2
+- fix rhbz (#1517547)
+
+* Thu Aug 17 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.19.0-1
+- update to 1.19.0 release
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Wed May 03 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.18.1-2
+- add patch to fix xrdb plugin for rhel7 build
+
+* Wed Apr 05 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.18.1-1
+- update to 1.18.1
+
+* Tue Mar 14 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.18.0-1
+- update to 1.18.0 release
+- add https://github.com/mate-desktop/mate-settings-daemon/commit/280c174
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Jan 25 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.17.1-1
+- update 1.17.1 to release with libinput support
+
+* Mon Jan 09 2017 Dan Horák <dan[at]danny.cz> - 1.17.0-3
+- don't require Xorg drivers on s390(x)
+
+* Fri Dec 23 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.17.0-2
+- update to 1.17.0 release
+- remove priority synaptic symlink for f26
+- use requires xorg-x11-drv-synaptics-legacy for f26
+- fix rhbz (#1406948)
+
+* Sat Dec 03 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.17.0-1
+- update to 1.17.0 release
+- add priority symlinks for synaptics and evdev driver
+
+* Sat Sep 17 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.16.0-1
+- update to 1.16.0 release
+
+* Thu Aug 04 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.15.1-1
+- update to 1.15.1 release
+
+* Sun Jul 24 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.15.0-2
+- fix desktop redraw issues with gtk+-3.21.4
+
+* Thu Jun 09 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.15.0-1
+- update to 1.15.0 release
+- switch to gtk+3
+
+* Wed Apr 06 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.14.0-1
 - update to 1.14.0 release
 
+* Sun Feb 07 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.13.0-1
+- update to 1.13.0 release
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Fri Dec 04 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> 1.12.1-1
 - update to 1.12.1 release
 

mate-settings-daemon_0001-xrandr-applet-don-t-hard-code-label-colors-in-menu.patch

@@ -0,0 +1,38 @@
+From 2674157347d3950b3ed055cfecc0a3dd65bb614a Mon Sep 17 00:00:00 2001
+From: raveit65 <mate@raveit.de>
+Date: Mon, 7 May 2018 21:01:29 +0200
+Subject: [PATCH 01/22] xrandr-applet: don't hard code label colors in menu
+
+Using black color makes the label unreadable with dark themes
+---
+ plugins/xrandr/msd-xrandr-manager.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c
+index 580e157..eaa4cef 100644
+--- a/plugins/xrandr/msd-xrandr-manager.c
++++ b/plugins/xrandr/msd-xrandr-manager.c
+@@ -1787,7 +1787,6 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou
+         GtkWidget *item;
+         GtkWidget *label;
+         char *str;
+-        GdkColor black = { 0, 0, 0, 0 };
+ 
+         item = gtk_menu_item_new ();
+ 
+@@ -1799,12 +1798,6 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou
+         gtk_label_set_markup (GTK_LABEL (label), str);
+         g_free (str);
+ 
+-        /* Make the label explicitly black.  We don't want it to follow the
+-         * theme's colors, since the label is always shown against a light
+-         * pastel background.  See bgo#556050
+-         */
+-        gtk_widget_modify_fg (label, gtk_widget_get_state (label), &black);
+-
+         /* Add padding around the label to fit the box that we'll draw for color-coding */
+         gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+         gtk_label_set_yalign (GTK_LABEL (label), 0.5);
+-- 
+2.17.1
+

mate-settings-daemon_0002-xrandr-applet-drop-non-working-bg-from-menu.patch

@@ -0,0 +1,111 @@
+From 0f327170ef19d5af67f48fd1f9e7e623e326ff30 Mon Sep 17 00:00:00 2001
+From: raveit65 <mate@raveit.de>
+Date: Mon, 7 May 2018 21:45:38 +0200
+Subject: [PATCH 02/22] xrandr-applet: drop non-working bg from menu
+
+---
+ plugins/xrandr/msd-xrandr-manager.c | 81 -----------------------------
+ 1 file changed, 81 deletions(-)
+
+diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c
+index eaa4cef..e1b9986 100644
+--- a/plugins/xrandr/msd-xrandr-manager.c
++++ b/plugins/xrandr/msd-xrandr-manager.c
+@@ -1672,76 +1672,6 @@ status_icon_popup_menu_selection_done_cb (GtkMenuShell *menu_shell, gpointer dat
+ #define OUTPUT_TITLE_ITEM_BORDER 2
+ #define OUTPUT_TITLE_ITEM_PADDING 4
+ 
+-/* This is an expose-event hander for the title label for each MateRROutput.
+- * We want each title to have a colored background, so we paint that background, then
+- * return FALSE to let GtkLabel expose itself (i.e. paint the label's text), and then
+- * we have a signal_connect_after handler as well.  See the comments below
+- * to see why that "after" handler is needed.
+- */
+-static gboolean
+-output_title_label_draw_cb (GtkWidget *widget, cairo_t *cr, gpointer data)
+-{
+-        MsdXrandrManager *manager = MSD_XRANDR_MANAGER (data);
+-        struct MsdXrandrManagerPrivate *priv = manager->priv;
+-        MateRROutputInfo *output;
+-        GdkRGBA color;
+-        GtkAllocation allocation;
+-
+-        g_assert (GTK_IS_LABEL (widget));
+-
+-        output = g_object_get_data (G_OBJECT (widget), "output");
+-        g_assert (output != NULL);
+-
+-        g_assert (priv->labeler != NULL);
+-
+-        /* Draw a black rectangular border, filled with the color that corresponds to this output */
+-        mate_rr_labeler_get_rgba_for_output (priv->labeler, output, &color);
+-
+-        cairo_set_source_rgb (cr, 0, 0, 0);
+-        cairo_set_line_width (cr, OUTPUT_TITLE_ITEM_BORDER);
+-        gtk_widget_get_allocation (widget, &allocation);
+-        cairo_rectangle (cr,
+-                         allocation.x + OUTPUT_TITLE_ITEM_BORDER / 2.0,
+-                         allocation.y + OUTPUT_TITLE_ITEM_BORDER / 2.0,
+-                         allocation.width - OUTPUT_TITLE_ITEM_BORDER,
+-                         allocation.height - OUTPUT_TITLE_ITEM_BORDER);
+-        cairo_stroke (cr);
+-
+-        gdk_cairo_set_source_rgba (cr, &color);
+-        cairo_rectangle (cr,
+-                         allocation.x + OUTPUT_TITLE_ITEM_BORDER,
+-                         allocation.y + OUTPUT_TITLE_ITEM_BORDER,
+-                         allocation.width - 2 * OUTPUT_TITLE_ITEM_BORDER,
+-                         allocation.height - 2 * OUTPUT_TITLE_ITEM_BORDER);
+-
+-        cairo_fill (cr);
+-
+-        /* We want the label to always show up as if it were sensitive
+-         * ("style->fg[GTK_STATE_NORMAL]"), even though the label is insensitive
+-         * due to being inside an insensitive menu item.  So, here we have a
+-         * HACK in which we frob the label's state directly.  GtkLabel's expose
+-         * handler will be run after this function, so it will think that the
+-         * label is in GTK_STATE_NORMAL.  We reset the label's state back to
+-         * insensitive in output_title_label_after_expose_event_cb().
+-         *
+-         * Yay for fucking with GTK+'s internals.
+-         */
+-
+-        gtk_widget_set_state (widget, GTK_STATE_NORMAL);
+-
+-        return FALSE;
+-}
+-
+-/* See the comment in output_title_event_box_expose_event_cb() about this funny label widget */
+-static gboolean
+-output_title_label_after_draw_cb (GtkWidget *widget, cairo_t *cr, gpointer data)
+-{
+-        g_assert (GTK_IS_LABEL (widget));
+-        gtk_widget_set_state (widget, GTK_STATE_INSENSITIVE);
+-
+-        return FALSE;
+-}
+-
+ static void
+ title_item_size_allocate_cb (GtkWidget *widget, GtkAllocation *allocation, gpointer data)
+ {
+@@ -1808,17 +1738,6 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou
+ 
+         gtk_container_add (GTK_CONTAINER (item), label);
+ 
+-        /* We want to paint a colored box as the background of the label, so we connect
+-         * to its expose-event signal.  See the comment in *** to see why need to connect
+-         * to the label both 'before' and 'after'.
+-         */
+-        g_signal_connect (label, "draw",
+-                          G_CALLBACK (output_title_label_draw_cb), manager);
+-        g_signal_connect_after (label, "draw",
+-                                G_CALLBACK (output_title_label_after_draw_cb) , manager);
+-
+-        g_object_set_data (G_OBJECT (label), "output", output);
+-
+         gtk_widget_set_sensitive (item, FALSE); /* the title is not selectable */
+         gtk_widget_show_all (item);
+ 
+-- 
+2.17.1
+

mate-settings-daemon_0003-xrandr-applet-add-a-style-class-for-menuitems.patch

@@ -0,0 +1,33 @@
+From a386cd65925199e5c1f76012ac4fdc5b35b4472f Mon Sep 17 00:00:00 2001
+From: raveit65 <mate@raveit.de>
+Date: Wed, 16 May 2018 11:41:38 +0200
+Subject: [PATCH 03/22] xrandr-applet: add a style class for menuitems
+
+---
+ plugins/xrandr/msd-xrandr-manager.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c
+index e1b9986..77ddcd2 100644
+--- a/plugins/xrandr/msd-xrandr-manager.c
++++ b/plugins/xrandr/msd-xrandr-manager.c
+@@ -1714,11 +1714,14 @@ title_item_size_allocate_cb (GtkWidget *widget, GtkAllocation *allocation, gpoin
+ static GtkWidget *
+ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *output)
+ {
+-        GtkWidget *item;
+-        GtkWidget *label;
++        GtkWidget       *item;
++        GtkStyleContext *context;
++        GtkWidget       *label;
+         char *str;
+ 
+         item = gtk_menu_item_new ();
++        context = gtk_widget_get_style_context (item);
++        gtk_style_context_add_class (context, "xrandr-applet");
+ 
+         g_signal_connect (item, "size-allocate",
+                           G_CALLBACK (title_item_size_allocate_cb), NULL);
+-- 
+2.17.1
+

mate-settings-daemon_0004-xrandr-applet-popup-add-monitor-icons-to-monitor-lab.patch

@@ -0,0 +1,42 @@
+From 57b6fa4e37afa3449208abf6578bfc5a773c60b2 Mon Sep 17 00:00:00 2001
+From: lukefromdc <lukefromdc@hushmail.com>
+Date: Fri, 18 May 2018 01:53:38 -0400
+Subject: [PATCH 04/22] xrandr applet popup: add monitor icons to monitor label
+ menuitems
+
+---
+ plugins/xrandr/msd-xrandr-manager.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c
+index 77ddcd2..ea5446e 100644
+--- a/plugins/xrandr/msd-xrandr-manager.c
++++ b/plugins/xrandr/msd-xrandr-manager.c
+@@ -1717,9 +1717,13 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou
+         GtkWidget       *item;
+         GtkStyleContext *context;
+         GtkWidget       *label;
++        GtkWidget       *image;
++        GtkWidget *box;
+         char *str;
+ 
+         item = gtk_menu_item_new ();
++        box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
++        image = gtk_image_new_from_icon_name ("computer-symbolic", GTK_ICON_SIZE_MENU);
+         context = gtk_widget_get_style_context (item);
+         gtk_style_context_add_class (context, "xrandr-applet");
+ 
+@@ -1739,7 +1743,9 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou
+         gtk_widget_set_margin_top (label, OUTPUT_TITLE_ITEM_BORDER + OUTPUT_TITLE_ITEM_PADDING);
+         gtk_widget_set_margin_bottom (label, OUTPUT_TITLE_ITEM_BORDER + OUTPUT_TITLE_ITEM_PADDING);
+ 
+-        gtk_container_add (GTK_CONTAINER (item), label);
++        gtk_container_add (GTK_CONTAINER (box), image);
++        gtk_container_add (GTK_CONTAINER (box), label);
++        gtk_container_add (GTK_CONTAINER (item), box);
+ 
+         gtk_widget_set_sensitive (item, FALSE); /* the title is not selectable */
+         gtk_widget_show_all (item);
+-- 
+2.17.1
+

mate-settings-daemon_0005-xrandr-applet-popup-use-colored-bg-again-in-monitor-.patch

@@ -0,0 +1,115 @@
+From fff8a2f369a80ed7254a1a73bac9bf8e1b337668 Mon Sep 17 00:00:00 2001
+From: lukefromdc <lukefromdc@hushmail.com>
+Date: Fri, 18 May 2018 16:33:44 -0400
+Subject: [PATCH 05/22] xrandr-applet-popup: use colored bg again in monitor
+ labels
+
+*Build a cssprovider from strings, use a variable to apply the same colors as used on the rectangles shown on each monitor to the matching label backgrounds in the popup menu. Bring back the draw callback to handle it, so necessary data can be passed to mate_rr_labeler_get_rgba_for_output
+*Keep disabled item dimming effects off the monitor label icons
+*Tie the dynamic cssprovider to the label so it always gets the correct color
+---
+ plugins/xrandr/msd-xrandr-manager.c | 63 ++++++++++++++++++++++++++++-
+ 1 file changed, 62 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c
+index ea5446e..8aeacc4 100644
+--- a/plugins/xrandr/msd-xrandr-manager.c
++++ b/plugins/xrandr/msd-xrandr-manager.c
+@@ -1671,6 +1671,45 @@ status_icon_popup_menu_selection_done_cb (GtkMenuShell *menu_shell, gpointer dat
+ 
+ #define OUTPUT_TITLE_ITEM_BORDER 2
+ #define OUTPUT_TITLE_ITEM_PADDING 4
++static gboolean
++output_title_label_draw_cb (GtkWidget *widget, cairo_t *cr, gpointer data)
++{
++        MsdXrandrManager *manager = MSD_XRANDR_MANAGER (data);
++        struct MsdXrandrManagerPrivate *priv = manager->priv;
++        MateRROutputInfo *output;
++        GdkRGBA color;
++        GString *string;
++        gchar *css, *color_string;
++        GtkStyleContext *context;
++        GtkCssProvider  *provider;
++
++        output = g_object_get_data (G_OBJECT (widget), "output");
++
++        mate_rr_labeler_get_rgba_for_output (priv->labeler, output, &color);
++
++        color_string = gdk_rgba_to_string (&color);
++
++        string = g_string_new(NULL);
++        g_string_append (string, ".mate-panel-menu-bar menuitem.xrandr-applet:disabled>box>label{\n");
++        g_string_append (string, "color: black;");
++        g_string_append (string, "padding-left: 4px; padding-right: 4px;");
++        g_string_append (string, "background-color:");
++        g_string_append (string, color_string);
++        g_string_append (string," }");
++
++        css = g_string_free (string, FALSE);
++
++        context = gtk_widget_get_style_context (widget);
++        provider = gtk_css_provider_new ();
++        gtk_css_provider_load_from_data (provider,css, -1, NULL);
++
++	    gtk_style_context_add_provider (context,
++					GTK_STYLE_PROVIDER (provider),
++					GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
++	    g_object_unref (provider);
++
++        return FALSE;
++}
+ 
+ static void
+ title_item_size_allocate_cb (GtkWidget *widget, GtkAllocation *allocation, gpointer data)
+@@ -1716,6 +1755,7 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou
+ {
+         GtkWidget       *item;
+         GtkStyleContext *context;
++        GtkCssProvider  *provider;
+         GtkWidget       *label;
+         GtkWidget       *image;
+         GtkWidget *box;
+@@ -1723,10 +1763,25 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou
+ 
+         item = gtk_menu_item_new ();
+         box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+-        image = gtk_image_new_from_icon_name ("computer-symbolic", GTK_ICON_SIZE_MENU);
++        image = gtk_image_new_from_icon_name ("computer", GTK_ICON_SIZE_MENU);
+         context = gtk_widget_get_style_context (item);
+         gtk_style_context_add_class (context, "xrandr-applet");
+ 
++        /*Disable effects applied to icons in an insensitive menu item*/
++        context = gtk_widget_get_style_context (image);
++        provider = gtk_css_provider_new ();
++        gtk_css_provider_load_from_data (provider,
++            ".mate-panel-menu-bar menuitem.xrandr-applet:disabled>box>image{\n"
++             "opacity: 1.0; \n"
++             "-gtk-icon-effect: none; \n"
++             "}",
++             -1, NULL);
++	    gtk_style_context_add_provider (context,
++					GTK_STYLE_PROVIDER (provider),
++					GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
++	    g_object_unref (provider);
++
++
+         g_signal_connect (item, "size-allocate",
+                           G_CALLBACK (title_item_size_allocate_cb), NULL);
+ 
+@@ -1747,7 +1802,13 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou
+         gtk_container_add (GTK_CONTAINER (box), label);
+         gtk_container_add (GTK_CONTAINER (item), box);
+ 
++        g_signal_connect (label, "draw",
++                          G_CALLBACK (output_title_label_draw_cb), manager);
++
++        g_object_set_data (G_OBJECT (label), "output", output);
++
+         gtk_widget_set_sensitive (item, FALSE); /* the title is not selectable */
++
+         gtk_widget_show_all (item);
+ 
+         return item;
+-- 
+2.17.1
+

mate-settings-daemon_0006-xrandr-applet-popup-add-a-border-to-colored-monitor-.patch

@@ -0,0 +1,35 @@
+From c6f56932dee1819097d1f9afa933be4726b1ad35 Mon Sep 17 00:00:00 2001
+From: lukefromdc <lukefromdc@hushmail.com>
+Date: Sat, 19 May 2018 03:11:01 -0400
+Subject: [PATCH 06/22] xrandr-applet-popup: add a border to colored monitor
+ labels
+
+---
+ plugins/xrandr/msd-xrandr-manager.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c
+index 8aeacc4..58b77f5 100644
+--- a/plugins/xrandr/msd-xrandr-manager.c
++++ b/plugins/xrandr/msd-xrandr-manager.c
+@@ -1693,6 +1693,9 @@ output_title_label_draw_cb (GtkWidget *widget, cairo_t *cr, gpointer data)
+         g_string_append (string, ".mate-panel-menu-bar menuitem.xrandr-applet:disabled>box>label{\n");
+         g_string_append (string, "color: black;");
+         g_string_append (string, "padding-left: 4px; padding-right: 4px;");
++        g_string_append (string, "border-style: inset;");
++        g_string_append (string, "border-width: 1px;");
++        g_string_append (string, "border-color: gray;");
+         g_string_append (string, "background-color:");
+         g_string_append (string, color_string);
+         g_string_append (string," }");
+@@ -1774,6 +1777,7 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou
+             ".mate-panel-menu-bar menuitem.xrandr-applet:disabled>box>image{\n"
+              "opacity: 1.0; \n"
+              "-gtk-icon-effect: none; \n"
++             "min-height: 36px; \n" /*Use as a spacer so label border does not put scrollbars on popup*/
+              "}",
+              -1, NULL);
+ 	    gtk_style_context_add_provider (context,
+-- 
+2.17.1
+

mate-settings-daemon_0007-xrandr-applet-popup-allow-themes-to-override-monitor.patch

@@ -0,0 +1,82 @@
+From 6bc54f101dfaa0db6dd8199d358b311a9a3f35e1 Mon Sep 17 00:00:00 2001
+From: lukefromdc <lukefromdc@hushmail.com>
+Date: Sat, 19 May 2018 17:58:03 -0400
+Subject: [PATCH 07/22] xrandr-applet-popup: allow themes to override monitor
+ label colors
+
+Use the monitor label colors in the monitor label menuitems by default,
+*Also move the border-width and style definitions to the second cssprovider, as otherwise they are set too late, and scrollbars result from attempted expansion of the popup
+---
+ plugins/xrandr/msd-xrandr-manager.c | 28 +++++++++++++++++++---------
+ 1 file changed, 19 insertions(+), 9 deletions(-)
+
+diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c
+index 58b77f5..5fabe82 100644
+--- a/plugins/xrandr/msd-xrandr-manager.c
++++ b/plugins/xrandr/msd-xrandr-manager.c
+@@ -1689,12 +1689,11 @@ output_title_label_draw_cb (GtkWidget *widget, cairo_t *cr, gpointer data)
+ 
+         color_string = gdk_rgba_to_string (&color);
+ 
++        /*This can be overriden by themes, check all label:insensitive entries if it does not show up*/
+         string = g_string_new(NULL);
+         g_string_append (string, ".mate-panel-menu-bar menuitem.xrandr-applet:disabled>box>label{\n");
+-        g_string_append (string, "color: black;");
++        /* g_string_append (string, "color: black;"); Does not work-overridden in all themes*/
+         g_string_append (string, "padding-left: 4px; padding-right: 4px;");
+-        g_string_append (string, "border-style: inset;");
+-        g_string_append (string, "border-width: 1px;");
+         g_string_append (string, "border-color: gray;");
+         g_string_append (string, "background-color:");
+         g_string_append (string, color_string);
+@@ -1708,7 +1707,7 @@ output_title_label_draw_cb (GtkWidget *widget, cairo_t *cr, gpointer data)
+ 
+ 	    gtk_style_context_add_provider (context,
+ 					GTK_STYLE_PROVIDER (provider),
+-					GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
++					GTK_STYLE_PROVIDER_PRIORITY_FALLBACK);
+ 	    g_object_unref (provider);
+ 
+         return FALSE;
+@@ -1770,22 +1769,33 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou
+         context = gtk_widget_get_style_context (item);
+         gtk_style_context_add_class (context, "xrandr-applet");
+ 
+-        /*Disable effects applied to icons in an insensitive menu item*/
+-        context = gtk_widget_get_style_context (image);
++        /*This is NOT overrridden by themes as FALLBACK won't work here
++         *
++         *Disable dim/opacity effects applied to icons in an insensitive menu item
++         *And apply the final label border width and style here
++         *(style required too because "none" will define zero width)
++         *before the draw call so label width is defined here
++         *Draw call is too late and will cause scrollbars to appear from
++         *delayed expansion of the label
++         */
++
+         provider = gtk_css_provider_new ();
+         gtk_css_provider_load_from_data (provider,
+             ".mate-panel-menu-bar menuitem.xrandr-applet:disabled>box>image{\n"
+              "opacity: 1.0; \n"
+              "-gtk-icon-effect: none; \n"
+-             "min-height: 36px; \n" /*Use as a spacer so label border does not put scrollbars on popup*/
++             "}"
++             ".mate-panel-menu-bar menuitem.xrandr-applet:disabled>box>label{\n"
++             "border-width: 1px;"
++             "border-style: inset;"
+              "}",
+              -1, NULL);
+-	    gtk_style_context_add_provider (context,
++        /*Need to handle both the image and the label, so has to be for screen to work*/
++        gtk_style_context_add_provider_for_screen (gdk_screen_get_default(),
+ 					GTK_STYLE_PROVIDER (provider),
+ 					GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ 	    g_object_unref (provider);
+ 
+-
+         g_signal_connect (item, "size-allocate",
+                           G_CALLBACK (title_item_size_allocate_cb), NULL);
+ 
+-- 
+2.17.1
+

mate-settings-daemon_0008-xrandr-fix-indent.patch

@@ -0,0 +1,25 @@
+From 0ca8f6d53e9651c80cb36416968228de9e4e9c21 Mon Sep 17 00:00:00 2001
+From: lukefromdc <lukefromdc@hushmail.com>
+Date: Sun, 20 May 2018 21:12:30 -0400
+Subject: [PATCH 08/22] xrandr:fix indent
+
+---
+ plugins/xrandr/msd-xrandr-manager.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c
+index 5fabe82..c82d7e9 100644
+--- a/plugins/xrandr/msd-xrandr-manager.c
++++ b/plugins/xrandr/msd-xrandr-manager.c
+@@ -1705,7 +1705,7 @@ output_title_label_draw_cb (GtkWidget *widget, cairo_t *cr, gpointer data)
+         provider = gtk_css_provider_new ();
+         gtk_css_provider_load_from_data (provider,css, -1, NULL);
+ 
+-	    gtk_style_context_add_provider (context,
++        gtk_style_context_add_provider (context,
+ 					GTK_STYLE_PROVIDER (provider),
+ 					GTK_STYLE_PROVIDER_PRIORITY_FALLBACK);
+ 	    g_object_unref (provider);
+-- 
+2.17.1
+

mate-settings-daemon_0009-xrander-applet-popup-remove-draw-callback.patch

@@ -0,0 +1,167 @@
+From 7bc681f10188c61ab267719c5f8d6c808729ade3 Mon Sep 17 00:00:00 2001
+From: lukefromdc <lukefromdc@hushmail.com>
+Date: Mon, 21 May 2018 22:20:57 -0400
+Subject: [PATCH 09/22] xrander-applet-popup: remove draw callback
+
+---
+ plugins/xrandr/msd-xrandr-manager.c | 122 ++++++++++++----------------
+ 1 file changed, 51 insertions(+), 71 deletions(-)
+
+diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c
+index c82d7e9..c58ecf5 100644
+--- a/plugins/xrandr/msd-xrandr-manager.c
++++ b/plugins/xrandr/msd-xrandr-manager.c
+@@ -1671,47 +1671,6 @@ status_icon_popup_menu_selection_done_cb (GtkMenuShell *menu_shell, gpointer dat
+ 
+ #define OUTPUT_TITLE_ITEM_BORDER 2
+ #define OUTPUT_TITLE_ITEM_PADDING 4
+-static gboolean
+-output_title_label_draw_cb (GtkWidget *widget, cairo_t *cr, gpointer data)
+-{
+-        MsdXrandrManager *manager = MSD_XRANDR_MANAGER (data);
+-        struct MsdXrandrManagerPrivate *priv = manager->priv;
+-        MateRROutputInfo *output;
+-        GdkRGBA color;
+-        GString *string;
+-        gchar *css, *color_string;
+-        GtkStyleContext *context;
+-        GtkCssProvider  *provider;
+-
+-        output = g_object_get_data (G_OBJECT (widget), "output");
+-
+-        mate_rr_labeler_get_rgba_for_output (priv->labeler, output, &color);
+-
+-        color_string = gdk_rgba_to_string (&color);
+-
+-        /*This can be overriden by themes, check all label:insensitive entries if it does not show up*/
+-        string = g_string_new(NULL);
+-        g_string_append (string, ".mate-panel-menu-bar menuitem.xrandr-applet:disabled>box>label{\n");
+-        /* g_string_append (string, "color: black;"); Does not work-overridden in all themes*/
+-        g_string_append (string, "padding-left: 4px; padding-right: 4px;");
+-        g_string_append (string, "border-color: gray;");
+-        g_string_append (string, "background-color:");
+-        g_string_append (string, color_string);
+-        g_string_append (string," }");
+-
+-        css = g_string_free (string, FALSE);
+-
+-        context = gtk_widget_get_style_context (widget);
+-        provider = gtk_css_provider_new ();
+-        gtk_css_provider_load_from_data (provider,css, -1, NULL);
+-
+-        gtk_style_context_add_provider (context,
+-					GTK_STYLE_PROVIDER (provider),
+-					GTK_STYLE_PROVIDER_PRIORITY_FALLBACK);
+-	    g_object_unref (provider);
+-
+-        return FALSE;
+-}
+ 
+ static void
+ title_item_size_allocate_cb (GtkWidget *widget, GtkAllocation *allocation, gpointer data)
+@@ -1762,6 +1721,11 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou
+         GtkWidget       *image;
+         GtkWidget *box;
+         char *str;
++        GString *string;
++        GdkRGBA color;
++        gchar *css, *color_string;
++
++        struct MsdXrandrManagerPrivate *priv = manager->priv;
+ 
+         item = gtk_menu_item_new ();
+         box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+@@ -1769,33 +1733,6 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou
+         context = gtk_widget_get_style_context (item);
+         gtk_style_context_add_class (context, "xrandr-applet");
+ 
+-        /*This is NOT overrridden by themes as FALLBACK won't work here
+-         *
+-         *Disable dim/opacity effects applied to icons in an insensitive menu item
+-         *And apply the final label border width and style here
+-         *(style required too because "none" will define zero width)
+-         *before the draw call so label width is defined here
+-         *Draw call is too late and will cause scrollbars to appear from
+-         *delayed expansion of the label
+-         */
+-
+-        provider = gtk_css_provider_new ();
+-        gtk_css_provider_load_from_data (provider,
+-            ".mate-panel-menu-bar menuitem.xrandr-applet:disabled>box>image{\n"
+-             "opacity: 1.0; \n"
+-             "-gtk-icon-effect: none; \n"
+-             "}"
+-             ".mate-panel-menu-bar menuitem.xrandr-applet:disabled>box>label{\n"
+-             "border-width: 1px;"
+-             "border-style: inset;"
+-             "}",
+-             -1, NULL);
+-        /*Need to handle both the image and the label, so has to be for screen to work*/
+-        gtk_style_context_add_provider_for_screen (gdk_screen_get_default(),
+-					GTK_STYLE_PROVIDER (provider),
+-					GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+-	    g_object_unref (provider);
+-
+         g_signal_connect (item, "size-allocate",
+                           G_CALLBACK (title_item_size_allocate_cb), NULL);
+ 
+@@ -1816,10 +1753,53 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou
+         gtk_container_add (GTK_CONTAINER (box), label);
+         gtk_container_add (GTK_CONTAINER (item), box);
+ 
+-        g_signal_connect (label, "draw",
+-                          G_CALLBACK (output_title_label_draw_cb), manager);
++        mate_rr_labeler_get_rgba_for_output (priv->labeler, output, &color);
++
++        color_string = gdk_rgba_to_string (&color);
++
++        /*This can be overriden by themes, check all label:insensitive entries if it does not show up*/
++        string = g_string_new(NULL);
++        g_string_append (string, ".mate-panel-menu-bar menuitem.xrandr-applet:disabled>box>label{\n");
++        /*g_string_append (string, "color: black;"); Does not work-overridden in all themes*/
++        g_string_append (string, "padding-left: 4px; padding-right: 4px;");
++        g_string_append (string, "border-color: gray;");
++        g_string_append (string,"border-width: 1px;");
++        g_string_append (string,"border-style: inset;");
++        g_string_append (string, "background-color:");
++        g_string_append (string, color_string);
++        g_string_append (string," }");
++
++        css = g_string_free (string, FALSE);
++
++        context = gtk_widget_get_style_context (label);
++        provider = gtk_css_provider_new ();
++        gtk_css_provider_load_from_data (provider,css, -1, NULL);
++
++        gtk_style_context_add_provider (context,
++					GTK_STYLE_PROVIDER (provider),
++					GTK_STYLE_PROVIDER_PRIORITY_FALLBACK);
++
++        g_object_unref (provider);
++        g_free (color_string);
++        g_free (css);
++
++        /*This is NOT overrridden by themes as FALLBACK won't work here
++         *Disable dim/opacity effects applied to icons in an insensitive menu item
++         */
+ 
+-        g_object_set_data (G_OBJECT (label), "output", output);
++        context = gtk_widget_get_style_context (image);
++        provider = gtk_css_provider_new ();
++
++        gtk_css_provider_load_from_data (provider,
++            ".mate-panel-menu-bar menuitem.xrandr-applet:disabled>box>image{\n"
++             "opacity: 1.0; \n"
++             "-gtk-icon-effect: none; \n"
++             "}",
++             -1, NULL);
++        gtk_style_context_add_provider (context,
++					GTK_STYLE_PROVIDER (provider),
++					GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
++        g_object_unref (provider);
+ 
+         gtk_widget_set_sensitive (item, FALSE); /* the title is not selectable */
+ 
+-- 
+2.17.1
+

mate-settings-daemon_0010-Xrandr-applet-popup-Special-case-the-GNOME-themes-fo.patch

@@ -0,0 +1,70 @@
+From 2aa4cec72dad5441eecff2a28730f3b0a964e991 Mon Sep 17 00:00:00 2001
+From: lukefromdc <lukefromdc@hushmail.com>
+Date: Wed, 23 May 2018 02:18:14 -0400
+Subject: [PATCH 10/22] Xrandr-applet-popup: Special case the GNOME themes for
+ black text on monitor labels
+
+---
+ plugins/xrandr/msd-xrandr-manager.c | 32 +++++++++++++++++++++++++++--
+ 1 file changed, 30 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c
+index c58ecf5..526f702 100644
+--- a/plugins/xrandr/msd-xrandr-manager.c
++++ b/plugins/xrandr/msd-xrandr-manager.c
+@@ -1716,14 +1716,15 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou
+ {
+         GtkWidget       *item;
+         GtkStyleContext *context;
+-        GtkCssProvider  *provider;
++        GtkCssProvider  *provider, *provider2;
+         GtkWidget       *label;
+         GtkWidget       *image;
+         GtkWidget *box;
+         char *str;
+         GString *string;
+         GdkRGBA color;
+-        gchar *css, *color_string;
++        gchar *css, *color_string, *theme_name;
++        GtkSettings *settings;
+ 
+         struct MsdXrandrManagerPrivate *priv = manager->priv;
+ 
+@@ -1799,7 +1800,34 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou
+         gtk_style_context_add_provider (context,
+ 					GTK_STYLE_PROVIDER (provider),
+ 					GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
++
++        /*Deal with the GNOME themes*/
++        provider2 = gtk_css_provider_new ();
++        settings = gtk_settings_get_default();
++        context = gtk_widget_get_style_context (label);
++        g_object_get (settings, "gtk-theme-name", &theme_name, NULL);
++        if (g_strcmp0 (theme_name, "Adwaita") == 0 ||
++                      g_strcmp0 (theme_name, "Adwaita-dark") == 0 ||
++                      g_strcmp0 (theme_name, "Raleigh") == 0 ||
++                      g_strcmp0 (theme_name, "win32") == 0 ||
++                      g_strcmp0 (theme_name, "HighContrast") == 0 ||
++                      g_strcmp0 (theme_name, "HighContrastInverse") == 0){
++            gtk_css_provider_load_from_data (provider2,
++                    ".mate-panel-menu-bar menuitem.xrandr-applet:disabled>box>label{\n"
++                    "color: black;\n"
++                    "}",
++                    -1, NULL);
++            gtk_style_context_add_provider(context,
++					    GTK_STYLE_PROVIDER (provider2),
++					    GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
++        }
++        /*Keep or take this off all other themes as soon as the theme changes*/
++        else{
++            gtk_style_context_remove_provider(context, GTK_STYLE_PROVIDER (provider2));
++        }
++
+         g_object_unref (provider);
++        g_object_unref (provider2);
+ 
+         gtk_widget_set_sensitive (item, FALSE); /* the title is not selectable */
+ 
+-- 
+2.17.1
+

mate-settings-daemon_0011-xrandr-applet-popup-handle-Greybird-etc-XFCE-themes.patch

@@ -0,0 +1,45 @@
+From 06306441a0ee70ac79a9136a40d8e2ef365d31a2 Mon Sep 17 00:00:00 2001
+From: lukefromdc <lukefromdc@hushmail.com>
+Date: Wed, 23 May 2018 15:08:27 -0400
+Subject: [PATCH 11/22] xrandr-applet-popup: handle Greybird (etc) XFCE themes
+
+Also ensure default bg images don't override label bg color, and don't use symbolic icon in GNOME HighContrast themes as it gets the disabled color
+---
+ plugins/xrandr/msd-xrandr-manager.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c
+index 526f702..4222923 100644
+--- a/plugins/xrandr/msd-xrandr-manager.c
++++ b/plugins/xrandr/msd-xrandr-manager.c
+@@ -1766,6 +1766,7 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou
+         g_string_append (string, "border-color: gray;");
+         g_string_append (string,"border-width: 1px;");
+         g_string_append (string,"border-style: inset;");
++        g_string_append (string, "background-image: none;");
+         g_string_append (string, "background-color:");
+         g_string_append (string, color_string);
+         g_string_append (string," }");
+@@ -1794,6 +1795,7 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou
+         gtk_css_provider_load_from_data (provider,
+             ".mate-panel-menu-bar menuitem.xrandr-applet:disabled>box>image{\n"
+              "opacity: 1.0; \n"
++             "-gtk-icon-style:regular; \n" /* symbolic icons would get the disabled color*/
+              "-gtk-icon-effect: none; \n"
+              "}",
+              -1, NULL);
+@@ -1811,7 +1813,10 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou
+                       g_strcmp0 (theme_name, "Raleigh") == 0 ||
+                       g_strcmp0 (theme_name, "win32") == 0 ||
+                       g_strcmp0 (theme_name, "HighContrast") == 0 ||
+-                      g_strcmp0 (theme_name, "HighContrastInverse") == 0){
++                      g_strcmp0 (theme_name, "HighContrastInverse") == 0 ||
++                      g_strcmp0 (theme_name, "Blackbird") == 0 ||
++                      g_strcmp0 (theme_name, "Bluebird") == 0 ||
++                      g_strcmp0 (theme_name, "Greybird") == 0){
+             gtk_css_provider_load_from_data (provider2,
+                     ".mate-panel-menu-bar menuitem.xrandr-applet:disabled>box>label{\n"
+                     "color: black;\n"
+-- 
+2.17.1
+

mate-settings-daemon_0012-xrandr-applet-popup-show-icon-only-if-menus-have-ico.patch

@@ -0,0 +1,38 @@
+From 05d1d3ca7fedda82eff13abffd085235d2440797 Mon Sep 17 00:00:00 2001
+From: lukefromdc <lukefromdc@hushmail.com>
+Date: Wed, 23 May 2018 22:48:21 -0400
+Subject: [PATCH 12/22] xrandr-applet-popup: show icon only if
+ "menus-have-icons" is not turned off
+
+---
+ plugins/xrandr/msd-xrandr-manager.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c
+index 4222923..7cdaf69 100644
+--- a/plugins/xrandr/msd-xrandr-manager.c
++++ b/plugins/xrandr/msd-xrandr-manager.c
+@@ -1725,6 +1725,7 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou
+         GdkRGBA color;
+         gchar *css, *color_string, *theme_name;
+         GtkSettings *settings;
++        GSettings *icon_settings;
+ 
+         struct MsdXrandrManagerPrivate *priv = manager->priv;
+ 
+@@ -1750,7 +1751,11 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou
+         gtk_widget_set_margin_top (label, OUTPUT_TITLE_ITEM_BORDER + OUTPUT_TITLE_ITEM_PADDING);
+         gtk_widget_set_margin_bottom (label, OUTPUT_TITLE_ITEM_BORDER + OUTPUT_TITLE_ITEM_PADDING);
+ 
+-        gtk_container_add (GTK_CONTAINER (box), image);
++        /*Load the icon unless the user has icons in menus turned off*/
++        icon_settings = g_settings_new ("org.mate.interface");
++        if (g_settings_get_boolean (icon_settings, "menus-have-icons")){
++            gtk_container_add (GTK_CONTAINER (box), image);
++            }
+         gtk_container_add (GTK_CONTAINER (box), label);
+         gtk_container_add (GTK_CONTAINER (item), box);
+ 
+-- 
+2.17.1
+

mate-settings-daemon_fix-xrdb-plugin-for-rhel.patch

@@ -0,0 +1,12 @@
+diff -upr mate-settings-daemon-make-dist-orig/plugins/xrdb/msd-xrdb-manager.c mate-settings-daemon-make-dist/plugins/xrdb/msd-xrdb-manager.c
+--- mate-settings-daemon-make-dist-orig/plugins/xrdb/msd-xrdb-manager.c	2014-11-12 23:17:45.461271000 +0100
++++ mate-settings-daemon-make-dist/plugins/xrdb/msd-xrdb-manager.c	2014-11-12 23:18:28.705704971 +0100
+@@ -430,7 +430,7 @@ apply_settings (MsdXrdbManager *manager,
+ 
+         mate_settings_profile_start (NULL);
+ 
+-        command = "xrdb -merge -quiet";
++        command = "xrdb -cpp /bin/cpp -merge -quiet";
+ 
+         string = g_string_sized_new (256);
+         append_theme_colors (style, string);

sources

@@ -1 +1 @@
-7dcb88d2a6b15eebb2eb0f27769ec814  mate-settings-daemon-1.14.1.tar.xz
+SHA512 (mate-settings-daemon-1.20.2.tar.xz) = 9da7d7da39ba2782c19440c000bcc72270316a572464e2753bf3ff6a26d0c1b9d2c0072ec0220a81278c1332130bc7572d9b7dc4322ae2cc959c1f8d49f9c550