Changeset 89703 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 15, 2021 12:34:16 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

145151

Message:

FE/Qt: bugref:3355. reverting 145150.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/platform/x11/VBoxX11Helper.cpp (modified) (2 diffs)
• src/platform/x11/VBoxX11Helper.h (modified) (1 diff)
• src/runtime/UIMachineLogic.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -1556 +1556 @@
 UICommon_QT_MODULES = Core Gui Widgets
 UICommon_QT_MODULES.linux   += X11Extras
-UICommon_QT_MODULES.linux   += DBus
 UICommon_QT_MODULES.solaris += X11Extras
 UICommon_QT_MODULES.freebsd += X11Extras

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp

@@ -19 +19 @@
 #include <QString>
 #include <QX11Info>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusReply>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusConnectionInterface>
 
 /* GUI includes: */
@@ -160 +156 @@
     return XQueryExtension(pDisplay, extensionName, &major_opcode, &first_event, &first_error);
 }
-
-QStringList X11ScrenSaverServices()
-{
-    QStringList serviceNames;
-    QDBusConnection bus = QDBusConnection::sessionBus();
-    QDBusReply<QStringList> replyr = bus.interface()->registeredServiceNames();
-    if (!replyr.isValid())
-        return serviceNames;
-    for (int i = 0; i < replyr.value().size(); ++i)
-    {
-        const QString strServiceName = replyr.value()[i];
-        if (strServiceName.contains("screensaver", Qt::CaseInsensitive))
-        {
-            printf("%s\n", qPrintable(strServiceName));
-            serviceNames << strServiceName;
-        }
-    }
-    return serviceNames;
-}
-
-
-#ifdef VBOX_WS_X11
-#endif

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h

@@ -54 +54 @@
 SHARED_LIBRARY_STUFF bool X11CheckExtension(const char *extensionName);
 
-/* Returns the list of DBus screensaver services.*/
-SHARED_LIBRARY_STUFF QStringList X11ScrenSaverServices();
-
 #endif /* !FEQT_INCLUDED_SRC_platform_x11_VBoxX11Helper_h */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -712 +712 @@
 void UIMachineLogic::sltDisableHostScreenSaverStateChanged(bool fDisabled)
 {
-#if defined(VBOX_WS_X11)
-    QStringList services = X11ScrenSaverServices();
-    Q_UNUSED(services);
     Q_UNUSED(fDisabled);
-
-#else
-    Q_UNUSED(fDisabled);
-#endif
 }
 
@@ -1503 +1496 @@
     connect(gEDataManager, &UIExtraDataManager::sigDisableHostScreenSaverStateChange,
             this, &UIMachineLogic::sltDisableHostScreenSaverStateChanged);
-    sltDisableHostScreenSaverStateChanged(gEDataManager->disableHostScreenSaver());
 #endif
 }