From 5b211d71f638a3e63cdb55d7e4a333048c9fa436 Mon Sep 17 00:00:00 2001 From: Ondrej Holy Date: Fri, 24 May 2013 11:22:15 +0200 Subject: [PATCH 1/3] daemon: Rename on_passwd_monitor_changed to on_users_monitor_changed The function isn't called only for passwd monitor, but for all of them. https://bugs.freedesktop.org/show_bug.cgi?id=63159 --- src/daemon.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/daemon.c b/src/daemon.c index c7457d2..e396aef 100644 --- a/src/daemon.c +++ b/src/daemon.c @@ -704,11 +704,11 @@ queue_reload_autologin (Daemon *daemon) } static void -on_passwd_monitor_changed (GFileMonitor *monitor, - GFile *file, - GFile *other_file, - GFileMonitorEvent event_type, - Daemon *daemon) +on_users_monitor_changed (GFileMonitor *monitor, + GFile *file, + GFile *other_file, + GFileMonitorEvent event_type, + Daemon *daemon) { if (event_type != G_FILE_MONITOR_EVENT_CHANGED && event_type != G_FILE_MONITOR_EVENT_CREATED) { @@ -777,7 +777,7 @@ daemon_init (Daemon *daemon) if (daemon->priv->passwd_monitor != NULL) { g_signal_connect (daemon->priv->passwd_monitor, "changed", - G_CALLBACK (on_passwd_monitor_changed), + G_CALLBACK (on_users_monitor_changed), daemon); } else { g_warning ("Unable to monitor %s: %s", PATH_PASSWD, error->message); @@ -786,7 +786,7 @@ daemon_init (Daemon *daemon) if (daemon->priv->shadow_monitor != NULL) { g_signal_connect (daemon->priv->shadow_monitor, "changed", - G_CALLBACK (on_passwd_monitor_changed), + G_CALLBACK (on_users_monitor_changed), daemon); } else { g_warning ("Unable to monitor %s: %s", PATH_SHADOW, error->message); -- 1.8.1.4