I was about the test my patch,.. well I will try yours now :)
2013/4/11 Daniel Déchelotte <[email protected]> > Renan wrote: > > this is in the patch file and does not apply: > > > > diff --git a/src/icon.h b/src/icon.h > > index 4e030a8..fcb8ebf 100644 > > --- a/src/icon.h > > +++ b/src/icon.h > > @@ -28,6 +28,7 @@ > > > > #define TILE_NORMAL 0 > > #define TILE_CLIP 1 > > +#define TILE_DRAWER 2 > > > > typedef struct WIcon { > > WCoreWindow *core; > > It fails because the context changed too much. I add the line "#define > TILE_DRAWER 2" after line "#define TILE_CLIP 1" and before line "#define > NORMAL_DOCK WM_DOCK". Git (or patch, really) doesn't see that line anymore > as it got deleted in next, so it doesn't take any chance and interrupts the > merge/cherry-pick operation. > > I hope you enjoy the improved and rebased version I've just sent :) > > -- Daniel > -- Renan Vedovato Traba Aluno de Bacharelado em Ciência da Computação pela Universidade Federal do Paraná Linux Register n°: 525911
