From a7122f5576f7dcdea8e18e7203934d8ffcec1cbb Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@trisquel.info>
Date: Sat, 16 May 2020 17:31:32 -0400
Subject: [PATCH] Improvements to mate-panel reset mechanism

---
 helpers/make-mate-panel | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/helpers/make-mate-panel b/helpers/make-mate-panel
index 1b2760740..3684a4d64 100644
--- a/helpers/make-mate-panel
+++ b/helpers/make-mate-panel
@@ -18,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=8
+VERSION=9
 
 . ./config
 
@@ -105,8 +105,10 @@ RELEASE=\$(lsb_release -rs)
 
 if [ ! -f \$HOME/.config/mate/panel2.d/trisquel\$RELEASE ] || \
      ! grep -q $VERSION \$HOME/.config/mate/panel2.d/trisquel\$RELEASE; then
-  gsettings reset-recursively org.mate.panel
-  sleep 1
+  if dconf dump /org/mate/panel/ |grep -q Clock; then
+    gsettings reset-recursively org.mate.panel
+    sleep 1
+  fi
   dconf write /org/mate/panel/toplevels/top/background/color "'rgba(0,0,0,0.5)'"
   [ -d \$HOME/.config/mate/panel2.d ] || mkdir -p \$HOME/.config/mate/panel2.d
   echo $VERSION > \$HOME/.config/mate/panel2.d/trisquel\$RELEASE
-- 
GitLab