Comment 10 for bug 686564

Revision history for this message
Fabounet (fabounet03) wrote : Re: [Bug 686564] Re: Trash not emptied with folders from other partitions

you're perfectly right, thanks ! :-)
by the way I've commited a patch for the '%' problem too.

2011/1/27 Tsu Jan <email address hidden>

> I'm afraid you've put the following line at a wrong position after "if
> (cFileName && *cFileName == '\\')" in cairo-dock-gio-vfs.c:
>
> g_file_delete (file, NULL, &erreur);
>
> It should be below this conditional:
>
> if (iFileType == G_FILE_TYPE_DIRECTORY)
> {
> _cairo_dock_gio_vfs_empty_dir (sFileUri->str);
> }
>
> Otherwise, only the contents of a (nonempty) folder -- and not the
> folder itself -- would be deleted on emptying the trash of another
> volume.
>
> --
> You received this bug notification because you are a bug assignee.
> https://bugs.launchpad.net/bugs/686564
>
> Title:
> Trash not emptied with folders from other partitions
>
> Status in Cairo-Dock : Plug-ins:
> Fix Committed
>
> Bug description:
> When a folder from a partition other than the home partition is put
> into the trash, the trash can't be emptied with middle-clicking on the
> dustbin applet. I get an error like this:
>
> ------------------
> vfs.c:cairo_dock_gio_vfs_empty_trash:1624) [0m
> gnome_integration : Error removing file: Directory not empty
> GError set over the top of a previous GError or uninitialized memory.
> This indicates a bug in someone's code. You must ensure an error is NULL
> before it's set.
> The overwriting error message was: Error removing file: No such file or
> directory
> ------------------
>
> The GError part can be fixed by using "g_file_delete (file, NULL,
> NULL)" in that section of the function
> "cairo_dock_gio_vfs_empty_trash", which is related to the deletion of
> info files.
>
> To fix "Error removing file: Directory not empty", in the same
> function, I added "G_FILE_ATTRIBUTE_STANDARD_TYPE" to "cAttributes"
> and set the following condition in a proper place:
>
> if (iFileType == G_FILE_TYPE_DIRECTORY)
>
> {
>
> cairo_dock_gio_vfs_empty_dir (sFileUri->str);
>
> }
>
> I've attached a patch.
>
>
>