On Tue, Mar 29, 2011 at 11:31:54AM -0700, Jason Gerecke wrote: > On Tue, Mar 29, 2011 at 1:08 AM, Peter Hutterer > <[email protected]> wrote: > > On Mon, Mar 28, 2011 at 10:06:56AM -0700, Jason Gerecke wrote: > >> WACOM_PROP_BUTTON_ACTIONS is already defined in wacom-properties.h > >> Lets use it instead of all those magic constants. > >> > >> Signed-off-by: Jason Gerecke <[email protected]> > > > > applied, thanks. > > > > Cheers, > > Peter > > > >> --- > >> tools/xsetwacom.c | 5 +++-- > >> 1 files changed, 3 insertions(+), 2 deletions(-) > >> > >> diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c > >> index 9df0403..1cc3da9 100644 > >> --- a/tools/xsetwacom.c > >> +++ b/tools/xsetwacom.c > >> @@ -126,6 +126,7 @@ static param_t parameters[] = > >> { > >> .name = "Button", > >> .desc = "X11 event to which the given button should be > >> mapped. ", > >> + .prop_name = WACOM_PROP_BUTTON_ACTIONS, > >> .set_func = map_button, > >> .get_func = get_button, > >> }, > >> @@ -1298,7 +1299,7 @@ static void special_map_buttons(Display *dpy, > >> XDevice *dev, param_t* param, > >> > >> TRACE("Special %s map for device %ld.\n", param->name, > >> dev->device_id); > >> > >> - btnact_prop = XInternAtom(dpy, "Wacom Button Actions", True); > >> + btnact_prop = XInternAtom(dpy, WACOM_PROP_BUTTON_ACTIONS, True); > >> if (!btnact_prop) > >> return; > >> > >> @@ -1726,7 +1727,7 @@ static int get_special_button_map(Display *dpy, > >> XDevice *dev, > >> int i; > >> char buff[1024] = {0}; > >> > >> - btnact_prop = XInternAtom(dpy, "Wacom Button Actions", True); > >> + btnact_prop = XInternAtom(dpy, WACOM_PROP_BUTTON_ACTIONS, True); > >> > >> if (!btnact_prop) > >> return 0; > >> -- > >> 1.7.4.1 > > I'm not seeing it on origin/master... You sure it made it in?
forgot to push yesterday, sorry. pushed now Cheers, Peter ------------------------------------------------------------------------------ Enable your software for Intel(R) Active Management Technology to meet the growing manageability and security demands of your customers. Businesses are taking advantage of Intel(R) vPro (TM) technology - will your software be a part of the solution? Download the Intel(R) Manageability Checker today! http://p.sf.net/sfu/intel-dev2devmar _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
