Commit b08b1bde66d1cfa0987093e0719388c5c3203130
2021-08-03T22:50:58
linux: remove d-bus lazy init dead code Lazy init in X11/Wayland is dead code since dbdbae4
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
diff --git a/src/video/wayland/SDL_waylandvideo.c b/src/video/wayland/SDL_waylandvideo.c
index cae17f5..9347b6f 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 60336b6..56964d4 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 e8b9693..f1d1041 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 7281e11..8f5c983 100644
--- a/src/video/x11/SDL_x11video.h
+++ b/src/video/x11/SDL_x11video.h
@@ -56,7 +56,6 @@
#include <X11/extensions/xf86vmode.h>
#endif
-#include "../../core/linux/SDL_dbus.h"
#include "../../core/linux/SDL_ime.h"
#include "SDL_x11dyn.h"