[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-core-devel
Subject: Re: Review Request 120573: [OS X] make KDE's trash use the OS X trash
From: "David Faure" <faure () kde ! org>
Date: 2014-10-18 9:28:07
Message-ID: 20141018092807.21223.79609 () probe ! kde ! org
[Download RAW message or body]
--===============6384293092243087735==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/120573/#review68648
-----------------------------------------------------------
Almost there :-)
Re your earlier comments:
- trashimpl.h is completely internal to the kioslave, adding methods there is no \
problem
- trashForMountPoint is called when trashing a file that is on a different partition \
than HOME. I can see it being called when I do this, on Linux:
cd /tmp
touch foo
export KDE_FORK_SLAVES=1
kde-cp foo trash:/
The debug output from kio_trash (which appears in the same terminal due to the use of \
KDE_FORK_SLAVES=1) says TrashImpl::findTrashDirectory: mountPoint= "/" trashDir= ""
which is one line below the call to trashForMountPoint, and prints out its result. So \
it's called for sure :-)
kioslave/trash/kcmtrash.cpp
<https://git.reviewboard.kde.org/r/120573/#comment47855>
you're right, this didn't exist in Qt4. Please revert to Q_OS_MAC then :-)
kioslave/trash/trashimpl.h
<https://git.reviewboard.kde.org/r/120573/#comment47856>
the comment is wrong, this is called on-demand all over the place. Remove the \
(called from...) part.
kioslave/trash/trashimpl.cpp
<https://git.reviewboard.kde.org/r/120573/#comment47852>
Is this check still needed? We know that every entry in m_trashDirectories ends \
with KDE.trash, now, right?
Or is this "everything but the trash in the home dir"? then better test for that \
explicitely.
endsWith sounds fragile to me, like the code doesn't really know what it should \
be doing, and could get fooled by unexpected naming..
kioslave/trash/trashimpl.cpp
<https://git.reviewboard.kde.org/r/120573/#comment47853>
Looks like path is an optional value, not a modifyable parameter... then don't \
use a pointer, use an empty string as the default value.
[...], const QString &path = QString() );
in the header.
kioslave/trash/trashimpl.cpp
<https://git.reviewboard.kde.org/r/120573/#comment47851>
Eek, a C cast. My eyes bleed. Anyhow you can remove completely, with my above \
suggestion.
kioslave/trash/trashimpl.cpp
<https://git.reviewboard.kde.org/r/120573/#comment47854>
Why not QFileInfo(trashDir).isDir(), to use Qt rather than unportable code?
- David Faure
On Oct. 16, 2014, 10:35 p.m., René J.V. Bertin wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/120573/
> -----------------------------------------------------------
>
> (Updated Oct. 16, 2014, 10:35 p.m.)
>
>
> Review request for KDE Software on Mac OS X, KDE Runtime and David Faure.
>
>
> Repository: kde-runtime
>
>
> Description
> -------
>
> KDE on OS X does not handle the desktop session (no "Plasma") nor can it rely on \
> XDG to obtain the proper paths to use for something like the trash. As a result, \
> all applications that propose to move things they manage to the wastebin (Dolphin, \
> but also digiKam) will store those items in a place that has no particular meaning \
> on OS X, and that will thus tend to fill up.
> OS X stores trash in one of several locations. Files trashed from the boot volume \
> (and/or the volume containing $HOME, I don't actually know that) end up in \
> `~/.Trash`. Files deleted from other volumes end up in \
> `/Volumes/volName/.Trashes/uid`, where volName is the volume name (regardless \
> whether it's an external or a remote drive; only mounted NFS shares are handled \
> differently) and uid the numerical user id. Permissions on `.Trashes` are the same \
> as those expected by KDE.
> The kio_trash kioslave appears to support several actual trash directory locations, \
> just like OS X. `TrashImpl::init()` creates a standard trash in \
> `~/.local/share/Trash` (at least under OS X) but also \
> `TrashImpl::trashForMountPoint()` that is used in cases I have not yet encountered. \
> On OS X, my modified `TrashImpl::init()` sets the standard trash directory to \
> `~/.Trash/KDE.trash` and will create the `files` and `info` subdirectories as \
> required, because they will of course be deleted when the user empties the OS X \
> trash. `TrashImpl::fileRemoved()` has been modified to call a new function, \
> `deleteEmptyTrashInfraStructure` to delete the KDE trash's internal infrastructure \
> when the wastebin is empty so that OS X also sees the trash as emptied. (Since \
> implementing `deleteEmptyTrashInfraStructure` this feature actually works, as \
> expected as far as I can tell).
> Remains to be done:
> - determine in what cases `trashForMountPoint()` is used, and finish the \
> modifications for it to use `/.Trashes/uid/KDE.trash`
>
> Diffs
> -----
>
> kioslave/trash/kcmtrash.cpp f4811fd
> kioslave/trash/trashimpl.h bc68723
> kioslave/trash/trashimpl.cpp 30ee05b
>
> Diff: https://git.reviewboard.kde.org/r/120573/diff/
>
>
> Testing
> -------
>
> On OS X 10.6.8 with kdelibs and kde-runtime git/4.14, using Dolphin. Tested actions \
> are
> - move items to wastebin from $HOME and a directory on a different volume
> - restore items to both places
> - empty wastebin through Dolphin
> - empty OS X trashcan
>
>
> Thanks,
>
> René J.V. Bertin
>
>
--===============6384293092243087735==
MIME-Version: 1.0
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 8bit
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 \
solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;"> \
<tr> <td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/120573/">https://git.reviewboard.kde.org/r/120573/</a>
</td>
</tr>
</table>
<br />
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">Almost there :-)</p> <p style="padding: 0;text-rendering: inherit;margin: \
0;line-height: inherit;white-space: inherit;">Re your earlier \
comments:
- trashimpl.h is completely internal to the kioslave, adding methods there is no \
problem
- trashForMountPoint is called when trashing a file that is on a different partition \
than HOME. I can see it being called when I do this, on Linux:</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;"><div class="codehilite" style="background: \
#f8f8f8"><pre style="line-height: 125%">cd <span style="color: #666666">/</span>tmp \
touch foo export KDE_FORK_SLAVES<span style="color: #666666">=1</span>
kde<span style="color: #666666">-</span>cp foo trash<span style="color: \
#666666">:/</span> </pre></div>
</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">The debug output from kio_trash (which appears in the \
same terminal due to the use of KDE_FORK_SLAVES=1) says \
TrashImpl::findTrashDirectory: mountPoint= "/" trashDir= "" which is one line below \
the call to trashForMountPoint, and prints out its result. So it's called for sure \
:-)</p></pre> <br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="https://git.reviewboard.kde.org/r/120573/diff/8/?file=320048#file320048line219" \
style="color: black; font-weight: bold; text-decoration: \
underline;">kioslave/trash/kcmtrash.cpp</a> <span style="font-weight: normal;">
(Diff revision 8)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">void \
TrashConfigModule::writeConfig()</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">219</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span \
class="cp">#ifdef Q_OS_OSX</span></pre></td> </tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">you're right, this didn't exist in Qt4. Please revert to Q_OS_MAC then \
:-)</p></pre> </div>
</div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="https://git.reviewboard.kde.org/r/120573/diff/8/?file=320049#file320049line163" \
style="color: black; font-weight: bold; text-decoration: \
underline;">kioslave/trash/trashimpl.h</a> <span style="font-weight: normal;">
(Diff revision 8)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; \
">private:</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">163</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="c1">// create the trash infrastructure (called from TrashImpl::init); also \
called</span></pre></td> </tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">the \
comment is wrong, this is called on-demand all over the place. Remove the (called \
from...) part.</p></pre> </div>
</div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="https://git.reviewboard.kde.org/r/120573/diff/8/?file=320050#file320050line149" \
style="color: black; font-weight: bold; text-decoration: \
underline;">kioslave/trash/trashimpl.cpp</a> <span style="font-weight: normal;">
(Diff revision 8)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">149</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="k">if</span> <span class="p">(</span> <span class="n">trashPath</span><span \
class="p">.</span><span class="n">endsWith</span><span class="p">(</span><span \
class="n">QString</span><span class="o">::</span><span \
class="n">fromLatin1</span><span class="p">(</span><span \
class="s">"/KDE.trash"</span><span class="p">))</span> <span \
class="p">)</span> <span class="p">{</span></pre></td> </tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Is \
this check still needed? We know that every entry in m_trashDirectories ends with \
KDE.trash, now, right?</p> <p style="padding: 0;text-rendering: inherit;margin: \
0;line-height: inherit;white-space: inherit;">Or is this "everything but the trash in \
the home dir"? then better test for that explicitely.</p> <p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">endsWith sounds fragile to me, like the code doesn't really know what it \
should be doing, and could get fooled by unexpected naming..</p></pre> </div>
</div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="https://git.reviewboard.kde.org/r/120573/diff/8/?file=320050#file320050line159" \
style="color: black; font-weight: bold; text-decoration: \
underline;">kioslave/trash/trashimpl.cpp</a> <span style="font-weight: normal;">
(Diff revision 8)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">159</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">QString</span> <span class="n">trashDir</span> <span class="o">=</span> \
<span class="p">(</span><span class="n">path</span><span class="p">)</span><span \
class="o">?</span> <span class="o">*</span><span class="n">path</span> <span \
class="o">:</span> <span class="n">trashDirectoryPath</span><span \
class="p">(</span><span class="n">trashId</span><span class="p">);</span></pre></td> \
</tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Looks \
like path is an optional value, not a modifyable parameter... then don't use a \
pointer, use an empty string as the default value.</p> <p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">[...], const QString &path = QString() ); in the header.</p></pre>
</div>
</div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="https://git.reviewboard.kde.org/r/120573/diff/8/?file=320050#file320050line194" \
style="color: black; font-weight: bold; text-decoration: \
underline;">kioslave/trash/trashimpl.cpp</a> <span style="font-weight: normal;">
(Diff revision 8)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">152</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="kt">int</span> <span class="n">err</span><span class="p">;</span></pre></td> \
<th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">194</font></th> <td bgcolor="#fdfebc" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="k">if</span> <span class="p">(</span><span class="o">!</span><span \
class="n">createTrashInfraStructure</span><span class="p">(</span><span \
class="mi">0</span><span class="p">,</span> <span class="p">(</span><span \
class="n">QString</span><span class="o">*</span><span class="p">)</span><span \
class="o">&</span><span class="n">trashDir</span><span class="p">))</span> <span \
class="p">{</span></pre></td> </tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Eek, \
a C cast. My eyes bleed. Anyhow you can remove completely, with my above \
suggestion.</p></pre> </div>
</div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="https://git.reviewboard.kde.org/r/120573/diff/8/?file=320050#file320050line207" \
style="color: black; font-weight: bold; text-decoration: \
underline;">kioslave/trash/trashimpl.cpp</a> <span style="font-weight: normal;">
(Diff revision 8)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">201</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="kt">DIR</span> <span class="o">*</span><span class="n">dp</span> <span \
class="o">=</span> <span class="n">opendir</span><span class="p">(</span> <span \
class="n">QFile</span><span class="o">::</span><span class="n">encodeName</span><span \
class="p">(</span><span class="n">trashDir</span><span class="p">)</span> <span \
class="p">);</span></pre></td> </tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Why \
not QFileInfo(trashDir).isDir(), to use Qt rather than unportable code?</p></pre> \
</div> </div>
<br />
<p>- David Faure</p>
<br />
<p>On October 16th, 2014, 10:35 p.m. UTC, René J.V. Bertin wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: \
1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; \
-webkit-border-radius: 6px;"> <tr>
<td>
<div>Review request for KDE Software on Mac OS X, KDE Runtime and David Faure.</div>
<div>By René J.V. Bertin.</div>
<p style="color: grey;"><i>Updated Oct. 16, 2014, 10:35 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kde-runtime
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">KDE on OS X does not handle the desktop session (no \
"Plasma") nor can it rely on XDG to obtain the proper paths to use for something like \
the trash. As a result, all applications that propose to move things they manage to \
the wastebin (Dolphin, but also digiKam) will store those items in a place that has \
no particular meaning on OS X, and that will thus tend to fill up.</p> <p \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">OS X stores trash in one of several locations. Files trashed from the boot \
volume (and/or the volume containing $HOME, I don't actually know that) end up in \
<code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: \
normal;margin: 0;line-height: inherit;">~/.Trash</code>. Files deleted from other \
volumes end up in <code style="text-rendering: inherit;color: #4444cc;padding: \
0;white-space: normal;margin: 0;line-height: \
inherit;">/Volumes/volName/.Trashes/uid</code>, where volName is the volume name \
(regardless whether it's an external or a remote drive; only mounted NFS shares are \
handled differently) and uid the numerical user id. Permissions on <code \
style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: \
0;line-height: inherit;">.Trashes</code> are the same as those expected by KDE.</p> \
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">The kio_trash kioslave appears to support several \
actual trash directory locations, just like OS X. <code style="text-rendering: \
inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: \
inherit;">TrashImpl::init()</code> creates a standard trash in <code \
style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: \
0;line-height: inherit;">~/.local/share/Trash</code> (at least under OS X) but also \
<code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: \
normal;margin: 0;line-height: inherit;">TrashImpl::trashForMountPoint()</code> that \
is used in cases I have not yet encountered.</p> <p style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: inherit;">On OS X, my modified \
<code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: \
normal;margin: 0;line-height: inherit;">TrashImpl::init()</code> sets the standard \
trash directory to <code style="text-rendering: inherit;color: #4444cc;padding: \
0;white-space: normal;margin: 0;line-height: inherit;">~/.Trash/KDE.trash</code> and \
will create the <code style="text-rendering: inherit;color: #4444cc;padding: \
0;white-space: normal;margin: 0;line-height: inherit;">files</code> and <code \
style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: \
0;line-height: inherit;">info</code> subdirectories as required, because they will of \
course be deleted when the user empties the OS X trash. <code style="text-rendering: \
inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: \
inherit;">TrashImpl::fileRemoved()</code> has been modifie d to call a new function, \
<code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: \
normal;margin: 0;line-height: inherit;">deleteEmptyTrashInfraStructure</code> to \
delete the KDE trash's internal infrastructure when the wastebin is empty so that OS \
X also sees the trash as emptied. (Since implementing <code style="text-rendering: \
inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: \
inherit;">deleteEmptyTrashInfraStructure</code> this feature actually works, as \
expected as far as I can tell).</p> <p style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: inherit;">Remains \
to be done:
- determine in what cases <code style="text-rendering: inherit;color: \
#4444cc;padding: 0;white-space: normal;margin: 0;line-height: \
inherit;">trashForMountPoint()</code> is used, and finish the modifications for it to \
use <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: \
normal;margin: 0;line-height: inherit;">/.Trashes/uid/KDE.trash</code></p></pre> \
</td> </tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">On OS X 10.6.8 with kdelibs and kde-runtime git/4.14, \
using Dolphin. Tested actions are
- move items to wastebin from $HOME and a directory on a different volume
- restore items to both places
- empty wastebin through Dolphin
- empty OS X trashcan</p></pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>kioslave/trash/kcmtrash.cpp <span style="color: grey">(f4811fd)</span></li>
<li>kioslave/trash/trashimpl.h <span style="color: grey">(bc68723)</span></li>
<li>kioslave/trash/trashimpl.cpp <span style="color: grey">(30ee05b)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/120573/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
--===============6384293092243087735==--
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic