TeamHepta/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-04-12 11:41:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

tray:dbus: Re-instate the _parent fields in SDL_dbustray structs

Browse Source 
The various SDL_Tray*DBus structs are supposed to be backend-specific
subclasses of the corresponding SDL_Tray* structs. This is done by making
the first member be a 'parent' of that type, so that, e.g., SDL_TrayDriverDBus
can be cast into an SDL_TrayDriver. However, these '_parent' members were
mistakenly removed in commit ce90105cf8 ("Clean up the tray D-Bus code"), as
they're never directly referenced.

Reinstate these variables, and instead of casting SDL_Tray*DBus to SDL_Tray* on
creation, reference the _parent member directly, so that any tooling will know
the variable is indeed used. In addition, rename _parent to class_parent, to
make its purpose more obvious.

Fixes: ce90105cf8 ("Clean up the tray D-Bus code")
This commit is contained in:
David Gow
2026-04-11 17:32:20 +08:00
committed by Sam Lantinga
parent 4ab8ecf02d
commit cf4edb73e7
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/tray/unix/SDL_dbustray.c
View File

@@ -34,11 +34,15 @@
typedef struct SDL_TrayDriverDBus
{
SDL_TrayDriver class_parent;
SDL_DBusContext *dbus;
} SDL_TrayDriverDBus;
typedef struct SDL_TrayDBus
{
SDL_Tray class_parent;
DBusConnection *connection;
char *service_name;
@@ -55,6 +59,8 @@ typedef struct SDL_TrayDBus
typedef struct SDL_TrayMenuDBus
{
SDL_TrayMenu class_parent;
SDL_ListNode *menu;
const char *menu_path;
@@ -63,6 +69,8 @@ typedef struct SDL_TrayMenuDBus
typedef struct SDL_TrayEntryDBus
{
SDL_TrayEntry class_parent;
SDL_MenuItem *item;
SDL_TrayMenuDBus *sub_menu;
} SDL_TrayEntryDBus;
@@ -428,7 +436,7 @@ SDL_Tray *CreateTray(SDL_TrayDriver *driver, SDL_PropertiesID props)
/* Allocate the tray structure */
tray_dbus = SDL_malloc(sizeof(SDL_TrayDBus));
tray = (SDL_Tray *)tray_dbus;
tray = &tray_dbus->class_parent;
if (!tray_dbus) {
return NULL;
}
@@ -663,7 +671,7 @@ SDL_TrayMenu *CreateTrayMenu(SDL_Tray *tray)
SDL_TrayMenuDBus *menu_dbus;
menu_dbus = SDL_malloc(sizeof(SDL_TrayMenuDBus));
tray->menu = (SDL_TrayMenu *)menu_dbus;
tray->menu = &menu_dbus->class_parent;
if (!menu_dbus) {
SDL_SetError("Unable to create tray menu: allocation failure!");
return NULL;
@@ -686,7 +694,7 @@ SDL_TrayMenu *CreateTraySubmenu(SDL_TrayEntry *entry)
entry_dbus = (SDL_TrayEntryDBus *)entry;
menu_dbus = SDL_malloc(sizeof(SDL_TrayMenuDBus));
menu = (SDL_TrayMenu *)menu_dbus;
menu = &menu_dbus->class_parent;
if (!menu_dbus) {
SDL_SetError("Unable to create tray submenu: allocation failure!");
return NULL;
@@ -804,7 +812,7 @@ SDL_TrayEntry *InsertTrayEntryAt(SDL_TrayMenu *menu, int pos, const char *label,
driver = (SDL_TrayDriverDBus *)tray->driver;
entry_dbus = SDL_malloc(sizeof(SDL_TrayEntryDBus));
entry = (SDL_TrayEntry *)entry_dbus;
entry = &entry_dbus->class_parent;
if (!entry_dbus) {
SDL_SetError("Unable to create tray entry: allocation failure!");
return NULL;
@@ -1135,7 +1143,7 @@ SDL_TrayDriver *SDL_Tray_CreateDBusDriver(void)
/* Allocate the driver struct */
dbus_driver = SDL_malloc(sizeof(SDL_TrayDriverDBus));
driver = (SDL_TrayDriver *)dbus_driver;
driver = &dbus_driver->class_parent;
if (!dbus_driver) {
return NULL;
}