Fix location of pcmanfm config file
authorChristoph Wickert <cwickert@fedoraproject.org>
Sun, 13 Mar 2011 19:23:30 +0000 (20:23 +0100)
committerChristoph Wickert <cwickert@fedoraproject.org>
Sun, 13 Mar 2011 19:23:30 +0000 (20:23 +0100)
Makefile.am
configure.ac
pcmanfm/LXDE.conf.in [deleted file]
pcmanfm/pcmanfm.conf.in [new file with mode: 0644]
startlxde.in

index 61cf4c5..da1e007 100644 (file)
@@ -33,7 +33,7 @@ openbox_DATA= \
 
 pcmanfmdir=$(sysconfdir)/xdg/pcmanfm
 pcmanfm_DATA= \
-       pcmanfm/lxde.conf
+       pcmanfm/pcmanfm.conf
 
 EXTRA_DIST = \
        autostart \
@@ -45,7 +45,7 @@ EXTRA_DIST = \
        openbox/rc.xml.in \
        openbox/menu.xml \
        openbox-lxde.in \
-       pcmanfm/lxde.conf.in \
+       pcmanfm/pcmanfm.conf.in \
        $(lxpanel_DATA) \
        lxpanel/panel.in
 
index 0875374..4c71004 100644 (file)
@@ -48,7 +48,7 @@ AC_OUTPUT([
   lxpanel/panel
   openbox/rc.xml
   openbox-lxde
-  pcmanfm/LXDE.conf
+  pcmanfm/pcmanfm.conf
   man/Makefile
 ])
 
diff --git a/pcmanfm/LXDE.conf.in b/pcmanfm/LXDE.conf.in
deleted file mode 100644 (file)
index 6799e1f..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-[config]
-bm_open_method=0
-su_cmd=xdg-su -c '%s'
-
-[desktop]
-wallpaper_mode=1
-wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg
-desktop_bg=#000000
-desktop_fg=#ffffff
-desktop_shadow=#000000
-
-[ui]
-always_show_tabs=0
-hide_close_btn=0
-win_width=640
-win_height=480
-view_mode=0
-show_hidden=0
-sort_type=0
-sort_by=0
diff --git a/pcmanfm/pcmanfm.conf.in b/pcmanfm/pcmanfm.conf.in
new file mode 100644 (file)
index 0000000..6799e1f
--- /dev/null
@@ -0,0 +1,20 @@
+[config]
+bm_open_method=0
+su_cmd=xdg-su -c '%s'
+
+[desktop]
+wallpaper_mode=1
+wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg
+desktop_bg=#000000
+desktop_fg=#ffffff
+desktop_shadow=#000000
+
+[ui]
+always_show_tabs=0
+hide_close_btn=0
+win_width=640
+win_height=480
+view_mode=0
+show_hidden=0
+sort_type=0
+sort_by=0
index 7496774..a748f7a 100755 (executable)
@@ -5,10 +5,10 @@ if [ -z "$XDG_CONFIG_HOME" ]; then
 fi
 
 # Ensure the existance of pcmanfm config file
-PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm"
-if [ ! -f "$PCMANFM_CONF_DIR/default/LXDE.conf" ]; then
+PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm/LXDE"
+if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then
        mkdir -p "$PCMANFM_CONF_DIR"
-       cp @prefix@/share/lxde/pcmanfm/LXDE.conf "$PCMANFM_CONF_DIR/default/LXDE.conf"
+       cp @prefix@/share/lxde/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf"
 fi
 
 # Ensure the existance of openbox config file