* Author: Alexander Larsson <alexl@redhat.com>
*/
-#include <config.h>
+#include "config.h"
#include "glocaldirectorymonitor.h"
#include "gunixmounts.h"
-#include "gdirectorymonitor.h"
#include "giomodule-priv.h"
+#include "gfile.h"
+#include "gioerror.h"
+#include "glibintl.h"
#include <string.h>
-#include "gioalias.h"
enum
{
PROP_0,
- PROP_DIRNAME
+ PROP_DIRNAME,
+ PROP_FLAGS
};
-static gboolean g_local_directory_monitor_cancel (GDirectoryMonitor* monitor);
-static void mounts_changed (GUnixMountMonitor *mount_monitor, gpointer user_data);
+static gboolean g_local_directory_monitor_cancel (GFileMonitor *monitor);
+static void mounts_changed (GUnixMountMonitor *mount_monitor,
+ gpointer user_data);
-G_DEFINE_ABSTRACT_TYPE (GLocalDirectoryMonitor, g_local_directory_monitor, G_TYPE_DIRECTORY_MONITOR)
+G_DEFINE_ABSTRACT_TYPE (GLocalDirectoryMonitor, g_local_directory_monitor, G_TYPE_FILE_MONITOR)
static void
-g_local_directory_monitor_finalize (GObject* object)
+g_local_directory_monitor_finalize (GObject *object)
{
- GLocalDirectoryMonitor* local_monitor;
+ GLocalDirectoryMonitor *local_monitor;
local_monitor = G_LOCAL_DIRECTORY_MONITOR (object);
g_free (local_monitor->dirname);
local_monitor->mount_monitor = NULL;
}
- if (G_OBJECT_CLASS (g_local_directory_monitor_parent_class)->finalize)
- (*G_OBJECT_CLASS (g_local_directory_monitor_parent_class)->finalize) (object);
+ G_OBJECT_CLASS (g_local_directory_monitor_parent_class)->finalize (object);
}
static void
case PROP_DIRNAME:
/* Do nothing */
break;
+ case PROP_FLAGS:
+ /* Do nothing */
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
GLocalDirectoryMonitorClass *klass;
GObjectClass *parent_class;
GLocalDirectoryMonitor *local_monitor;
+ GFileMonitorFlags flags = 0;
const gchar *dirname = NULL;
gint i;
{
g_warn_if_fail (G_VALUE_HOLDS_STRING (construct_properties[i].value));
dirname = g_value_get_string (construct_properties[i].value);
- break;
+ }
+ if (strcmp ("flags", g_param_spec_get_name (construct_properties[i].pspec)) == 0)
+ {
+ g_warn_if_fail (G_VALUE_HOLDS_FLAGS (construct_properties[i].value));
+ flags = g_value_get_flags (construct_properties[i].value);
}
}
local_monitor->dirname = g_strdup (dirname);
+ local_monitor->flags = flags;
- if (!klass->mount_notify)
+ if (!klass->mount_notify &&
+ (flags & G_FILE_MONITOR_WATCH_MOUNTS))
{
#ifdef G_OS_WIN32
- g_warning ("G_OS_WIN32: no mount emulation");
+ /*claim everything was mounted */
+ local_monitor->was_mounted = TRUE;
#else
- GUnixMount *mount;
+ GUnixMountEntry *mount;
/* Emulate unmount detection */
- mount = g_get_unix_mount_at (local_monitor->dirname, NULL);
+ mount = g_unix_mount_at (local_monitor->dirname, NULL);
local_monitor->was_mounted = mount != NULL;
g_unix_mount_free (mount);
local_monitor->mount_monitor = g_unix_mount_monitor_new ();
- g_signal_connect (local_monitor->mount_monitor, "mounts_changed",
- G_CALLBACK (mounts_changed), local_monitor);
+ g_signal_connect_object (local_monitor->mount_monitor, "mounts-changed",
+ G_CALLBACK (mounts_changed), local_monitor, 0);
#endif
}
g_local_directory_monitor_class_init (GLocalDirectoryMonitorClass* klass)
{
GObjectClass* gobject_class = G_OBJECT_CLASS (klass);
- GDirectoryMonitorClass *dir_monitor_class = G_DIRECTORY_MONITOR_CLASS (klass);
+ GFileMonitorClass *file_monitor_class = G_FILE_MONITOR_CLASS (klass);
gobject_class->finalize = g_local_directory_monitor_finalize;
gobject_class->set_property = g_local_directory_monitor_set_property;
gobject_class->constructor = g_local_directory_monitor_constructor;
- dir_monitor_class->cancel = g_local_directory_monitor_cancel;
-
- g_object_class_install_property (gobject_class, PROP_DIRNAME,
- g_param_spec_string ("dirname", "Directory name", "Directory to monitor",
- NULL, G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
+ file_monitor_class->cancel = g_local_directory_monitor_cancel;
+
+ g_object_class_install_property (gobject_class,
+ PROP_DIRNAME,
+ g_param_spec_string ("dirname",
+ P_("Directory name"),
+ P_("Directory to monitor"),
+ NULL,
+ G_PARAM_CONSTRUCT_ONLY|
+ G_PARAM_WRITABLE|
+ G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB));
+ g_object_class_install_property (gobject_class,
+ PROP_FLAGS,
+ g_param_spec_flags ("flags",
+ P_("Monitor flags"),
+ P_("Monitor flags"),
+ G_TYPE_FILE_MONITOR_FLAGS,
+ 0,
+ G_PARAM_CONSTRUCT_ONLY|
+ G_PARAM_WRITABLE|
+ G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB));
klass->mount_notify = FALSE;
}
static void
-g_local_directory_monitor_init (GLocalDirectoryMonitor* local_monitor)
+g_local_directory_monitor_init (GLocalDirectoryMonitor *local_monitor)
{
}
gpointer user_data)
{
GLocalDirectoryMonitor *local_monitor = user_data;
- GUnixMount *mount;
+ GUnixMountEntry *mount;
gboolean is_mounted;
GFile *file;
/* Emulate unmount detection */
#ifdef G_OS_WIN32
mount = NULL;
- g_warning ("G_OS_WIN32: no mount emulation");
+ /*claim everything was mounted */
+ is_mounted = TRUE;
#else
- mount = g_get_unix_mount_at (local_monitor->dirname, NULL);
+ mount = g_unix_mount_at (local_monitor->dirname, NULL);
is_mounted = mount != NULL;
if (local_monitor->was_mounted && !is_mounted)
{
file = g_file_new_for_path (local_monitor->dirname);
- g_directory_monitor_emit_event (G_DIRECTORY_MONITOR (local_monitor),
- file, NULL,
- G_FILE_MONITOR_EVENT_UNMOUNTED);
+ g_file_monitor_emit_event (G_FILE_MONITOR (local_monitor),
+ file, NULL,
+ G_FILE_MONITOR_EVENT_UNMOUNTED);
g_object_unref (file);
}
local_monitor->was_mounted = is_mounted;
}
}
-static gint
-_compare_monitor_class_by_prio (gconstpointer a,
- gconstpointer b,
- gpointer user_data)
-{
- GType *type1 = (GType *) a, *type2 = (GType *) b;
- GLocalDirectoryMonitorClass *klass1, *klass2;
- gint ret;
-
- klass1 = G_LOCAL_DIRECTORY_MONITOR_CLASS (g_type_class_ref (*type1));
- klass2 = G_LOCAL_DIRECTORY_MONITOR_CLASS (g_type_class_ref (*type2));
-
- ret = klass1->prio - klass2->prio;
-
- g_type_class_unref (klass1);
- g_type_class_unref (klass2);
-
- return ret;
-}
-
-extern GType _g_inotify_directory_monitor_get_type (void);
-
static gpointer
get_default_local_directory_monitor (gpointer data)
{
- GType *monitor_impls, chosen_type;
- guint n_monitor_impls;
- GType *ret = (GType *) data;
- gint i;
-
-#if defined(HAVE_SYS_INOTIFY_H) || defined(HAVE_LINUX_INOTIFY_H)
- /* Register Inotify monitor */
- _g_inotify_directory_monitor_get_type ();
-#endif
+ GLocalDirectoryMonitorClass *chosen_class;
+ GLocalDirectoryMonitorClass **ret = data;
+ GIOExtensionPoint *ep;
+ GList *extensions, *l;
_g_io_modules_ensure_loaded ();
-
- monitor_impls = g_type_children (G_TYPE_LOCAL_DIRECTORY_MONITOR,
- &n_monitor_impls);
-
- chosen_type = G_TYPE_INVALID;
- g_qsort_with_data (monitor_impls,
- n_monitor_impls,
- sizeof (GType),
- _compare_monitor_class_by_prio,
- NULL);
+ ep = g_io_extension_point_lookup (G_LOCAL_DIRECTORY_MONITOR_EXTENSION_POINT_NAME);
- for (i = n_monitor_impls - 1; i >= 0 && chosen_type == G_TYPE_INVALID; i--)
- {
+ extensions = g_io_extension_point_get_extensions (ep);
+
+ chosen_class = NULL;
+ for (l = extensions; l != NULL; l = l->next)
+ {
+ GIOExtension *extension = l->data;
GLocalDirectoryMonitorClass *klass;
-
- klass = G_LOCAL_DIRECTORY_MONITOR_CLASS (g_type_class_ref (monitor_impls[i]));
-
- if (klass->is_supported())
- chosen_type = monitor_impls[i];
-
- g_type_class_unref (klass);
+
+ klass = G_LOCAL_DIRECTORY_MONITOR_CLASS (g_io_extension_ref_class (extension));
+
+ if (klass->is_supported ())
+ {
+ chosen_class = klass;
+ break;
+ }
+ else
+ g_type_class_unref (klass);
}
-
- g_free (monitor_impls);
- *ret = chosen_type;
-
- return NULL;
+
+ if (chosen_class)
+ {
+ *ret = chosen_class;
+ return (gpointer)G_TYPE_FROM_CLASS (chosen_class);
+ }
+ else
+ return (gpointer)G_TYPE_INVALID;
}
-/**
- * g_local_directory_monitor_new:
- * @dirname: filename of the directory to monitor.
- * @flags: #GFileMonitorFlags.
- *
- * Returns: new #GDirectoryMonitor for the given @dirname.
- **/
-GDirectoryMonitor*
-_g_local_directory_monitor_new (const char* dirname,
- GFileMonitorFlags flags)
+GFileMonitor*
+_g_local_directory_monitor_new (const char *dirname,
+ GFileMonitorFlags flags,
+ GError **error)
{
static GOnce once_init = G_ONCE_INIT;
- static GType monitor_type = G_TYPE_INVALID;
-
- g_once (&once_init, get_default_local_directory_monitor, &monitor_type);
-
- if (monitor_type != G_TYPE_INVALID)
- return G_DIRECTORY_MONITOR (g_object_new (monitor_type, "dirname", dirname, NULL));
-
- return NULL;
+ GTypeClass *type_class;
+ GFileMonitor *monitor;
+ GType type;
+
+ type_class = NULL;
+ g_once (&once_init, get_default_local_directory_monitor, &type_class);
+ type = (GType)once_init.retval;
+
+ monitor = NULL;
+ if (type != G_TYPE_INVALID)
+ monitor = G_FILE_MONITOR (g_object_new (type, "dirname", dirname, "flags", flags, NULL));
+ else
+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ _("Unable to find default local directory monitor type"));
+
+ /* This is non-null on first pass here. Unref the class now.
+ * This is to avoid unloading the module and then loading it
+ * again which would happen if we unrefed the class
+ * before creating the monitor.
+ */
+
+ if (type_class)
+ g_type_class_unref (type_class);
+
+ return monitor;
}
static gboolean
-g_local_directory_monitor_cancel (GDirectoryMonitor* monitor)
+g_local_directory_monitor_cancel (GFileMonitor *monitor)
{
GLocalDirectoryMonitor *local_monitor = G_LOCAL_DIRECTORY_MONITOR (monitor);
return TRUE;
}
-
-#define __G_LOCAL_DIRECTORY_MONITOR_C__
-#include "gioaliasdef.c"