X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fglocalfilemonitor.c;h=818440b6e5c36c5b3911b27ae8c550c555e1bc15;hb=a3d86afa81ff34ce797a3928fd619ead219a37af;hp=1820db9487b67e79764abb09b2ab9f32bb419d3d;hpb=4f039bd490856afab9d0eff22fbaeeadaef651a2;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/glocalfilemonitor.c b/gio/glocalfilemonitor.c
index 1820db9..818440b 100644
--- a/gio/glocalfilemonitor.c
+++ b/gio/glocalfilemonitor.c
@@ -13,26 +13,27 @@
* 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 "gioenumtypes.h"
#include "glocalfilemonitor.h"
-#include "giomodule.h"
+#include "giomodule-priv.h"
+#include "gioerror.h"
+#include "glibintl.h"
#include
-#include "gioalias.h"
enum
{
PROP_0,
- PROP_FILENAME
+ PROP_FILENAME,
+ PROP_FLAGS
};
G_DEFINE_ABSTRACT_TYPE (GLocalFileMonitor, g_local_file_monitor, G_TYPE_FILE_MONITOR)
@@ -48,169 +49,103 @@ g_local_file_monitor_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
+ GLocalFileMonitor *local_monitor = G_LOCAL_FILE_MONITOR (object);
+
switch (property_id)
- {
+ {
case PROP_FILENAME:
- /* Do nothing */
+ local_monitor->filename = 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_file_monitor_constructor (GType type,
- guint n_construct_properties,
- GObjectConstructParam *construct_properties)
+void
+g_local_file_monitor_start (GLocalFileMonitor *local_monitor)
{
- GObject *obj;
- GLocalFileMonitorClass *klass;
- GObjectClass *parent_class;
- GLocalFileMonitor *local_monitor;
- const gchar *filename = NULL;
- gint i;
-
- klass = G_LOCAL_FILE_MONITOR_CLASS (g_type_class_peek (G_TYPE_LOCAL_FILE_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_FILE_MONITOR (obj);
-
- for (i = 0; i < n_construct_properties; i++)
- {
- if (strcmp ("filename", g_param_spec_get_name (construct_properties[i].pspec)) == 0)
- {
- g_assert (G_VALUE_HOLDS_STRING (construct_properties[i].value));
- filename = g_value_get_string (construct_properties[i].value);
- break;
- }
- }
+ GLocalFileMonitorClass *class;
- g_assert (filename != NULL);
+ class = G_LOCAL_FILE_MONITOR_GET_CLASS (local_monitor);
- local_monitor->filename = g_strdup (filename);
- return obj;
+ if (class->start)
+ class->start (local_monitor);
}
static void
g_local_file_monitor_finalize (GObject *object)
{
GLocalFileMonitor *local_monitor = G_LOCAL_FILE_MONITOR (object);
- if (local_monitor->filename)
- {
- g_free (local_monitor->filename);
- local_monitor->filename = NULL;
- }
- if (G_OBJECT_CLASS (g_local_file_monitor_parent_class)->finalize)
- (*G_OBJECT_CLASS (g_local_file_monitor_parent_class)->finalize) (object);
+ g_free (local_monitor->filename);
+
+ G_OBJECT_CLASS (g_local_file_monitor_parent_class)->finalize (object);
}
-static void
-g_local_file_monitor_class_init (GLocalFileMonitorClass* klass)
+static void g_local_file_monitor_class_init (GLocalFileMonitorClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
gobject_class->set_property = g_local_file_monitor_set_property;
gobject_class->finalize = g_local_file_monitor_finalize;
- gobject_class->constructor = g_local_file_monitor_constructor;
-
- g_object_class_install_property (gobject_class, PROP_FILENAME,
- g_param_spec_string ("filename", "File name", "File name to monitor",
- NULL, G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
-}
-
-static gint
-_compare_monitor_class_by_prio (gconstpointer a,
- gconstpointer b,
- gpointer user_data)
-{
- GType *type1 = (GType *) a, *type2 = (GType *) b;
- GLocalFileMonitorClass *klass1, *klass2;
- gint ret;
-
- klass1 = G_LOCAL_FILE_MONITOR_CLASS (g_type_class_ref (*type1));
- klass2 = G_LOCAL_FILE_MONITOR_CLASS (g_type_class_ref (*type2));
-
- ret = klass1->prio - klass2->prio;
- g_type_class_unref (klass1);
- g_type_class_unref (klass2);
-
- return ret;
+ g_object_class_install_property (gobject_class,
+ PROP_FILENAME,
+ g_param_spec_string ("filename",
+ P_("File name"),
+ P_("File name 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));
}
-extern GType _g_inotify_file_monitor_get_type (void);
-
-static gpointer
-get_default_local_file_monitor (gpointer data)
+GFileMonitor*
+_g_local_file_monitor_new (const char *pathname,
+ GFileMonitorFlags flags,
+ GMainContext *context,
+ gboolean is_remote_fs,
+ gboolean do_start,
+ GError **error)
{
- GType *monitor_impls, chosen_type;
- guint n_monitor_impls;
- gint i;
- GType *ret = (GType *) data;
-
-#if defined(HAVE_SYS_INOTIFY_H) || defined(HAVE_LINUX_INOTIFY_H)
- /* Register Inotify monitor */
- _g_inotify_file_monitor_get_type ();
-#endif
-
- _g_io_modules_ensure_loaded ();
-
- monitor_impls = g_type_children (G_TYPE_LOCAL_FILE_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_FILE_MONITOR_EXTENSION_POINT_NAME,
+ "GIO_USE_FILE_MONITOR",
+ G_STRUCT_OFFSET (GLocalFileMonitorClass, is_supported));
- g_qsort_with_data (monitor_impls,
- n_monitor_impls,
- sizeof (GType),
- _compare_monitor_class_by_prio,
- NULL);
-
- for (i = n_monitor_impls - 1; i >= 0 && chosen_type == G_TYPE_INVALID; i--)
- {
- GLocalFileMonitorClass *klass;
-
- klass = G_LOCAL_FILE_MONITOR_CLASS (g_type_class_ref (monitor_impls[i]));
-
- if (klass->is_supported())
- chosen_type = monitor_impls[i];
-
- g_type_class_unref (klass);
- }
+ if (type == G_TYPE_INVALID)
+ type = _g_io_module_get_default_type (G_LOCAL_FILE_MONITOR_EXTENSION_POINT_NAME,
+ "GIO_USE_FILE_MONITOR",
+ G_STRUCT_OFFSET (GLocalFileMonitorClass, is_supported));
- g_free (monitor_impls);
+ if (type != G_TYPE_INVALID)
+ monitor = G_FILE_MONITOR (g_object_new (type, "filename", pathname, "flags", flags, "context", context, NULL));
+ else
+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ _("Unable to find default local file monitor type"));
- *ret = chosen_type;
+ if (monitor && do_start)
+ g_local_file_monitor_start (G_LOCAL_FILE_MONITOR (monitor));
- return NULL;
+ return monitor;
}
-
-/**
- * g_local_file_monitor_new:
- * @pathname: path name to monitor.
- * @flags: #GFileMonitorFlags.
- *
- * Returns: a new #GFileMonitor for the given @pathname.
- **/
-GFileMonitor*
-_g_local_file_monitor_new (const char *pathname,
- GFileMonitorFlags flags)
-{
- static GOnce once_init = G_ONCE_INIT;
- static GType monitor_type = G_TYPE_INVALID;
-
- g_once (&once_init, get_default_local_file_monitor, &monitor_type);
-
- if (monitor_type != G_TYPE_INVALID)
- return G_FILE_MONITOR (g_object_new (monitor_type, "filename", pathname, NULL));
-
- return NULL;
-}
-
-#define __G_LOCAL_FILE_MONITOR_C__
-#include "gioaliasdef.c"