summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-08-19 15:45:04 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-08-19 15:45:04 +0000
commit2140009211c17ce51ebca837b78e6e5d343e646c (patch)
treec148be29f8106330f76f42e2b550d869b204e8ba
parenta594c8ff7749eeaa4e6fc39afc5bbd403259e768 (diff)
downloaddrakx-kbd-mouse-x11-2140009211c17ce51ebca837b78e6e5d343e646c.tar
drakx-kbd-mouse-x11-2140009211c17ce51ebca837b78e6e5d343e646c.tar.gz
drakx-kbd-mouse-x11-2140009211c17ce51ebca837b78e6e5d343e646c.tar.bz2
drakx-kbd-mouse-x11-2140009211c17ce51ebca837b78e6e5d343e646c.tar.xz
drakx-kbd-mouse-x11-2140009211c17ce51ebca837b78e6e5d343e646c.zip
- XFdrake:
o [bugfix] fix clicking on "Options" when Composite is disabled (regression introduced in 0.58)
-rw-r--r--NEWS2
-rw-r--r--lib/Xconfig/parse.pm1
-rw-r--r--lib/Xconfig/xfree.pm2
3 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 6a57a74..210b90f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
- XFdrake:
o allow xorg.conf to have no "Monitor" section (#42793)
+ o [bugfix] fix clicking on "Options" when Composite is disabled
+ (regression introduced in 0.58)
Version 0.59 - 18 August 2008
diff --git a/lib/Xconfig/parse.pm b/lib/Xconfig/parse.pm
index 3ab9de2..283065f 100644
--- a/lib/Xconfig/parse.pm
+++ b/lib/Xconfig/parse.pm
@@ -146,6 +146,7 @@ my %kind_names = (
Device => [ qw(Identifier VendorName BoardName Chipset Driver VideoRam Screen BusID DPMS power_saver AccelMethod MonitorLayout TwinViewOrientation BIOSHotkeys RenderAccel SWCursor XaaNoOffscreenPixmaps) ],
Display => [ qw(Depth Modes Virtual) ], # Subsection in Device
Screen => [ qw(Identifier Driver Device Monitor DefaultDepth DefaultColorDepth) ],
+ Extensions => [ qw(Composite) ],
InputDevice => [ qw(Identifier Driver Protocol Device Type Mode XkbModel XkbLayout XkbDisable Emulate3Buttons Emulate3Timeout EmulateWheel EmulateWheelButton) ],
WacomCursor => [ qw(Port) ], #-\
WacomStylus => [ qw(Port) ], #--> Port must be first
diff --git a/lib/Xconfig/xfree.pm b/lib/Xconfig/xfree.pm
index c50f8d6..46c7ac0 100644
--- a/lib/Xconfig/xfree.pm
+++ b/lib/Xconfig/xfree.pm
@@ -529,7 +529,7 @@ sub remove_extension {
sub get_extension {
my ($raw_X, $extension) = @_;
my $raw = $raw_X->get_Section('Extensions');
- $raw && $raw->{$extension} && $raw->{$extension}[0]{val};
+ $raw && $raw->{$extension} && $raw->{$extension}{val};
}
sub set_extension {
my ($raw_X, $extension, $val) = @_;