[Xfce4-commits] <xfdesktop:master> Move max-template-files xfconf property

[Eric Koegel]

Updating branch refs/heads/master
         to e2e0d0feee28148e6786245b6ee47a64c9d1cc46 (commit)
       from 1a91076400b8f56126e654ccbd9751acc24974ed (commit)

commit e2e0d0feee28148e6786245b6ee47a64c9d1cc46
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Sat Dec 14 21:52:38 2013 +0300

    Move max-template-files xfconf property
    
    Put the max-template-files xfconf property under the desktop-menu
    where it belongs.

 common/xfdesktop-common.h         |    3 ++-
 doc/README.xfconf                 |    4 ++--
 src/xfdesktop-file-icon-manager.c |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/xfdesktop-common.h b/common/xfdesktop-common.h
index 78f543b..f73606a 100644
--- a/common/xfdesktop-common.h
+++ b/common/xfdesktop-common.h
@@ -61,7 +61,8 @@
 #define DESKTOP_ICONS_SHOW_TRASH             "/desktop-icons/file-icons/show-trash"
 #define DESKTOP_ICONS_SHOW_FILESYSTEM        "/desktop-icons/file-icons/show-filesystem"
 #define DESKTOP_ICONS_SHOW_REMOVABLE         "/desktop-icons/file-icons/show-removable"
-#define DESKTOP_ICONS_MAX_TEMPLATE_FILES     "/desktop-icons/file-icons/max-template-files"
+
+#define DESKTOP_MENU_MAX_TEMPLATE_FILES     "/desktop-menu/max-template-files"
 
 /**
  * File information namespaces queried for #GFileInfo objects.
diff --git a/doc/README.xfconf b/doc/README.xfconf
index a762688..80f0ed8 100644
--- a/doc/README.xfconf
+++ b/doc/README.xfconf
@@ -32,10 +32,11 @@ the same monitor is plugged in again those settings apply to it.
     <show-sticky-once bool>
     <show-submenus bool>
     <show-add-remove-workspaces bool>
-</windowlist>
+</windowlist-menu>
 <desktop-menu>
     <show bool>
     <show-icons bool>
+    <max-template-files int>
 </desktop-menu>
 <desktop-icons>
     <style int>
@@ -54,6 +55,5 @@ the same monitor is plugged in again those settings apply to it.
         <show-device-removable bool>
         <show-network-removable bool>
         <show-unknown-removable bool>
-        <max-template-files int>
     </file-icons>
 </desktop-icons>
diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
index f473701..b263c01 100644
--- a/src/xfdesktop-file-icon-manager.c
+++ b/src/xfdesktop-file-icon-manager.c
@@ -3687,7 +3687,7 @@ xfdesktop_file_icon_manager_new(GFile *folder,
                            G_OBJECT(fmanager), "show-unknown-volume");
     xfconf_g_property_bind(channel, DESKTOP_ICONS_SHOW_THUMBNAILS, G_TYPE_BOOLEAN,
                            G_OBJECT(fmanager), "show-thumbnails");
-    xfconf_g_property_bind(channel, DESKTOP_ICONS_MAX_TEMPLATE_FILES, G_TYPE_INT,
+    xfconf_g_property_bind(channel, DESKTOP_MENU_MAX_TEMPLATE_FILES, G_TYPE_INT,
                            G_OBJECT(fmanager), "max-templates");
 
     return XFDESKTOP_ICON_VIEW_MANAGER(fmanager);