fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 11:19:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

keyfile: refactor dispose() of SCPluginKeyfile

Browse source
This commit is contained in:
Thomas Haller 2015-06-05 22:59:48 +02:00 • committed by Beniamino Galvani
parent 4739ff6e7c
commit bffe507cda
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/settings/plugins/keyfile/plugin.c
View file

@ -65,8 +65,6 @@ typedef struct {
const char *conf_file; const char *conf_file;
GFileMonitor *conf_file_monitor; GFileMonitor *conf_file_monitor;
guint conf_file_monitor_id; guint conf_file_monitor_id;
gboolean disposed;
} SCPluginKeyfilePrivate; } SCPluginKeyfilePrivate;
static void static void
@ -628,25 +626,24 @@ dispose (GObject *object)
{ {
SCPluginKeyfilePrivate *priv = SC_PLUGIN_KEYFILE_GET_PRIVATE (object); SCPluginKeyfilePrivate *priv = SC_PLUGIN_KEYFILE_GET_PRIVATE (object);
if (priv->disposed)
goto out;
priv->disposed = TRUE;
if (priv->monitor) { if (priv->monitor) {
if (priv->monitor_id) if (priv->monitor_id) {
g_signal_handler_disconnect (priv->monitor, priv->monitor_id); g_signal_handler_disconnect (priv->monitor, priv->monitor_id);
priv->monitor_id = 0;
}
g_file_monitor_cancel (priv->monitor); g_file_monitor_cancel (priv->monitor);
g_object_unref (priv->monitor); g_clear_object (&priv->monitor);
} }
if (priv->conf_file_monitor) { if (priv->conf_file_monitor) {
if (priv->conf_file_monitor_id) if (priv->conf_file_monitor_id) {
g_signal_handler_disconnect (priv->conf_file_monitor, priv->conf_file_monitor_id); g_signal_handler_disconnect (priv->conf_file_monitor, priv->conf_file_monitor_id);
priv->conf_file_monitor_id = 0;
}
g_file_monitor_cancel (priv->conf_file_monitor); g_file_monitor_cancel (priv->conf_file_monitor);
g_object_unref (priv->conf_file_monitor); g_clear_object (&priv->conf_file_monitor);
} }
if (priv->connections) { if (priv->connections) {
@ -654,7 +651,6 @@ dispose (GObject *object)
priv->connections = NULL; priv->connections = NULL;
} }
out:
G_OBJECT_CLASS (sc_plugin_keyfile_parent_class)->dispose (object); G_OBJECT_CLASS (sc_plugin_keyfile_parent_class)->dispose (object);
} }