luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-12 20:24:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

gio: g_clear_signal_handler() can handle NULL args

Browse Source
This commit is contained in:
Bastien Nocera
2021-07-28 15:10:16 +02:00
parent 2e500304e3
commit a7000cd989
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gmemorymonitordbus.c
View File

@@ -115,7 +115,6 @@ lmm_vanished_cb (GDBusConnection *connection,
{ {
GMemoryMonitorDBus *dbus = user_data; GMemoryMonitorDBus *dbus = user_data;
if (dbus->proxy != NULL)
g_clear_signal_handler (&dbus->signal_id, dbus->proxy); g_clear_signal_handler (&dbus->signal_id, dbus->proxy);
g_clear_object (&dbus->proxy); g_clear_object (&dbus->proxy);
} }
@@ -143,7 +142,6 @@ g_memory_monitor_dbus_finalize (GObject *object)
{ {
GMemoryMonitorDBus *dbus = G_MEMORY_MONITOR_DBUS (object); GMemoryMonitorDBus *dbus = G_MEMORY_MONITOR_DBUS (object);
if (dbus->proxy != NULL)
g_clear_signal_handler (&dbus->signal_id, dbus->proxy); g_clear_signal_handler (&dbus->signal_id, dbus->proxy);
g_clear_object (&dbus->proxy); g_clear_object (&dbus->proxy);
g_clear_handle_id (&dbus->watch_id, g_bus_unwatch_name); g_clear_handle_id (&dbus->watch_id, g_bus_unwatch_name);