← Back to branch summary

~ubuntu-branches/ubuntu/lucid/xorg-server/lucid-updates

« back to all changes in this revision

Viewing changes to xkb/xkmread.c

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen, Bryce Harrington, Robert Hooker, Timo Aaltonen, Robert Collins
  • Date: 2010-02-19 13:24:15 UTC
  • mfrom: (1.1.31 upstream) (0.11.2 sid)
  • Revision ID: james.westby@ubuntu.com-20100219132415-4eovyfajq7ac45n3
Tags: 2:1.7.5-1ubuntu1
[ Bryce Harrington ]
[Robert Hooker]
* Add 106_nouveau_autodetect.patch: makes nouveau the default driver
  for supported cards when not explicitly named in xorg.conf.

[Timo Aaltonen]
* Merge from Debian unstable.
* Drop patch 101, included in Debian.

[Robert Collins]
* Add 199_xfvb-help-typo.patch to fix typo in help for xvfb (fdo #32990)
* Add 200_randr-null.patch to clarify a pointer initialization (fdo #26389)

Show diffs side-by-side

added added

removed removed

Lines of Context:
xkb/xkmread.c
531
531
            act->devval.v2_ndx = wire.actionData[5];
532
532
            act->devval.v2_what = wire.actionData[6];
533
533
            break;
 
534
 
534
535
        case XkbSA_XFree86Private:
 
536
            /* copy the kind of action */
 
537
            strncpy((char*)act->any.data, (char*)wire.actionData,
 
538
                    XkbAnyActionDataSize);
 
539
            break ;
 
540
 
535
541
        case XkbSA_Terminate:
536
542
            /* no args, kinda (note: untrue for xfree86). */
537
543
            break;