From b3ddfa56597a696f3b95b7f9499d57c0cc3f0085 Mon Sep 17 00:00:00 2001
From: Alexander Tratsevskiy <at@calculate.ru>
Date: Fri, 22 Mar 2024 15:52:38 +0300
Subject: [PATCH] Xfce: fixed icon display

---
 .../6_ac_desktop_profile/1-user-init/empty_dir/0ini.env       | 2 +-
 .../2-user/0_Patch/patch-64/.calculate_directory              | 1 +
 .../2-user/0_Patch/patch-64/xfce4-panel.xml                   | 3 +++
 .../.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml  | 4 ++--
 4 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 profiles/templates/6_ac_desktop_profile/2-user/0_Patch/patch-64/.calculate_directory
 create mode 100644 profiles/templates/6_ac_desktop_profile/2-user/0_Patch/patch-64/xfce4-panel.xml

diff --git a/profiles/templates/6_ac_desktop_profile/1-user-init/empty_dir/0ini.env b/profiles/templates/6_ac_desktop_profile/1-user-init/empty_dir/0ini.env
index 29750c086..bf193b7e2 100644
--- a/profiles/templates/6_ac_desktop_profile/1-user-init/empty_dir/0ini.env
+++ b/profiles/templates/6_ac_desktop_profile/1-user-init/empty_dir/0ini.env
@@ -4,7 +4,7 @@
 update = on
 
 [ver]
-patch = 63
+patch = 64
 
 [update]
 patch = on
diff --git a/profiles/templates/6_ac_desktop_profile/2-user/0_Patch/patch-64/.calculate_directory b/profiles/templates/6_ac_desktop_profile/2-user/0_Patch/patch-64/.calculate_directory
new file mode 100644
index 000000000..91eeae4ac
--- /dev/null
+++ b/profiles/templates/6_ac_desktop_profile/2-user/0_Patch/patch-64/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<64
diff --git a/profiles/templates/6_ac_desktop_profile/2-user/0_Patch/patch-64/xfce4-panel.xml b/profiles/templates/6_ac_desktop_profile/2-user/0_Patch/patch-64/xfce4-panel.xml
new file mode 100644
index 000000000..7b0a31d8b
--- /dev/null
+++ b/profiles/templates/6_ac_desktop_profile/2-user/0_Patch/patch-64/xfce4-panel.xml
@@ -0,0 +1,3 @@
+# Calculate format=patch path=~/.config/xfce4/xfconf/xfce-perchannel-xml
+<reg>value="folder_home"</reg>
+<text>value="user-home"</text>
diff --git a/profiles/templates/6_ac_desktop_profile/2-user/xfce-base/Xfce-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/profiles/templates/6_ac_desktop_profile/2-user/xfce-base/Xfce-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
index 89af51012..cc207aa8c 100644
--- a/profiles/templates/6_ac_desktop_profile/2-user/xfce-base/Xfce-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/profiles/templates/6_ac_desktop_profile/2-user/xfce-base/Xfce-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -155,13 +155,13 @@
     </property>
     <property name="plugin-20" type="string" value="directorymenu">
       <property name="base-directory" type="string" value="/home/#-ur_login-#"/>
-      <property name="icon-name" type="string" value="folder_home"/>
+      <property name="icon-name" type="string" value="user-home"/>
       <property name="hidden-files" type="bool" value="false"/>
       <property name="file-pattern" type="string" value="*"/>
     </property>
     <property name="plugin-21" type="string" value="directorymenu">
       <property name="base-directory" type="string" value="/home/#-ur_login-#/Home"/>
-      <property name="icon-name" type="string" value="folder_home"/>
+      <property name="icon-name" type="string" value="user-home"/>
       <property name="hidden-files" type="bool" value="false"/>
       <property name="file-pattern" type="string" value="*"/>
     </property>