From b08b1bde66d1cfa0987093e0719388c5c3203130 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Tue, 3 Aug 2021 22:50:58 -0500 Subject: [PATCH] linux: remove d-bus lazy init dead code Lazy init in X11/Wayland is dead code since dbdbae4 --- src/video/wayland/SDL_waylandvideo.c | 4 ---- src/video/wayland/SDL_waylandvideo.h | 1 - src/video/x11/SDL_x11video.c | 4 ---- src/video/x11/SDL_x11video.h | 1 - 4 files changed, 10 deletions(-) diff --git a/src/video/wayland/SDL_waylandvideo.c b/src/video/wayland/SDL_waylandvideo.c index cae17f5ad..9347b6f23 100644 --- a/src/video/wayland/SDL_waylandvideo.c +++ b/src/video/wayland/SDL_waylandvideo.c @@ -578,10 +578,6 @@ Wayland_VideoInit(_THIS) Wayland_InitKeyboard(_this); -#if SDL_USE_LIBDBUS - SDL_DBus_Init(); -#endif - return 0; } diff --git a/src/video/wayland/SDL_waylandvideo.h b/src/video/wayland/SDL_waylandvideo.h index 60336b6cc..56964d481 100644 --- a/src/video/wayland/SDL_waylandvideo.h +++ b/src/video/wayland/SDL_waylandvideo.h @@ -29,7 +29,6 @@ #include "wayland-util.h" #include "../SDL_sysvideo.h" -#include "../../core/linux/SDL_dbus.h" #include "../../core/linux/SDL_ime.h" struct xkb_context; diff --git a/src/video/x11/SDL_x11video.c b/src/video/x11/SDL_x11video.c index e8b969311..f1d10410a 100644 --- a/src/video/x11/SDL_x11video.c +++ b/src/video/x11/SDL_x11video.c @@ -453,10 +453,6 @@ X11_VideoInit(_THIS) X11_InitTouch(_this); -#if SDL_USE_LIBDBUS - SDL_DBus_Init(); -#endif - return 0; } diff --git a/src/video/x11/SDL_x11video.h b/src/video/x11/SDL_x11video.h index 7281e1130..8f5c983bb 100644 --- a/src/video/x11/SDL_x11video.h +++ b/src/video/x11/SDL_x11video.h @@ -56,7 +56,6 @@ #include #endif -#include "../../core/linux/SDL_dbus.h" #include "../../core/linux/SDL_ime.h" #include "SDL_x11dyn.h"