shuffling data around - i had waay too much heirachy before.. too complex.

keep it simple. will eventually have e_setup copy the defaults into your
homedir anyway...

SVN revision: 5718

diff --git a/autogen.sh b/autogen.sh
index 844e878..e1f3400 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -148,7 +148,7 @@ else
 fi
 
 
-cd data/config/appearance/default/borders/
+cd data/borders/
 cd borderless
 ln -sf selected-0.sticky-0.shaded-0.bits.db selected-1.sticky-0.shaded-0.bits.db
 ln -sf selected-0.sticky-0.shaded-0.bits.db selected-0.sticky-1.shaded-0.bits.db

diff --git a/data/config/appearance/default/borders/borderless/selected-0.sticky-0.shaded-0.bits.db b/data/borders/borderless/selected-0.sticky-0.shaded-0.bits.db
similarity index 100%
rename from data/config/appearance/default/borders/borderless/selected-0.sticky-0.shaded-0.bits.db
rename to data/borders/borderless/selected-0.sticky-0.shaded-0.bits.db

diff --git a/data/config/appearance/default/borders/default/selected-0.sticky-0.shaded-0.bits.db b/data/borders/default/selected-0.sticky-0.shaded-0.bits.db
similarity index 100%
rename from data/config/appearance/default/borders/default/selected-0.sticky-0.shaded-0.bits.db
rename to data/borders/default/selected-0.sticky-0.shaded-0.bits.db

diff --git a/data/config/appearance/default/borders/default/selected-1.sticky-0.shaded-0.bits.db b/data/borders/default/selected-1.sticky-0.shaded-0.bits.db
similarity index 100%
rename from data/config/appearance/default/borders/default/selected-1.sticky-0.shaded-0.bits.db
rename to data/borders/default/selected-1.sticky-0.shaded-0.bits.db

diff --git a/src/config.c b/src/config.c
index a22ad34..4cb932a 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -61,7 +61,7 @@ e_config_get(char *type)
    E_CONF("apps_menu", cfg_apps_menu_db,
          "%s/behavior/apps_menu.db", e_config_user_dir());
    E_CONF("borders", cfg_borders_db,
-         PACKAGE_DATA_DIR"/data/config/appearance/default/borders/");
+         PACKAGE_DATA_DIR"/data/borders/");
    E_CONF("menus", cfg_menus_dir,
          PACKAGE_DATA_DIR"/data/config/appearance/default/menus/");
    E_CONF("entries", cfg_entries_dir,