comparison src/view_file_icon.c @ 111:3a69a7a3f461

Wed Nov 15 02:05:27 2006 John Ellis <[e-mail]> * view_file_icon.c: Fix odd crash when removing files, it seems the high priority idle sync is no longer called before the treeview tries to redraw itself, so fix the cleanup of removed pointers so that they are always valid or NULL (I wonder if the priorities used by GtkTreeView have changed in newer versions of GTK?). * view_file_list.c: Fix progress bar warning when files are removed before thumbnail generation is finished.

110:9fbf210edc6f

/*
 * GQview
 * (C) 2004 John Ellis
 *
 * Author: John Ellis
 *
 * This software is released under the GNU General Public License (GNU GPL).
 * Please read the included file COPYING for more information.

typedef struct _IconData IconData;
struct _IconData
{
	FileData fd;
	SelectionType selected;
};


static gint iconlist_read(const gchar *path, GList **list)
{

		fd = work->data;
		id = g_new0(IconData, 1);

		memcpy(id, fd, sizeof(FileData));
		id->selected = SELECTION_NONE;

		work->data = id;
		g_free(fd);

		work = work->next;

		row++;

		list = vficon_add_row(vfi, &iter);
		while (work && list)
			{
			list->data = work->data;
			list = list->next;
			work = work->next;
			}
		}

			}
		
		while (list)
			{
			FileData *fd;
			if (work)
				{
				fd = work->data;
				work = work->next;
				c++;
				}
			else
				{
				fd = NULL;
				}
			if (list)
				{
				list->data = fd;
				list = list->next;
				}
			}
		}

	r++;
	while (gtk_tree_model_iter_nth_child(store, &iter, NULL, r))

		fd->path = g_strdup(dest);
		fd->name = filename_from_path(fd->path);

		vfi->list = filelist_insert_sort(vfi->list, fd, vfi->sort_method, vfi->sort_ascend);

		vficon_sync(vfi);
		ret = TRUE;
		}
	else
		{
		ret = vficon_maint_removed(vfi, source, NULL);

			}
		}

	/* Thumb loader check */
	if (fd == vfi->thumbs_fd) vfi->thumbs_fd = NULL;

	if (vfi->prev_selection == fd) vfi->prev_selection = NULL;
	if (vfi->click_fd == fd) vfi->click_fd = NULL;

	/* remove pointer to this fd from grid */
	store = gtk_tree_view_get_model(GTK_TREE_VIEW(vfi->listview));
	if (gtk_tree_model_iter_nth_child(store, &iter, NULL, row / vfi->columns))
		{
		GList *list;

		gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &list, -1);
		list = g_list_find(list, fd);

111:3a69a7a3f461

/*
 * GQview
 * (C) 2006 John Ellis
 *
 * Author: John Ellis
 *
 * This software is released under the GNU General Public License (GNU GPL).
 * Please read the included file COPYING for more information.

typedef struct _IconData IconData;
struct _IconData
{
	FileData fd;
	SelectionType selected;
	gint row;
};


static gint iconlist_read(const gchar *path, GList **list)
{

		fd = work->data;
		id = g_new0(IconData, 1);

		memcpy(id, fd, sizeof(FileData));
		id->selected = SELECTION_NONE;
		id->row = -1;

		work->data = id;
		g_free(fd);

		work = work->next;

		row++;

		list = vficon_add_row(vfi, &iter);
		while (work && list)
			{
			FileData *fd;

			fd = work->data;
			ICON_DATA(fd)->row = row;

			list->data = work->data;
			list = list->next;
			work = work->next;
			}
		}

			}
		
		while (list)
			{
			FileData *fd;

			if (work)
				{
				fd = work->data;
				work = work->next;
				c++;

				ICON_DATA(fd)->row = r;
				}
			else
				{
				fd = NULL;
				}

			list->data = fd;
			list = list->next;
			}
		}

	r++;
	while (gtk_tree_model_iter_nth_child(store, &iter, NULL, r))

		fd->path = g_strdup(dest);
		fd->name = filename_from_path(fd->path);

		vfi->list = filelist_insert_sort(vfi->list, fd, vfi->sort_method, vfi->sort_ascend);

		vficon_sync_idle(vfi);
		ret = TRUE;
		}
	else
		{
		ret = vficon_maint_removed(vfi, source, NULL);

			}
		}

	/* Thumb loader check */
	if (fd == vfi->thumbs_fd) vfi->thumbs_fd = NULL;
	if (vfi->thumbs_count > 0) vfi->thumbs_count--;

	if (vfi->prev_selection == fd) vfi->prev_selection = NULL;
	if (vfi->click_fd == fd) vfi->click_fd = NULL;

	/* remove pointer to this fd from grid */
	store = gtk_tree_view_get_model(GTK_TREE_VIEW(vfi->listview));
	if (ICON_DATA(fd)->row >= 0 &&
	    gtk_tree_model_iter_nth_child(store, &iter, NULL, ICON_DATA(fd)->row))
		{
		GList *list;

		gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &list, -1);
		list = g_list_find(list, fd);