[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 02/06: Only show icons by default for new users.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

g   o   t   t   c   o   d   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository panel-plugins/xfce4-whiskermenu-plugin.

commit b46f762eeff3c938632d212d4e699daf0d784e12
Author: Graeme Gott <graeme at gottcode.org>
Date:   Thu Jan 30 15:05:58 2020 -0500

    Only show icons by default for new users.
---
 panel-plugin/settings.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/panel-plugin/settings.cpp b/panel-plugin/settings.cpp
index 516122b..3a7fd6f 100644
--- a/panel-plugin/settings.cpp
+++ b/panel-plugin/settings.cpp
@@ -241,8 +241,16 @@ void Settings::load(char* file)
 	category_icon_size = xfce_rc_read_int_entry(rc, "category-icon-size", category_icon_size);
 	category_show_name = xfce_rc_read_bool_entry(rc, "category-show-name", category_show_name) || (category_icon_size == -1);
 
-	load_hierarchy = xfce_rc_read_bool_entry(rc, "load-hierarchy", load_hierarchy);
-	view_as_icons = xfce_rc_read_bool_entry(rc, "view-as-icons", view_as_icons) && !load_hierarchy;
+	if (xfce_rc_has_entry(rc, "view-as-icons"))
+	{
+		load_hierarchy = xfce_rc_read_bool_entry(rc, "load-hierarchy", load_hierarchy);
+		view_as_icons = xfce_rc_read_bool_entry(rc, "view-as-icons", view_as_icons) && !load_hierarchy;
+	}
+	else if (xfce_rc_has_entry(rc, "load-hierarchy"))
+	{
+		load_hierarchy = xfce_rc_read_bool_entry(rc, "load-hierarchy", load_hierarchy);
+		view_as_icons = false;
+	}
 
 	recent_items_max = std::max(0, xfce_rc_read_int_entry(rc, "recent-items-max", recent_items_max));
 	favorites_in_recent = xfce_rc_read_bool_entry(rc, "favorites-in-recent", favorites_in_recent);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.