On 6/30/06, Dennis Tomas <2tomas@informatik.uni-hamburg.de> wrote:
Lucas Hazel wrote:
>
>
> On 6/29/06, *Dennis Tomas* <2tomas@informatik.uni-hamburg.de
> <mailto: 2tomas@informatik.uni-hamburg.de>> wrote:
>
>     Lucas Hazel wrote:
>     >
>     > On 6/28/06, *Dennis Tomas* <2tomas@informatik.uni-hamburg.de
>     <mailto:2tomas@informatik.uni-hamburg.de>
>     > <mailto: 2tomas@informatik.uni-hamburg.de
>     <mailto:2tomas@informatik.uni-hamburg.de>>> wrote:
>     >
>     >     Abrolag wrote:
>     >     > On Thu, 9 Mar 2006 20:05:31 +0000
>     >     > Abrolag <abrolag@users.sourceforge.net
>     <mailto:abrolag@users.sourceforge.net >
>     >     <mailto:abrolag@users.sourceforge.net
>     <mailto:abrolag@users.sourceforge.net >>> wrote:
>     >     >
>     >     >
>     >     >> On Thu, 09 Mar 2006 19:33:24 +0000
>     >     >> Thomas Leonard < tal@ecs.soton.ac.uk
>     <mailto:tal@ecs.soton.ac.uk>
>     >     <mailto:tal@ecs.soton.ac.uk <mailto: tal@ecs.soton.ac.uk>>>
>     wrote:
>     >     >>
>     >     >>
>     >     >>> On Tue, 07 Mar 2006 18:59:39 +0000, Abrolag wrote:
>     >     >>>
>     >     >>>
>     >     >>>> Is there a way to 'lock' the icon bar so that people
>     (new or
>     >     unfamiliar
>     >     >>>> users) can't accidentally remove icons from it?
>     >     >>>>
>     >     >>> Not at the moment, though it would be a good idea. Some
>     >     possibilities:
>     >     >>>
>     >     >>> - An option in the options box (on by default) to confirm
>     >     removing icons.
>     >     >>>
>     >     >>> - A checkbox in the icon properties box to lock it.
>     >     >>>
>     >     >>> - An 'undo last change to panel' menu item.
>     >     >>>
>     >     >> Glad you think it's a good idea :)
>     >     >>
>     >     >> My personal preference would be number two. What do
>     others think?
>     >     >>
>     >     >
>     >     > Any likelihood of this being implemented? A friend's
>     family, just
>     >     > starting to use ROX keep accidentally removing icons, and are
>     >     getting
>     >     > quite frustrated. I still do it myself sometimes too!
>     >     >
>     >     I had a go today. Patch attached.
>     >
>     >
>     > I got patch rejections all over the  place, even with revision 4644
>     >
>     I generated the patch using svn diff > lock_icons.patch. Is there
>     anything wrong with this? (I'm not very experienced with svn)
>
>
> I don't think so, but try using 'diff -urN' see if it make a difference.
Not really. I've attached the "new" patch anyway. Are you sure you're
using current svn with no other patches applied?

Still getting patch rejections, even with current and pristine sources. Are you sure your diff is against the same, no local modifications, etc?