X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=sdl_gui.c;h=d30aad80529d32b76f3015da3452daae3fcca4fe;hp=97d0573a8e3b455a95e26139a9c1ee30c30682e8;hb=024a12e75bea8695a02e2abb43eb0d77cb04f144;hpb=5300484cb626468430d74d7b2c11387e1e9630d0

diff --git a/sdl_gui.c b/sdl_gui.c
index 97d0573a..d30aad80 100644
--- a/sdl_gui.c
+++ b/sdl_gui.c
@@ -1,25 +1,13 @@
 /*
- * Copyright (C) 2003-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2003-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file sdl_gui.c SDL-based interface for paraslash */
 
 #include "para.h"
-#include "string.h"
+#include "gui_common.h"
 #include "fd.h"
 
 
@@ -672,17 +660,18 @@ static void do_update(int i)
  * Check if buf is a known status line. If so call do_update and return 1.
  * Return 0 otherwise.
  */
-void update_status(char *buf)
+int update_status(char *buf, __a_unused void *data)
 {
 	int i;
 
 	i = stat_line_valid(buf);
 	if (i < 0)
-		return;
+		return 1;
 	//free(stat_items[i].content);
 	stat_items[i].content = para_strdup(buf +
 		strlen(status_item_list[i]) + 1);
 	do_update(i);
+	return 1;
 }
 
 /*
@@ -743,6 +732,7 @@ int main(int argc, char *argv[])
 	SDLKey sym;
 
 	sdl_gui_cmdline_parser(argc, argv, &args_info);
+	HANDLE_VERSION_FLAG("sdl_gui", args_info);
 	ret = configfile_exists();
 //	printf("w=%i,h=%i,ret=%i, cf=%s\n", width, height, ret, args_info.config_file_arg);
 
@@ -751,9 +741,16 @@ int main(int argc, char *argv[])
 			args_info.config_file_arg);
 		exit(EXIT_FAILURE);
 	}
-	if (ret)
-		sdl_gui_cmdline_parser_configfile(args_info.config_file_arg,
-			&args_info, 0, 0, 0);
+	if (ret) {
+		struct sdl_gui_cmdline_parser_params params = {
+			.override = 0,
+			.initialize = 0,
+			.check_required = 0,
+			.check_ambiguity = 0
+		};
+		sdl_gui_cmdline_parser_config_file(args_info.config_file_arg,
+			&args_info, &params);
+	}
 	signal(SIGCHLD, SIG_IGN);
 	width = args_info.width_arg;
 	height = args_info.height_arg;