diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-01-24 13:17:02 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-01-24 13:17:02 -0600 |
| commit | 471526597b5104a027dc399625ef6246a5e67d27 (patch) | |
| tree | 87eb0199d51e1796f1c88dd2b9b69b82045cf81f | |
| parent | 016dbcc99e4c9b7f030bfef7d7ce65af87ebd9f5 (diff) | |
| download | NetworkManager-471526597b5104a027dc399625ef6246a5e67d27.tar.gz | |
trivial: simplify some code
| -rw-r--r-- | src/nm-manager.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c index c487f20e52..b2272c3505 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -245,7 +245,6 @@ typedef struct { /* Firmware dir monitor */ GFileMonitor *fw_monitor; - guint fw_monitor_id; guint fw_changed_id; guint timestamp_update_id; @@ -4684,10 +4683,7 @@ dispose (GObject *object) g_clear_object (&priv->sleep_monitor); if (priv->fw_monitor) { - if (priv->fw_monitor_id) { - g_signal_handler_disconnect (priv->fw_monitor, priv->fw_monitor_id); - priv->fw_monitor_id = 0; - } + g_signal_handlers_disconnect_by_func (priv->fw_monitor, firmware_dir_changed, manager); if (priv->fw_changed_id) { g_source_remove (priv->fw_changed_id); @@ -5064,9 +5060,9 @@ nm_manager_init (NMManager *manager) } if (priv->fw_monitor) { - priv->fw_monitor_id = g_signal_connect (priv->fw_monitor, "changed", - G_CALLBACK (firmware_dir_changed), - manager); + g_signal_connect (priv->fw_monitor, "changed", + G_CALLBACK (firmware_dir_changed), + manager); nm_log_info (LOGD_CORE, "monitoring kernel firmware directory '%s'.", KERNEL_FIRMWARE_DIR); } else { |