diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-05 08:57:42 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-05 08:57:42 +0000 |
| commit | 4b1326f06330c00501dd84100ed3a1987e2fa631 (patch) | |
| tree | 6675ebcf771a6fdfeb9a2164f08811407731482e /xorg-server/hw/kdrive/ephyr/ephyr.c | |
| parent | 7397e255c2e82618ab55ef2c81636c8e688b1225 (diff) | |
| parent | 163827567b71b0763a4c1a7104159cd08b5c2d95 (diff) | |
| download | vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.tar.gz vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.tar.bz2 vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/kdrive/ephyr/ephyr.c')
| -rw-r--r-- | xorg-server/hw/kdrive/ephyr/ephyr.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.c b/xorg-server/hw/kdrive/ephyr/ephyr.c index 87e48afaf..c3b3aeff5 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyr.c +++ b/xorg-server/hw/kdrive/ephyr/ephyr.c @@ -1085,8 +1085,7 @@ MouseInit (KdPointerInfo *pi) ((EphyrPointerPrivate *)pi->driverPrivate)->enabled = FALSE;
pi->nAxes = 3;
pi->nButtons = 32;
- if (pi->name)
- xfree(pi->name);
+ xfree(pi->name);
pi->name = strdup("Xephyr virtual mouse");
ephyrMouse = pi;
return Success;
@@ -1136,8 +1135,7 @@ EphyrKeyboardInit (KdKeyboardInfo *ki) }
ki->minScanCode = ephyrKeySyms.minKeyCode;
ki->maxScanCode = ephyrKeySyms.maxKeyCode;
- if (ki->name)
- xfree(ki->name);
+ xfree(ki->name);
ki->name = strdup("Xephyr virtual keyboard");
ephyrKbd = ki;
return Success;
|