comparison src/rcfile.c @ 768:ff51413f098d

Use functions to set editors name and command and ensure they are utf8-encoded. Previously, non-utf8 strings from rc file caused some issues.

767:e73d30e0c896

#include "main.h"
#include "rcfile.h"

#include "bar_exif.h"
#include "filefilter.h"
#include "secure_save.h"
#include "slideshow.h"
#include "ui_fileops.h"

		if (is_numbered_option(option, "external_", &i))
			{
			if (i > 0 && i <= GQ_EDITOR_SLOTS)
				{
				const gchar *ptr;
				i--;
				g_free(options->editor[i].name);
				g_free(options->editor[i].command);

				options->editor[i].name = quoted_value(value_all, &ptr);
				options->editor[i].command = quoted_value(ptr, NULL);
				}
			continue;
			}

		/* Exif */

768:ff51413f098d

#include "main.h"
#include "rcfile.h"

#include "bar_exif.h"
#include "editors.h"
#include "filefilter.h"
#include "secure_save.h"
#include "slideshow.h"
#include "ui_fileops.h"

		if (is_numbered_option(option, "external_", &i))
			{
			if (i > 0 && i <= GQ_EDITOR_SLOTS)
				{
				const gchar *ptr;

				i--;
				editor_set_name(i, quoted_value(value_all, &ptr));
				editor_set_command(i, quoted_value(ptr, NULL));
				}
			continue;
			}

		/* Exif */