Attachment 8068 Details for Bug 12394 – drop noauto support from drakx-kbd-mouse-x11

[patch] drop noauto support from drakx-kbd-mouse-x11

0001-kill-noauto-support-mga-12394-x11.patch (text/plain), 2.14 KB, created by Thierry Vignaud on 2016-06-24 22:34:08 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2016-06-24 22:34:08 CEST

Size: 2.14 KB

patch

obsolete

>From 2715dfd5798cc9b037d769b880bc801739f66ba7 Mon Sep 17 00:00:00 2001
>From: Thierry Vignaud <thierry.vignaud@gmail.com>
>Date: Fri, 24 Jun 2016 22:29:13 +0200
>Subject: [PATCH] kill noauto support (mga#12394)
>
>---
> lib/Xconfig/default.pm | 2 +-
> lib/Xconfig/monitor.pm | 1 -
> lib/keyboard.pm        | 1 -
> tools/mousedrake       | 2 --
> 4 files changed, 1 insertion(+), 5 deletions(-)
>
>diff --git a/lib/Xconfig/default.pm b/lib/Xconfig/default.pm
>index 586e4a4..ae2c352 100644
>--- a/lib/Xconfig/default.pm
>+++ b/lib/Xconfig/default.pm
>@@ -15,7 +15,7 @@ sub configure {
> 
>     my $mouse = $o_mouse || do {
> 	my $mouse = mouse::read(); 
>-	add2hash($mouse, mouse::detect(modules::any_conf->read)) if !$::noauto;
>+	add2hash($mouse, mouse::detect(modules::any_conf->read));
> 	$mouse;
>     };
> 
>diff --git a/lib/Xconfig/monitor.pm b/lib/Xconfig/monitor.pm
>index f136e0a..b5b3a13 100644
>--- a/lib/Xconfig/monitor.pm
>+++ b/lib/Xconfig/monitor.pm
>@@ -118,7 +118,6 @@ sub choose {
> 		      sort => !$in->isa('interactive::gtk') } ]) or return;
> 
>     if ($merged_name eq "Plug'n Play") {
>-	local $::noauto = 0; #- hey, you asked for plug'n play, so i do probe!
> 	delete @$monitor{'VendorName', 'ModelName', 'EISA_ID', 'HorizSync', 'VertRefresh'};
> 	if ($head_nb <= 1) {
> 	    if (my $probed_info = probe()) {
>diff --git a/lib/keyboard.pm b/lib/keyboard.pm
>index ed1e33b..a0edb81 100644
>--- a/lib/keyboard.pm
>+++ b/lib/keyboard.pm
>@@ -474,7 +474,6 @@ sub default {
> }
> 
> sub from_usb() {
>-    return if $::noauto;
>     my ($usb_kbd) = detect_devices::usbKeyboards() or return;
>     my $country_code = detect_devices::usbKeyboard2country_code($usb_kbd) or return;
>     my $keyboard = $usb2keyboard[$country_code];
>diff --git a/tools/mousedrake b/tools/mousedrake
>index a65816d..7d20892 100755
>--- a/tools/mousedrake
>+++ b/tools/mousedrake
>@@ -21,10 +21,8 @@ my $modules_conf = modules::any_conf->read;
> 
> my $mouse = mouse::read();
> 
>-if (!$::noauto) {
>     my $probed_mouse = mouse::detect($modules_conf);
>     $mouse = $probed_mouse if !$mouse->{Protocol} || !$probed_mouse->{unsafe};
>-}
> 
> if (!$mouse || !$::auto) {
>     $mouse ||= mouse::fullname2mouse('Universal|Any PS/2 & USB mice');
>-- 
>2.9.0
>

From 2715dfd5798cc9b037d769b880bc801739f66ba7 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 24 Jun 2016 22:29:13 +0200
Subject: [PATCH] kill noauto support (mga#12394)

---
 lib/Xconfig/default.pm | 2 +-
 lib/Xconfig/monitor.pm | 1 -
 lib/keyboard.pm        | 1 -
 tools/mousedrake       | 2 --
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/Xconfig/default.pm b/lib/Xconfig/default.pm
index 586e4a4..ae2c352 100644
--- a/lib/Xconfig/default.pm
+++ b/lib/Xconfig/default.pm
@@ -15,7 +15,7 @@ sub configure {
 
     my $mouse = $o_mouse || do {
 	my $mouse = mouse::read(); 
-	add2hash($mouse, mouse::detect(modules::any_conf->read)) if !$::noauto;
+	add2hash($mouse, mouse::detect(modules::any_conf->read));
 	$mouse;
     };
 
diff --git a/lib/Xconfig/monitor.pm b/lib/Xconfig/monitor.pm
index f136e0a..b5b3a13 100644
--- a/lib/Xconfig/monitor.pm
+++ b/lib/Xconfig/monitor.pm
@@ -118,7 +118,6 @@ sub choose {
 		      sort => !$in->isa('interactive::gtk') } ]) or return;
 
     if ($merged_name eq "Plug'n Play") {
-	local $::noauto = 0; #- hey, you asked for plug'n play, so i do probe!
 	delete @$monitor{'VendorName', 'ModelName', 'EISA_ID', 'HorizSync', 'VertRefresh'};
 	if ($head_nb <= 1) {
 	    if (my $probed_info = probe()) {
diff --git a/lib/keyboard.pm b/lib/keyboard.pm
index ed1e33b..a0edb81 100644
--- a/lib/keyboard.pm
+++ b/lib/keyboard.pm
@@ -474,7 +474,6 @@ sub default {
 }
 
 sub from_usb() {
-    return if $::noauto;
     my ($usb_kbd) = detect_devices::usbKeyboards() or return;
     my $country_code = detect_devices::usbKeyboard2country_code($usb_kbd) or return;
     my $keyboard = $usb2keyboard[$country_code];
diff --git a/tools/mousedrake b/tools/mousedrake
index a65816d..7d20892 100755
--- a/tools/mousedrake
+++ b/tools/mousedrake
@@ -21,10 +21,8 @@ my $modules_conf = modules::any_conf->read;
 
 my $mouse = mouse::read();
 
-if (!$::noauto) {
     my $probed_mouse = mouse::detect($modules_conf);
     $mouse = $probed_mouse if !$mouse->{Protocol} || !$probed_mouse->{unsafe};
-}
 
 if (!$mouse || !$::auto) {
     $mouse ||= mouse::fullname2mouse('Universal|Any PS/2 & USB mice');
-- 
2.9.0

Actions: View | Diff

Attachments on bug 12394: 4848 | 8068 | 8069