commit 9a206c4da528b49debcda522b5001e0aeb095b87
author Tiago Vignatti <tiago.vignatti@intel.com> Wed Mar 21 19:49:18 2012 +0200
committer Kristian Høgsberg <krh@bitplanet.net> Sun Mar 25 08:49:30 2012 -0400
tree ece9205487c4e79d66a40fb192b83bd9c1a1bc9d
parent 6bd4d97271c4c03c9719f1e23df025306855afc8

config-parser: consolidate shell files into weston.ini only

The shell choice happens in the configuration file now.

Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>

src/shell.c

diff --git a/src/shell.c b/src/shell.c
index a262b4f..ea3d0bf 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -164,7 +164,7 @@
 		{ "screensaver", saver_keys, ARRAY_LENGTH(saver_keys), NULL },
 	};
 
-	config_file = config_file_path("weston-desktop-shell.ini");
+	config_file = config_file_path("weston.ini");
 	parse_config_file(config_file, cs, ARRAY_LENGTH(cs), shell);
 	free(config_file);