X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fglocaldirectorymonitor.c;h=d85d752363cfc62651fa400bedd832802b6df53b;hb=c3842d1969feace4bfb12919be730e75e53877d9;hp=d620afc6680a28b34145c658add5c5c29d64351f;hpb=cc3de68e2151cf3341115212c56c17714ca03bb2;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/glocaldirectorymonitor.c b/gio/glocaldirectorymonitor.c
index d620afc..d85d752 100644
--- a/gio/glocaldirectorymonitor.c
+++ b/gio/glocaldirectorymonitor.c
@@ -13,39 +13,40 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see .
*
* Author: Alexander Larsson
*/
-#include
+#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
-#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);
@@ -57,8 +58,7 @@ g_local_directory_monitor_finalize (GObject* object)
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
@@ -67,95 +67,94 @@ g_local_directory_monitor_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
+ GLocalDirectoryMonitor *local_monitor = G_LOCAL_DIRECTORY_MONITOR (object);
+
switch (property_id)
- {
+ {
case PROP_DIRNAME:
- /* Do nothing */
+ local_monitor->dirname = g_value_dup_string (value);
break;
+
+ case PROP_FLAGS:
+ local_monitor->flags = g_value_get_flags (value);
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
- }
+ }
}
-static GObject *
-g_local_directory_monitor_constructor (GType type,
- guint n_construct_properties,
- GObjectConstructParam *construct_properties)
+void
+g_local_directory_monitor_start (GLocalDirectoryMonitor *local_monitor)
{
- GObject *obj;
- GLocalDirectoryMonitorClass *klass;
- GObjectClass *parent_class;
- GLocalDirectoryMonitor *local_monitor;
- const gchar *dirname = NULL;
- gint i;
-
- klass = G_LOCAL_DIRECTORY_MONITOR_CLASS (g_type_class_peek (G_TYPE_LOCAL_DIRECTORY_MONITOR));
- parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (klass));
- obj = parent_class->constructor (type,
- n_construct_properties,
- construct_properties);
-
- local_monitor = G_LOCAL_DIRECTORY_MONITOR (obj);
-
- for (i = 0; i < n_construct_properties; i++)
- {
- if (strcmp ("dirname", g_param_spec_get_name (construct_properties[i].pspec)) == 0)
- {
- g_warn_if_fail (G_VALUE_HOLDS_STRING (construct_properties[i].value));
- dirname = g_value_get_string (construct_properties[i].value);
- break;
- }
- }
+ GLocalDirectoryMonitorClass *class;
- local_monitor->dirname = g_strdup (dirname);
+ class = G_LOCAL_DIRECTORY_MONITOR_GET_CLASS (local_monitor);
- if (!klass->mount_notify)
+ if (!class->mount_notify && (local_monitor->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;
-
+
if (mount)
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
}
- return obj;
+ if (class->start)
+ class->start (local_monitor);
}
static void
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)
{
}
@@ -164,21 +163,23 @@ mounts_changed (GUnixMountMonitor *mount_monitor,
gpointer user_data)
{
GLocalDirectoryMonitor *local_monitor = user_data;
- GUnixMount *mount;
+#ifdef G_OS_UNIX
+ GUnixMountEntry *mount;
+#endif
gboolean is_mounted;
GFile *file;
/* Emulate unmount detection */
-#ifdef G_OS_WIN32
- mount = NULL;
- g_warning ("G_OS_WIN32: no mount emulation");
-#else
- mount = g_get_unix_mount_at (local_monitor->dirname, NULL);
+#ifdef G_OS_UNIX
+ mount = g_unix_mount_at (local_monitor->dirname, NULL);
is_mounted = mount != NULL;
if (mount)
g_unix_mount_free (mount);
+#else
+ /*claim everything was mounted */
+ is_mounted = TRUE;
#endif
if (local_monitor->was_mounted != is_mounted)
@@ -186,105 +187,50 @@ mounts_changed (GUnixMountMonitor *mount_monitor,
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)
+GFileMonitor*
+_g_local_directory_monitor_new (const char *dirname,
+ GFileMonitorFlags flags,
+ GMainContext *context,
+ gboolean is_remote_fs,
+ gboolean do_start,
+ GError **error)
{
- 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
-
- _g_io_modules_ensure_loaded ();
-
- monitor_impls = g_type_children (G_TYPE_LOCAL_DIRECTORY_MONITOR,
- &n_monitor_impls);
+ GFileMonitor *monitor = NULL;
+ GType type = G_TYPE_INVALID;
- chosen_type = G_TYPE_INVALID;
+ if (is_remote_fs)
+ type = _g_io_module_get_default_type (G_NFS_DIRECTORY_MONITOR_EXTENSION_POINT_NAME,
+ "GIO_USE_FILE_MONITOR",
+ G_STRUCT_OFFSET (GLocalDirectoryMonitorClass, is_supported));
- g_qsort_with_data (monitor_impls,
- n_monitor_impls,
- sizeof (GType),
- _compare_monitor_class_by_prio,
- NULL);
+ if (type == G_TYPE_INVALID)
+ type = _g_io_module_get_default_type (G_LOCAL_DIRECTORY_MONITOR_EXTENSION_POINT_NAME,
+ "GIO_USE_FILE_MONITOR",
+ G_STRUCT_OFFSET (GLocalDirectoryMonitorClass, is_supported));
- for (i = n_monitor_impls - 1; i >= 0 && chosen_type == G_TYPE_INVALID; i--)
- {
- GLocalDirectoryMonitorClass *klass;
+ if (type != G_TYPE_INVALID)
+ monitor = G_FILE_MONITOR (g_object_new (type, "dirname", dirname, "flags", flags, "context", context, NULL));
+ else
+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ _("Unable to find default local directory monitor type"));
- klass = G_LOCAL_DIRECTORY_MONITOR_CLASS (g_type_class_ref (monitor_impls[i]));
+ if (monitor && do_start)
+ g_local_directory_monitor_start (G_LOCAL_DIRECTORY_MONITOR (monitor));
- if (klass->is_supported())
- chosen_type = monitor_impls[i];
-
- g_type_class_unref (klass);
- }
-
- g_free (monitor_impls);
- *ret = chosen_type;
-
- return NULL;
-}
-
-/**
- * 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)
-{
- 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;
+ 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);
@@ -297,6 +243,3 @@ g_local_directory_monitor_cancel (GDirectoryMonitor* monitor)
return TRUE;
}
-
-#define __G_LOCAL_DIRECTORY_MONITOR_C__
-#include "gioaliasdef.c"