comparison src/pan-view.c @ 767:e73d30e0c896

Make utf8_validate_or_convert() to always allocate a new string.

766:7148e125bf23

	for (i = 0; ExifUIList[i].key; i++)
		{
		gchar *label;
		gchar *text;

		if (ExifUIList[i].current == EXIF_UI_OFF) continue;

		text = exif_get_data_as_text(exif, ExifUIList[i].key);
		text = utf8_validate_or_convert(text);
		if (ExifUIList[i].current == EXIF_UI_IFSET && (!text || !*text))
			{
			if (text) g_free(text);
			continue;
			}

		label = g_strdup_printf("%s:", exif_get_description_by_key(ExifUIList[i].key));
		pan_text_alignment_add(ta, label, text);
		g_free(label);
		g_free(text);
		}

	work = g_list_last(history_list_get_by_key("exif_extras"));
	if (work) pan_text_alignment_add(ta, "---", NULL);
	while (work)
		{
		const gchar *name;
		gchar *label;
		gchar *text;

		name = work->data;
		work = work->prev;

		label = g_strdup_printf("%s:", name);
		text = exif_get_data_as_text(exif, name);
		text = utf8_validate_or_convert(text);
		pan_text_alignment_add(ta, label, text);
		g_free(label);
		g_free(text);
		}

	exif_free(exif);
}

767:e73d30e0c896

	for (i = 0; ExifUIList[i].key; i++)
		{
		gchar *label;
		gchar *text;
		gchar *utf8_text;

		if (ExifUIList[i].current == EXIF_UI_OFF) continue;

		text = exif_get_data_as_text(exif, ExifUIList[i].key);
		if (ExifUIList[i].current == EXIF_UI_IFSET && (!text || !*text))
			{
			g_free(text);
			continue;
			}
		
		label = g_strdup_printf("%s:", exif_get_description_by_key(ExifUIList[i].key));
		utf8_text = utf8_validate_or_convert(text);
		g_free(text);
		pan_text_alignment_add(ta, label, utf8_text);
		g_free(label);
		g_free(utf8_text);
		}

	work = g_list_last(history_list_get_by_key("exif_extras"));
	if (work) pan_text_alignment_add(ta, "---", NULL);
	while (work)
		{
		const gchar *name;
		gchar *text;

		name = work->data;
		work = work->prev;

		text = exif_get_data_as_text(exif, name);
		if (text)
			{
			gchar *label = g_strdup_printf("%s:", name);
			gchar *utf8_text = utf8_validate_or_convert(text);

			g_free(text);
			pan_text_alignment_add(ta, label, utf8_text);
			g_free(label);
			g_free(utf8_text);
			}
		}

	exif_free(exif);
}