colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dispatcher: unown dispatcher D-Bus name on exit

Browse Source
This commit is contained in:
Thomas Haller
2019-05-23 17:35:55 +02:00
parent a01e760667
commit cdaedecaa7
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dispatcher/nm-dispatcher.c
View File

@@ -1020,6 +1020,7 @@ main (int argc, char **argv)
guint signal_id_term = 0; guint signal_id_term = 0;
guint signal_id_int = 0; guint signal_id_int = 0;
guint dbus_regist_id = 0; guint dbus_regist_id = 0;
guint dbus_own_name_id = 0;
if (!parse_command_line (&argc, &argv, &error)) { if (!parse_command_line (&argc, &argv, &error)) {
_LOG_X_W ("Error parsing command line arguments: %s", error->message); _LOG_X_W ("Error parsing command line arguments: %s", error->message);
@@ -1066,12 +1067,12 @@ main (int argc, char **argv)
goto done; goto done;
} }
g_bus_own_name_on_connection (gl.dbus_connection, dbus_own_name_id = g_bus_own_name_on_connection (gl.dbus_connection,
NM_DISPATCHER_DBUS_SERVICE, NM_DISPATCHER_DBUS_SERVICE,
G_BUS_NAME_OWNER_FLAGS_NONE, G_BUS_NAME_OWNER_FLAGS_NONE,
on_name_acquired, on_name_acquired,
on_name_lost, on_name_lost,
NULL, NULL); NULL, NULL);
quit_timeout_reschedule (); quit_timeout_reschedule ();
@@ -1079,6 +1080,9 @@ main (int argc, char **argv)
done: done:
if (dbus_own_name_id != 0)
g_bus_unown_name (nm_steal_int (&dbus_own_name_id));
if (dbus_regist_id != 0) if (dbus_regist_id != 0)
g_dbus_connection_unregister_object (gl.dbus_connection, nm_steal_int (&dbus_regist_id)); g_dbus_connection_unregister_object (gl.dbus_connection, nm_steal_int (&dbus_regist_id));