summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@redhat.com>2008-10-14 16:14:13 +1030
committerPeter Hutterer <peter.hutterer@redhat.com>2008-10-14 16:14:13 +1030
commit088e0a175a4913bf827c1f7e19de09fdf987d347 (patch)
treecb8cf1bf4171bacc96670dba80a0934ce41c8a36 /src
parentcefedeb205291001e7e47b7516de261dbccce059 (diff)
Rename DragLockInit to DragLockPreInit, remove superfluous "return".
Diffstat (limited to 'src')
-rw-r--r--src/draglock.c4
-rw-r--r--src/evdev.c2
-rw-r--r--src/evdev.h2
3 files changed, 3 insertions, 5 deletions
diff --git a/src/draglock.c b/src/draglock.c
index 894aa8a..e1f037a 100644
--- a/src/draglock.c
+++ b/src/draglock.c
@@ -53,7 +53,7 @@ void EvdevDragLockLockButton(InputInfoPtr pInfo, unsigned int button);
/* Setup and configuration code */
void
-EvdevDragLockInit(InputInfoPtr pInfo)
+EvdevDragLockPreInit(InputInfoPtr pInfo)
{
EvdevPtr pEvdev = (EvdevPtr)pInfo->private;
char *option_string = NULL;
@@ -247,8 +247,6 @@ EvdevDragLockInitProperty(DeviceIntPtr dev)
XISetDevicePropertyDeletable(dev, prop_dlock, FALSE);
XIRegisterPropertyHandler(dev, EvdevDragLockSetProperty, NULL, NULL);
-
- return;
}
/**
diff --git a/src/evdev.c b/src/evdev.c
index b1470a3..73c20d8 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1359,7 +1359,7 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
EvdevMBEmuPreInit(pInfo);
EvdevWheelEmuPreInit(pInfo);
- EvdevDragLockInit(pInfo);
+ EvdevDragLockPreInit(pInfo);
return pInfo;
}
diff --git a/src/evdev.h b/src/evdev.h
index aa74481..c071971 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -148,6 +148,6 @@ BOOL EvdevWheelEmuFilterButton(InputInfoPtr pInfo, unsigned int button, int valu
BOOL EvdevWheelEmuFilterMotion(InputInfoPtr pInfo, struct input_event *pEv);
/* Draglock code */
-void EvdevDragLockInit(InputInfoPtr pInfo);
+void EvdevDragLockPreInit(InputInfoPtr pInfo);
BOOL EvdevDragLockFilterEvent(InputInfoPtr pInfo, unsigned int button, int value);
#endif