Wed Jun 5 07:26:13 2013 UTC ()
fix a merge botch.


(mrg)
diff -r1.15 -r1.16 xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
cvs diff -r1.15 -r1.16 xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c (expand / switch to unified diff)

--- xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c 2013/06/05 07:11:16 1.15
+++ xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c 2013/06/05 07:26:12 1.16
@@ -272,27 +272,27 @@ static MouseProtocolRec mouseProtocols[] @@ -272,27 +272,27 @@ static MouseProtocolRec mouseProtocols[]
272 272
273 /* end of list */ 273 /* end of list */
274 { NULL, MSE_NONE, NULL, PROT_UNKNOWN } 274 { NULL, MSE_NONE, NULL, PROT_UNKNOWN }
275}; 275};
276 276
277/* Process options common to all mouse types. */ 277/* Process options common to all mouse types. */
278static void 278static void
279MouseCommonOptions(InputInfoPtr pInfo) 279MouseCommonOptions(InputInfoPtr pInfo)
280{ 280{
281 MouseDevPtr pMse; 281 MouseDevPtr pMse;
282 MessageType buttons_from = X_CONFIG; 282 MessageType buttons_from = X_CONFIG;
283 char *s; 283 char *s;
284 int origButtons; 284 int origButtons;
285 int btn; 285 int i;
286 286
287 pMse = pInfo->private; 287 pMse = pInfo->private;
288 288
289 pMse->buttons = xf86SetIntOption(pInfo->options, "Buttons", 0); 289 pMse->buttons = xf86SetIntOption(pInfo->options, "Buttons", 0);
290 if (!pMse->buttons) { 290 if (!pMse->buttons) {
291 pMse->buttons = MSE_DFLTBUTTONS; 291 pMse->buttons = MSE_DFLTBUTTONS;
292 buttons_from = X_DEFAULT; 292 buttons_from = X_DEFAULT;
293 } 293 }
294 origButtons = pMse->buttons; 294 origButtons = pMse->buttons;
295 295
296 pMse->emulate3Buttons = xf86SetBoolOption(pInfo->options, 296 pMse->emulate3Buttons = xf86SetBoolOption(pInfo->options,
297 "Emulate3Buttons", FALSE); 297 "Emulate3Buttons", FALSE);
298 if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) { 298 if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) {