comparison src/main.c @ 742:a336b5545af6

Pass ConfOptions * to save_options() and load_options().

741:0e8b802e54d5

	remote_close(remote_connection);

	collect_manager_flush();

	sync_options_with_current_state(options);
	save_options();
	keys_save();

	path = g_build_filename(homedir(), GQ_RC_DIR, "accels", NULL);
	pathl = path_from_utf8(path);
	gtk_accel_map_save(pathl);

#endif
	parse_command_line_for_debug_option(argc, argv);

	options = init_options(NULL);
	setup_default_options(options);
	load_options();

	parse_command_line(argc, argv, &cmd_path, &cmd_file, &cmd_list, &collection_list, &geometry);

	gtk_init(&argc, &argv);

742:a336b5545af6

	remote_close(remote_connection);

	collect_manager_flush();

	sync_options_with_current_state(options);
	save_options(options);
	keys_save();

	path = g_build_filename(homedir(), GQ_RC_DIR, "accels", NULL);
	pathl = path_from_utf8(path);
	gtk_accel_map_save(pathl);

#endif
	parse_command_line_for_debug_option(argc, argv);

	options = init_options(NULL);
	setup_default_options(options);
	load_options(options);

	parse_command_line(argc, argv, &cmd_path, &cmd_file, &cmd_list, &collection_list, &geometry);

	gtk_init(&argc, &argv);