wp
/
xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

filebrowser: don't use deprecated GIOScheduler 

2d1eb80d3d
This commit is contained in:
JosephMcc 2017-02-13 20:24:42 -08:00
parent 9637840886
commit 87238194c3
1 changed files with 106 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

206
plugins/filebrowser/xed-file-browser-store.c
View File

@ -131,12 +131,12 @@ static FileBrowserNode *model_find_node (XedFileBrowserStore *model,
FileBrowserNode *node, FileBrowserNode *node,
GFile *uri); GFile *uri);
static void model_remove_node (XedFileBrowserStore *model, static void model_remove_node (XedFileBrowserStore *model,
FileBrowserNode *node, FileBrowserNode *node,
GtkTreePath *path, GtkTreePath *path,
gboolean free_nodes); gboolean free_nodes);
static void set_virtual_root_from_node (XedFileBrowserStore *model, static void set_virtual_root_from_node (XedFileBrowserStore *model,
FileBrowserNode *node); FileBrowserNode *node);
static void xed_file_browser_store_iface_init (GtkTreeModelIface *iface); static void xed_file_browser_store_iface_init (GtkTreeModelIface *iface);
static GtkTreeModelFlags xed_file_browser_store_get_flags (GtkTreeModel *tree_model); static GtkTreeModelFlags xed_file_browser_store_get_flags (GtkTreeModel *tree_model);
@ -158,42 +158,44 @@ static gboolean xed_file_browser_store_iter_children (GtkTreeModel *tree_model,
GtkTreeIter *iter, GtkTreeIter *iter,
GtkTreeIter *parent); GtkTreeIter *parent);
static gboolean xed_file_browser_store_iter_has_child (GtkTreeModel *tree_model, static gboolean xed_file_browser_store_iter_has_child (GtkTreeModel *tree_model,
GtkTreeIter *iter); GtkTreeIter *iter);
static gint xed_file_browser_store_iter_n_children (GtkTreeModel *tree_model, static gint xed_file_browser_store_iter_n_children (GtkTreeModel *tree_model,
GtkTreeIter * iter); GtkTreeIter *iter);
static gboolean xed_file_browser_store_iter_nth_child (GtkTreeModel * tree_model, static gboolean xed_file_browser_store_iter_nth_child (GtkTreeModel *tree_model,
GtkTreeIter * iter, GtkTreeIter *iter,
GtkTreeIter * parent, GtkTreeIter *parent,
gint n); gint n);
static gboolean xed_file_browser_store_iter_parent (GtkTreeModel * tree_model, static gboolean xed_file_browser_store_iter_parent (GtkTreeModel *tree_model,
GtkTreeIter * iter, GtkTreeIter *iter,
GtkTreeIter * child); GtkTreeIter *child);
static void xed_file_browser_store_row_inserted (GtkTreeModel * tree_model, static void xed_file_browser_store_row_inserted (GtkTreeModel *tree_model,
GtkTreePath * path, GtkTreePath *path,
GtkTreeIter * iter); GtkTreeIter *iter);
static void xed_file_browser_store_drag_source_init (GtkTreeDragSourceIface * iface); static void xed_file_browser_store_drag_source_init (GtkTreeDragSourceIface *iface);
static gboolean xed_file_browser_store_row_draggable (GtkTreeDragSource * drag_source, static gboolean xed_file_browser_store_row_draggable (GtkTreeDragSource *drag_source,
GtkTreePath * path); GtkTreePath *path);
static gboolean xed_file_browser_store_drag_data_delete (GtkTreeDragSource * drag_source, static gboolean xed_file_browser_store_drag_data_delete (GtkTreeDragSource *drag_source,
GtkTreePath * path); GtkTreePath *path);
static gboolean xed_file_browser_store_drag_data_get (GtkTreeDragSource * drag_source, static gboolean xed_file_browser_store_drag_data_get (GtkTreeDragSource *drag_source,
GtkTreePath * path, GtkTreePath *path,
GtkSelectionData * selection_data); GtkSelectionData *selection_data);
static void file_browser_node_free (XedFileBrowserStore * model, static void file_browser_node_free (XedFileBrowserStore *model,
FileBrowserNode * node); FileBrowserNode *node);
static void model_add_node (XedFileBrowserStore * model, static void model_add_node (XedFileBrowserStore *model,
FileBrowserNode * child, FileBrowserNode *child,
FileBrowserNode * parent); FileBrowserNode *parent);
static void model_clear (XedFileBrowserStore * model, static void model_clear (XedFileBrowserStore *model,
gboolean free_nodes); gboolean free_nodes);
static gint model_sort_default (FileBrowserNode * node1, static gint model_sort_default (FileBrowserNode *node1,
FileBrowserNode * node2); FileBrowserNode *node2);
static void model_check_dummy (XedFileBrowserStore * model, static void model_check_dummy (XedFileBrowserStore *model,
FileBrowserNode * node); FileBrowserNode *node);
static void next_files_async (GFileEnumerator * enumerator, static void next_files_async (GFileEnumerator *enumerator,
AsyncNode * async); AsyncNode *async);
static void delete_files (AsyncData *data);
G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedFileBrowserStore, xed_file_browser_store, G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedFileBrowserStore, xed_file_browser_store,
G_TYPE_OBJECT, G_TYPE_OBJECT,
@ -3655,93 +3657,101 @@ emit_no_trash (AsyncData *data)
return ret; return ret;
} }
typedef struct static void
delete_file_finished (GFile *file,
GAsyncResult *res,
AsyncData *data)
{ {
XedFileBrowserStore *model;
GFile *file;
} IdleDelete;
static gboolean
file_deleted (IdleDelete *data)
{
FileBrowserNode *node;
node = model_find_node (data->model, NULL, data->file);
if (node != NULL)
{
model_remove_node (data->model, node, NULL, TRUE);
}
return FALSE;
}
static gboolean
delete_files (GIOSchedulerJob *job,
GCancellable *cancellable,
AsyncData *data)
{
GFile *file;
GError *error = NULL; GError *error = NULL;
gboolean ret; gboolean ok;
gint code;
IdleDelete delete;
/* Check if our job is done */
if (!data->iter)
{
return FALSE;
}
/* Move a file to the trash */
file = G_FILE (data->iter->data);
if (data->trash) if (data->trash)
{ {
ret = g_file_trash (file, cancellable, &error); ok = g_file_trash_finish (file, res, &error);
} }
else else
{ {
ret = g_file_delete (file, cancellable, &error); ok = g_file_delete_finish (file, res, &error);
} }
if (ret) if (ok)
{ {
delete.model = data->model; /* Remove the file from the model */
delete.file = file; FileBrowserNode *node = model_find_node (data->model, NULL, file);
/* Remove the file from the model in the main loop */ if (node != NULL)
g_io_scheduler_job_send_to_mainloop (job, (GSourceFunc)file_deleted, &delete, NULL); {
model_remove_node (data->model, node, NULL, TRUE);
}
/* Process the next file */
data->iter = data->iter->next;
} }
else if (!ret && error) else if (!ok && error != NULL)
{ {
code = error->code; gint code = error->code;
g_error_free (error); g_error_free (error);
if (data->trash && code == G_IO_ERROR_NOT_SUPPORTED) if (data->trash && code == G_IO_ERROR_NOT_SUPPORTED)
{ {
/* Trash is not supported on this system ... */ /* Trash is not supported on this system. Ask the user
if (g_io_scheduler_job_send_to_mainloop (job, (GSourceFunc)emit_no_trash, data, NULL)) * if he wants to delete completely the files instead.
*/
if (emit_no_trash (data))
{ {
/* Changes this into a delete job */ /* Changes this into a delete job */
data->trash = FALSE; data->trash = FALSE;
data->iter = data->files; data->iter = data->files;
return TRUE;
} }
else
/* End the job */ {
return FALSE; /* End the job */
async_data_free (data);
return;
}
} }
else if (code == G_IO_ERROR_CANCELLED) else if (code == G_IO_ERROR_CANCELLED)
{ {
/* Job has been cancelled, just let the job end */ /* Job has been cancelled, end the job */
return FALSE; async_data_free (data);
return;
} }
} }
/* Process the next item */ /* Continue the job */
data->iter = data->iter->next; delete_files (data);
return TRUE; }
static void
delete_files (AsyncData *data)
{
GFile *file;
/* Check if our job is done */
if (data->iter == NULL)
{
async_data_free (data);
return;
}
file = G_FILE (data->iter->data);
if (data->trash)
{
g_file_trash_async (file,
G_PRIORITY_DEFAULT,
data->cancellable,
(GAsyncReadyCallback)delete_file_finished,
data);
}
else
{
g_file_delete_async (file,
G_PRIORITY_DEFAULT,
data->cancellable,
(GAsyncReadyCallback)delete_file_finished,
data);
}
} }
XedFileBrowserStoreResult XedFileBrowserStoreResult
@ -3801,11 +3811,7 @@ xed_file_browser_store_delete_all (XedFileBrowserStore *model,
model->priv->async_handles = g_slist_prepend (model->priv->async_handles, data); model->priv->async_handles = g_slist_prepend (model->priv->async_handles, data);
g_io_scheduler_push_job ((GIOSchedulerJobFunc)delete_files, delete_files (data);
data,
(GDestroyNotify)async_data_free,
G_PRIORITY_DEFAULT,
data->cancellable);
g_list_free (rows); g_list_free (rows);
return XED_FILE_BROWSER_STORE_RESULT_OK; return XED_FILE_BROWSER_STORE_RESULT_OK;