comparison src/ui_pathsel.c @ 702:e07895754e65

Drop concat_dir_and_file() and use g_build_filename() instead.

701:28af4b6dd9ef

			if (p - 1 != filepath) p--;
			p[0] = '\0';
			}
		else
			{
			filepath = concat_dir_and_file(path, list->data);
			}

		gtk_list_store_append(store, &iter);
		gtk_list_store_set(store, &iter, 0, list->data, 1, filepath, -1);

			{
			GtkTreeIter iter;
			gchar *filepath;
			const gchar *name = list->data;

			filepath = concat_dir_and_file(path, name);

			gtk_list_store_append(store, &iter);
			gtk_list_store_set(store, &iter, 0, name, 1, filepath, -1);

			g_free(filepath);

	gtk_tree_model_get(model, &iter, 1, &old_path, -1);
	if (!old_path) return FALSE;

	buf = remove_level_from_path(old_path);
	new_path = concat_dir_and_file(buf, new);
	g_free(buf);

	if (isname(new_path))
		{
		buf = g_strdup_printf(_("A file with name %s already exists."), new);

		path = g_strdup(tmp);
		from_text = TRUE;
		}
	else
		{
		buf = concat_dir_and_file(dd->path, _("New folder"));
		path = unique_filename(buf, NULL, " ", FALSE);
		g_free(buf);
		}

	if (!mkdir_utf8(path, 0755))

702:e07895754e65

			if (p - 1 != filepath) p--;
			p[0] = '\0';
			}
		else
			{
			filepath = g_build_filename(path, list->data, NULL);
			}

		gtk_list_store_append(store, &iter);
		gtk_list_store_set(store, &iter, 0, list->data, 1, filepath, -1);

			{
			GtkTreeIter iter;
			gchar *filepath;
			const gchar *name = list->data;

			filepath = g_build_filename(path, name, NULL);

			gtk_list_store_append(store, &iter);
			gtk_list_store_set(store, &iter, 0, name, 1, filepath, -1);

			g_free(filepath);

	gtk_tree_model_get(model, &iter, 1, &old_path, -1);
	if (!old_path) return FALSE;

	buf = remove_level_from_path(old_path);
	new_path = g_build_filename(buf, new, NULL);
	g_free(buf);

	if (isname(new_path))
		{
		buf = g_strdup_printf(_("A file with name %s already exists."), new);

		path = g_strdup(tmp);
		from_text = TRUE;
		}
	else
		{
		buf = g_build_filename(dd->path, _("New folder"), NULL);
		path = unique_filename(buf, NULL, " ", FALSE);
		g_free(buf);
		}

	if (!mkdir_utf8(path, 0755))