From f9f7aee79eecdb610d71a8f2703de43e90018e5b Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sat, 12 Feb 2022 00:17:53 +0900
Subject: Removed HAL dependant code.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 tdeioslave/media/tdecmodule/managermodule.cpp    | 18 +++++-------------
 tdeioslave/media/tdecmodule/managermoduleview.ui | 20 --------------------
 2 files changed, 5 insertions(+), 33 deletions(-)

(limited to 'tdeioslave/media/tdecmodule')

diff --git a/tdeioslave/media/tdecmodule/managermodule.cpp b/tdeioslave/media/tdecmodule/managermodule.cpp
index 6478ee2a8..813775cbd 100644
--- a/tdeioslave/media/tdecmodule/managermodule.cpp
+++ b/tdeioslave/media/tdecmodule/managermodule.cpp
@@ -44,13 +44,6 @@ ManagerModule::ManagerModule( TQWidget* parent, const char* name )
 
 	addConfig(  MediaManagerSettings::self(), view );
 
-#ifndef COMPILE_HALBACKEND
-	TQString hal_text = view->kcfg_HalBackendEnabled->text();
-	hal_text += " ("+i18n("No support for HAL on this system")+")";
-	view->kcfg_HalBackendEnabled->setText( hal_text );
-#endif
-	view->kcfg_HalBackendEnabled->setEnabled( false );
-
 #ifndef COMPILE_LINUXCDPOLLING
 	TQString poll_text = view->kcfg_CdPollingEnabled->text();
 	poll_text += " ("+i18n("No support for CD polling on this system")+")";
@@ -140,13 +133,12 @@ void ManagerModule::save()
 	
 	rememberSettings();
 
-	//Well... reloadBackends is buggy with HAL, it seems to be linked
-	//to a bug in the unmaintained Qt3 DBUS binding ;-/
-	//DCOPRef mediamanager( "kded", "mediamanager" );
-	//DCOPReply reply = mediamanager.call( "reloadBackends" );
-	
-	// So we use this hack instead...
 	DCOPRef kded( "kded", "kded" );
+	// DCOPReply reply = mediamanager.call( "reloadBackends" );
+	// Well... reloadBackends had issues with HAL, it seems it was linked
+	// to a bug in the unmaintained Qt3 DBUS binding, but it is not quite clear.
+	// It may be ok now that HAL is no longer supported but needs to be tested.
+	// So we use this hack instead...
 	kded.call( "unloadModule", "mediamanager" );
 	kded.call( "loadModule", "mediamanager" );
 
diff --git a/tdeioslave/media/tdecmodule/managermoduleview.ui b/tdeioslave/media/tdecmodule/managermoduleview.ui
index 6b477317b..748cd825c 100644
--- a/tdeioslave/media/tdecmodule/managermoduleview.ui
+++ b/tdeioslave/media/tdecmodule/managermoduleview.ui
@@ -19,17 +19,6 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="TQCheckBox">
-            <property name="name">
-                <cstring>kcfg_HalBackendEnabled</cstring>
-            </property>
-            <property name="text">
-                <string>Enable HAL backend</string>
-            </property>
-            <property name="whatsThis" stdset="0">
-                <string>Select this if you want to enable the Hardware Abstraction Layer (http://hal.freedesktop.org/wiki/Software/hal) support.</string>
-            </property>
-        </widget>
         <widget class="TQCheckBox">
             <property name="name">
                 <cstring>kcfg_CdPollingEnabled</cstring>
@@ -348,16 +337,7 @@ Display the short name as is; store a long name when the short name is not all u
         </spacer>
     </vbox>
 </widget>
-<connections>
-    <connection>
-        <sender>kcfg_HalBackendEnabled</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>groupbox_mount</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-</connections>
 <tabstops>
-    <tabstop>kcfg_HalBackendEnabled</tabstop>
     <tabstop>kcfg_CdPollingEnabled</tabstop>
     <tabstop>kcfg_AutostartEnabled</tabstop>
     <tabstop>kcfg_NotificationPopupsEnabled</tabstop>
-- 
cgit v1.2.1