comparison src/view_dir_tree.c @ 407:3a9074e73f53

Rename vd_drop_update() to vd_dnd_drop_update(). Add two function pointers to ViewDir struct to keep vdtree_dnd_drop_expand_cancel() and vdtree_dnd_drop_expand() static to view_dir_tree.c.

406:8e6f5bbe7843

	VDTREE_INFO(vd, drop_expand_id) = -1;
	return FALSE;
}

void vdtree_dnd_drop_expand_cancel(ViewDir *vd)
{
	if (VDTREE_INFO(vd, drop_expand_id) != -1) g_source_remove(VDTREE_INFO(vd, drop_expand_id));
	VDTREE_INFO(vd, drop_expand_id) = -1;
}

void vdtree_dnd_drop_expand(ViewDir *vd)
{
	vdtree_dnd_drop_expand_cancel(vd);
	VDTREE_INFO(vd, drop_expand_id) = g_timeout_add(1000, vdtree_dnd_drop_expand_cb, vd);
}

	vd->info = g_new0(ViewDirInfoTree, 1);
	vd->type = DIRVIEW_TREE;

	VDTREE_INFO(vd, drop_expand_id) = -1;

	VDTREE_INFO(vd, busy_ref) = 0;

	store = gtk_tree_store_new(4, G_TYPE_POINTER, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT);
	vd->view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
	g_object_unref(store);

407:3a9074e73f53

	VDTREE_INFO(vd, drop_expand_id) = -1;
	return FALSE;
}

static void vdtree_dnd_drop_expand_cancel(ViewDir *vd)
{
	if (VDTREE_INFO(vd, drop_expand_id) != -1) g_source_remove(VDTREE_INFO(vd, drop_expand_id));
	VDTREE_INFO(vd, drop_expand_id) = -1;
}

static void vdtree_dnd_drop_expand(ViewDir *vd)
{
	vdtree_dnd_drop_expand_cancel(vd);
	VDTREE_INFO(vd, drop_expand_id) = g_timeout_add(1000, vdtree_dnd_drop_expand_cb, vd);
}

	vd->info = g_new0(ViewDirInfoTree, 1);
	vd->type = DIRVIEW_TREE;

	VDTREE_INFO(vd, drop_expand_id) = -1;
	VDTREE_INFO(vd, busy_ref) = 0;
	
	vd->dnd_drop_leave_func = vdtree_dnd_drop_expand_cancel;
	vd->dnd_drop_update_func = vdtree_dnd_drop_expand;

	store = gtk_tree_store_new(4, G_TYPE_POINTER, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT);
	vd->view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
	g_object_unref(store);