Here it may be a question whether reloadBackends is still a problem, or whether it would be possible to use it instead of unloadModule / loadModule?
Here it may be a question whether `reloadBackends` is still a problem, or whether it would be possible to use it instead of `unloadModule` / `loadModule`?
As per title.
This will need tde-i18n to be updated as well to remove no longer needed strings.
Tested, looks good.
0719a63cb7
tofd66c8466d
2 years agoI found more code that needed to be removed. I added a second commit for review, it will be squashed before final merge.
We can let TWTW do it's work, instead of doing it manually :-)
Added some comments and questions.
// status = 0; // enable for testing
run_vkbd = ( WIFEXITED( status ) && WEXITSTATUS( status ) == 0 && !TDEStandardDirs::findExe( "xvkbd" ).isEmpty()) ? 1 : 0;
#else // WITH_HAL
run_vkbd = (!TDEStandardDirs::findExe( "xvkbd" ).isEmpty());
We could add a test for the presence of kvkbd and use it instead of xvkbd?
Yes, we can indeed. But it is not part of the HAL removal process, so we can do that in a separate PR.
Yes, of course, I agree.
SOURCES ${${target}_SRCS}
DEPENDENCIES kicker_core-static
LINK dmctl-static kickoffsearch_interfaces-shared ${TDEHW_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${HAL_LIBRARIES}
LINK dmctl-static kickoffsearch_interfaces-shared ${TDEHW_LIBRARIES} ${DBUS_TQT_LIBRARIES}
DBUS_TQT_*
seems to be not needed after drop HAL support. Detection is removed, so the values will be empty.${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${DBUS_TQT_INCLUDE_DIRS}
DBUS_TQT_*
seems to be not needed.legacy.cpp startup.cpp shutdown.cpp client.cpp
KSMServerInterface.skel server.skel timed.ui
LINK dmctl-static tdeui-shared tdersync-shared ${TDEHW_LIBRARIES} ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES}
LINK dmctl-static tdeui-shared tdersync-shared ${TDEHW_LIBRARIES} ${DBUS_TQT_LIBRARIES}
DBUS_TQT_*
seems to be not needed.SUBDIRS = .
INCLUDES= -I$(top_srcdir)/tdmlib $(all_includes) $(HAL_INCS) $(DBUS_INCS)
INCLUDES= -I$(top_srcdir)/tdmlib $(all_includes) $(DBUS_INCS)
DBUS_INCS
seems to be not needed.ksmserver_la_LDFLAGS = $(all_libraries) -avoid-version -module
ksmserver_la_LIBADD = ../tdmlib/libdmctl.la $(LIB_TDEUI) $(HAL_LIBS) $(DBUS_LIBS)
ksmserver_la_LIBADD = ../tdmlib/libdmctl.la $(LIB_TDEUI) $(DBUS_LIBS)
DBUS_INCS
seems to be not needed.testsh_SOURCES = test.cpp timed.ui
testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testsh_LDADD = $(LIB_TDEUI) shutdowndlg.lo ../tdmlib/libdmctl.la $(HAL_LIBS) $(DBUS_LIBS)
testsh_LDADD = $(LIB_TDEUI) shutdowndlg.lo ../tdmlib/libdmctl.la $(DBUS_LIBS)
DBUS_INCS
seems to be not needed.${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${HAL_INCLUDE_DIRS}
${DBUS_TQT_INCLUDE_DIRS}
DBUS_TQT_*
seems to be not needed.// So we use this hack instead...
DCOPRef kded( "kded", "kded" );
kded.call( "unloadModule", "mediamanager" );
Here it may be a question whether
reloadBackends
is still a problem, or whether it would be possible to use it instead ofunloadModule
/loadModule
?As discussed on jabbim, we don't know the original problem with reloadBackend, so we agree to stick to the current code.
fd66c8466d
toa7996f56fe
2 years agoNew version uploaded (last commit only)
Tested, looks good.
a7996f56fe
tof9f7aee79e
2 years agof9f7aee79e
into master 2 years agoSquashed and merged. Thanks for testing.
Reviewers
f9f7aee79e
.