X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=8b1b39a876e3ea84cc6cde1800edb4df3bdf026a;hp=49f8f46f523742eab96346103830b5dadc9b3416;hb=786010c598f79d20280e6ea9ea458cad4a7e9af7;hpb=a1e58132eacf841001b1caf29ea6964e3e28adfd

diff --git a/gui.c b/gui.c
index 49f8f46f..8b1b39a8 100644
--- a/gui.c
+++ b/gui.c
@@ -61,7 +61,7 @@ static pid_t external_cmd_pid;
 
 static int command_pipe = -1;
 static int audiod_pipe = -1;
-static struct gengetopt_args_info conf;
+static struct gui_args_info conf;
 
 enum {GETCH_MODE, COMMAND_MODE, EXTERNAL_MODE};
 
@@ -1157,8 +1157,8 @@ static void com_reread_conf(void)
 		return;
 	}
 	PARA_INFO_LOG("%s", "rereading command line options and config file");
-	cmdline_parser(_argc, _argv, &conf);
-	cmdline_parser_configfile(cf, &conf, 1, 1, 0);
+	gui_cmdline_parser(_argc, _argv, &conf);
+	gui_cmdline_parser_configfile(cf, &conf, 1, 1, 0);
 	PARA_NOTICE_LOG("%s", "configuration read");
 	if (check_key_map_args() < 0)
 		finish(EXIT_FAILURE);
@@ -1315,7 +1315,7 @@ int main(int argc, char *argv[])
 	_argc = argc;
 	_argv = argv;
 
-	if (cmdline_parser(argc, argv, &conf)) {
+	if (gui_cmdline_parser(argc, argv, &conf)) {
 		fprintf(stderr, "parse error while reading command line\n");
 		exit(EXIT_FAILURE);
 	}
@@ -1332,7 +1332,7 @@ int main(int argc, char *argv[])
 		exit(EXIT_FAILURE);
 	}
 	if (cf)
-		cmdline_parser_configfile(cf, &conf, 0, 0, 0);
+		gui_cmdline_parser_configfile(cf, &conf, 0, 0, 0);
 	if (check_key_map_args() < 0) {
 		fprintf(stderr, "invalid key map in config file\n");
 		exit(EXIT_FAILURE);