Merged all 8, along with the patch you provided.
Jason
---
Now instead of four in the eights place /
you’ve got three, ‘Cause you added one /
(That is to say, eight) to the two, /
But you can’t take seven from three, /
So you look at the sixty-fours....
On Tue, Jan 22, 2013 at 9:18 PM, Peter Hutterer <peter.hutte...@who-t.net>wrote:
> On Mon, Jan 21, 2013 at 04:45:50PM +1000, Peter Hutterer wrote:
> > On Thu, Jan 17, 2013 at 05:42:24PM -0800, Jason Gerecke wrote:
> > > We shouldn't make *any* change to the state if checkonly==true, but
> > > we've been resetting properties anyway. This blocks off the calls
> > > to the reset functions to prevent them from being called if it's
> > > just a drill.
> > >
> > > Signed-off-by: Jason Gerecke <killert...@gmail.com>
> >
> > I've looked at this series and they look good but I'd really like to have
> > some testing here. I should have test-cases to verify the new behaviour
> by
> > tomorrow evening. While I expect you've done testing, I'd like those
> > test-cases to pass before we push this.
> >
> > meanwhile, Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
>
> tested, didn't find anything new to complain about :) feel free to squash
> my
> patch in with one of yours.
>
> Cheers,
> Peter
>
> > > ---
> > > src/wcmXCommand.c | 21 ++++++++++++---------
> > > 1 file changed, 12 insertions(+), 9 deletions(-)
> > >
> > > diff --git a/src/wcmXCommand.c b/src/wcmXCommand.c
> > > index a5b41d2..9d5dd5e 100644
> > > --- a/src/wcmXCommand.c
> > > +++ b/src/wcmXCommand.c
> > > @@ -545,15 +545,18 @@ static int wcmSetActionsProperty(DeviceIntPtr
> dev, Atom property,
> > >
> > > if (subproperty == 0)
> > > { /* Interpret 'None' as meaning 'reset' */
> > > - if (property == prop_btnactions)
> > > - wcmResetButtonAction(pInfo, index, size);
> > > - else if (property == prop_strip_buttons)
> > > - wcmResetStripAction(pInfo, index);
> > > - else if (property == prop_wheel_buttons)
> > > - wcmResetWheelAction(pInfo, index);
> > > -
> > > - if (subproperty != handlers[index])
> > > - subproperty = handlers[index];
> > > + if (!checkonly)
> > > + {
> > > + if (property == prop_btnactions)
> > > + wcmResetButtonAction(pInfo, index,
> size);
> > > + else if (property == prop_strip_buttons)
> > > + wcmResetStripAction(pInfo, index);
> > > + else if (property == prop_wheel_buttons)
> > > + wcmResetWheelAction(pInfo, index);
> > > +
> > > + if (subproperty != handlers[index])
> > > + subproperty = handlers[index];
> > > + }
> > > }
> > > else
> > > {
> > > --
> > > 1.8.1.1
> >
> >
> >
> ------------------------------------------------------------------------------
> > Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
> > MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
> > with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
> > MVPs and experts. SALE $99.99 this month only -- learn more at:
> > http://p.sf.net/sfu/learnmore_122412
> > _______________________________________________
> > Linuxwacom-devel mailing list
> > Linuxwacom-devel@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
> >
>
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnnow-d2d
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
