X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fglocalfilemonitor.c;h=818440b6e5c36c5b3911b27ae8c550c555e1bc15;hb=2e5bd8cf47f9e1559ccc44823a2f321b8ff8c1ea;hp=91d524f5eadc83f3e7ff5bf683de75c788b3f664;hpb=5b946e0504952a472cea1ef95df0967e8a4a7b47;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/glocalfilemonitor.c b/gio/glocalfilemonitor.c
index 91d524f..818440b 100644
--- a/gio/glocalfilemonitor.c
+++ b/gio/glocalfilemonitor.c
@@ -13,9 +13,7 @@
* 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
*/
@@ -51,71 +49,41 @@ 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:
- /* Do nothing as well */
+ 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;
- GFileMonitorFlags flags = 0;
- 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_warn_if_fail (G_VALUE_HOLDS_STRING (construct_properties[i].value));
- filename = g_value_get_string (construct_properties[i].value);
- }
- else 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);
- }
- }
+ GLocalFileMonitorClass *class;
- g_warn_if_fail (filename != NULL);
+ class = G_LOCAL_FILE_MONITOR_GET_CLASS (local_monitor);
- local_monitor->filename = g_strdup (filename);
- local_monitor->flags = flags;
- 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;
- }
+
+ g_free (local_monitor->filename);
G_OBJECT_CLASS (g_local_file_monitor_parent_class)->finalize (object);
}
@@ -126,7 +94,6 @@ static void g_local_file_monitor_class_init (GLocalFileMonitorClass *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,
@@ -150,75 +117,35 @@ static void g_local_file_monitor_class_init (GLocalFileMonitorClass *klass)
G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB));
}
-static gpointer
-get_default_local_file_monitor (gpointer data)
-{
- GLocalFileMonitorClass *chosen_class;
- GLocalFileMonitorClass **ret = data;
- GIOExtensionPoint *ep;
- GList *extensions, *l;
-
- _g_io_modules_ensure_loaded ();
-
- ep = g_io_extension_point_lookup (G_LOCAL_FILE_MONITOR_EXTENSION_POINT_NAME);
-
- extensions = g_io_extension_point_get_extensions (ep);
-
- chosen_class = NULL;
- for (l = extensions; l != NULL; l = l->next)
- {
- GIOExtension *extension = l->data;
- GLocalFileMonitorClass *klass;
-
- klass = G_LOCAL_FILE_MONITOR_CLASS (g_io_extension_ref_class (extension));
-
- if (klass->is_supported ())
- {
- chosen_class = klass;
- break;
- }
- else
- g_type_class_unref (klass);
- }
-
- if (chosen_class)
- {
- *ret = chosen_class;
- return (gpointer)G_TYPE_FROM_CLASS (chosen_class);
- }
- else
- return (gpointer)G_TYPE_INVALID;
-}
-
GFileMonitor*
_g_local_file_monitor_new (const char *pathname,
- GFileMonitorFlags flags,
- GError **error)
+ GFileMonitorFlags flags,
+ GMainContext *context,
+ gboolean is_remote_fs,
+ gboolean do_start,
+ GError **error)
{
- static GOnce once_init = G_ONCE_INIT;
- GTypeClass *type_class;
- GFileMonitor *monitor;
- GType type;
+ GFileMonitor *monitor = NULL;
+ GType 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));
- type_class = NULL;
- g_once (&once_init, get_default_local_file_monitor, &type_class);
- type = (GType)once_init.retval;
+ 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));
- monitor = NULL;
if (type != G_TYPE_INVALID)
- monitor = G_FILE_MONITOR (g_object_new (type, "filename", pathname, "flags", flags, NULL));
+ 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"));
- /* 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);
-
+ if (monitor && do_start)
+ g_local_file_monitor_start (G_LOCAL_FILE_MONITOR (monitor));
+
return monitor;
}