Attachment 81007 Details for Bug 65846 – Factor out file monitor setup.

[patch] Factor out file monitor setup.

0001-Factor-out-file-monitor-setup.patch (text/plain), 6.90 KB, created by Marius Vollmer on 2013-06-18 13:58:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marius Vollmer

Created: 2013-06-18 13:58:54 UTC

Size: 6.90 KB

patch

obsolete

>From 0a781e1da2bbd395940b82dde2a10f334d0a4b0d Mon Sep 17 00:00:00 2001
>From: Marius Vollmer <mvollmer@redhat.com>
>Date: Tue, 18 Jun 2013 09:32:30 +0300
>Subject: [PATCH 1/4] Factor out file monitor setup.
>
>---
> src/daemon.c | 113 +++++++++++++++++++++++++----------------------------------
> 1 file changed, 48 insertions(+), 65 deletions(-)
>
>diff --git a/src/daemon.c b/src/daemon.c
>index ec5cc82..cbaab2a 100644
>--- a/src/daemon.c
>+++ b/src/daemon.c
>@@ -121,7 +121,7 @@ G_DEFINE_TYPE_WITH_CODE (Daemon, daemon, ACCOUNTS_TYPE_ACCOUNTS_SKELETON, G_IMPL
> #define DAEMON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DAEMON, DaemonPrivate))
> 
> static const GDBusErrorEntry accounts_error_entries[] =
>-{ 
>+{
>         { ERROR_FAILED, "org.freedesktop.Accounts.Error.Failed" },
>         { ERROR_USER_EXISTS, "org.freedesktop.Accounts.Error.UserExists" },
>         { ERROR_USER_DOES_NOT_EXIST, "org.freedesktop.Accounts.Error.UserDoesNotExist" },
>@@ -743,12 +743,44 @@ on_gdm_monitor_changed (GFileMonitor      *monitor,
>         queue_reload_autologin (daemon);
> }
> 
>+typedef void FileChangeCallback (GFileMonitor      *monitor,
>+                                 GFile             *file,
>+                                 GFile             *other_file,
>+                                 GFileMonitorEvent  event_type,
>+                                 Daemon            *daemon);
>+
>+static GFileMonitor *
>+setup_monitor (Daemon             *daemon,
>+               const gchar        *path,
>+               FileChangeCallback *callback)
>+{
>+        GError *error = NULL;
>+        GFile *file;
>+        GFileMonitor *monitor;
>+
>+        file = g_file_new_for_path (path);
>+        monitor = g_file_monitor_file (file,
>+                                       G_FILE_MONITOR_NONE,
>+                                       NULL,
>+                                       &error);
>+        if (monitor != NULL) {
>+                g_signal_connect (monitor,
>+                                  "changed",
>+                                  G_CALLBACK (callback),
>+                                  daemon);
>+        } else {
>+                g_warning ("Unable to monitor %s: %s", path, error->message);
>+                g_error_free (error);
>+        }
>+        g_object_unref (file);
>+
>+        return monitor;
>+}
>+
> static void
> daemon_init (Daemon *daemon)
> {
>         gint i;
>-        GFile *file;
>-        GError *error;
> 
>         daemon->priv = DAEMON_GET_PRIVATE (daemon);
> 
>@@ -765,71 +797,22 @@ daemon_init (Daemon *daemon)
> 
>         daemon->priv->users = create_users_hash_table ();
> 
>-        file = g_file_new_for_path (PATH_PASSWD);
>-        daemon->priv->passwd_monitor = g_file_monitor_file (file,
>-                                                            G_FILE_MONITOR_NONE,
>-                                                            NULL,
>-                                                            &error);
>-        if (daemon->priv->passwd_monitor != NULL) {
>-                g_signal_connect (daemon->priv->passwd_monitor,
>-                                  "changed",
>-                                  G_CALLBACK (on_users_monitor_changed),
>-                                  daemon);
>-        } else {
>-                g_warning ("Unable to monitor %s: %s", PATH_PASSWD, error->message);
>-                g_error_free (error);
>-        }
>-        g_object_unref (file);
>-
>-        file = g_file_new_for_path (PATH_SHADOW);
>-        daemon->priv->shadow_monitor = g_file_monitor_file (file,
>-                                                            G_FILE_MONITOR_NONE,
>-                                                            NULL,
>-                                                            &error);
>-        if (daemon->priv->shadow_monitor != NULL) {
>-                g_signal_connect (daemon->priv->shadow_monitor,
>-                                  "changed",
>-                                  G_CALLBACK (on_users_monitor_changed),
>-                                  daemon);
>-        } else {
>-                g_warning ("Unable to monitor %s: %s", PATH_SHADOW, error->message);
>-                g_error_free (error);
>-        }
>-        g_object_unref (file);
>+        daemon->priv->passwd_monitor = setup_monitor (daemon,
>+                                                      PATH_PASSWD,
>+                                                      on_users_monitor_changed);
>+        daemon->priv->shadow_monitor = setup_monitor (daemon,
>+                                                      PATH_SHADOW,
>+                                                      on_users_monitor_changed);
> 
> #ifdef HAVE_UTMPX_H
>-        file = g_file_new_for_path (PATH_WTMP);
>-        daemon->priv->wtmp_monitor = g_file_monitor_file (file,
>-                                                           G_FILE_MONITOR_NONE,
>-                                                           NULL,
>-                                                           &error);
>-        if (daemon->priv->wtmp_monitor != NULL) {
>-                g_signal_connect (daemon->priv->wtmp_monitor,
>-                                  "changed",
>-                                  G_CALLBACK (on_users_monitor_changed),
>-                                  daemon);
>-        } else {
>-                g_warning ("Unable to monitor %s: %s", PATH_WTMP, error->message);
>-                g_error_free (error);
>-        }
>-        g_object_unref (file);
>+        daemon->priv->wtmp_monitor = setup_monitor (daemon,
>+                                                    PATH_WTMP,
>+                                                    on_users_monitor_changed);
> #endif
> 
>-        file = g_file_new_for_path (PATH_GDM_CUSTOM);
>-        daemon->priv->gdm_monitor = g_file_monitor_file (file,
>-                                                         G_FILE_MONITOR_NONE,
>-                                                         NULL,
>-                                                         &error);
>-        if (daemon->priv->gdm_monitor != NULL) {
>-                g_signal_connect (daemon->priv->gdm_monitor,
>-                                  "changed",
>-                                  G_CALLBACK (on_gdm_monitor_changed),
>-                                  daemon);
>-        } else {
>-                g_warning ("Unable to monitor %s: %s", PATH_GDM_CUSTOM, error->message);
>-                g_error_free (error);
>-        }
>-        g_object_unref (file);
>+        daemon->priv->gdm_monitor = setup_monitor (daemon,
>+                                                   PATH_GDM_CUSTOM,
>+                                                   on_gdm_monitor_changed);
> 
>         queue_reload_users (daemon);
>         queue_reload_autologin (daemon);
>@@ -887,7 +870,7 @@ register_accounts_daemon (Daemon *daemon)
>                         g_critical ("error exporting interface: %s", error->message);
>                         g_error_free (error);
>                 }
>-                goto error;     
>+                goto error;
>         }
> 
>         return TRUE;
>-- 
>1.8.1.4
>

Actions: View | Splinter Review

Attachments on bug 65846: 80934 | 80935 | 80948 | 80983 | 80984 | 80985 | 81007

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.