Removed. Removed. Added. Added.

2007-09-17  Alexander Larsson  <alexl@redhat.com>

        * client/gdaemonfile.c:
        * client/gdaemonfileinputstream.c:
        * client/gdaemonfileoutputstream.c:
        * client/gvfsfusedaemon.c:
        * common/gvfsdaemonprotocol.h:
        * daemon/Makefile.am:
        * daemon/gvfsbackend.[ch]:
        * daemon/gvfsbackendftp.c:
        * daemon/gvfsbackendsftp.c:
        * daemon/gvfsbackendsmb.c:
        * daemon/gvfsbackendsmbbrowse.c:
        * daemon/gvfsbackendtest.c:
        * daemon/gvfsjobenumerate.h:
        * daemon/gvfsjobgetfsinfo.[ch]: Removed.
        * daemon/gvfsjobgetinfo.[ch]: Removed.
        * daemon/gvfsjobqueryfsinfo.[ch]: Added.
        * daemon/gvfsjobqueryinfo.[ch]: Added.
        * daemon/gvfsjobsetattribute.[ch]:
        * test/benchmark-gvfs-big-files.c:
        * test/benchmark-gvfs-small-files.c:
	Update with the get_info -> query_info rename in gio



svn path=/trunk/; revision=955

1 files changed, 160 insertions, 0 deletions

diff --git a/daemon/gvfsjobqueryinfo.c b/daemon/gvfsjobqueryinfo.c
new file mode 100644
index 00000000..2155267b
--- /dev/null
+++ b/daemon/gvfsjobqueryinfo.c
@@ -0,0 +1,160 @@
+
+#include <config.h>
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#include <glib.h>
+#include <dbus/dbus.h>
+#include <glib/gi18n.h>
+#include "gvfsjobqueryinfo.h"
+#include "gdbusutils.h"
+#include "gvfsdaemonprotocol.h"
+
+G_DEFINE_TYPE (GVfsJobQueryInfo, g_vfs_job_query_info, G_VFS_TYPE_JOB_DBUS);
+
+static void         run          (GVfsJob        *job);
+static gboolean     try          (GVfsJob        *job);
+static DBusMessage *create_reply (GVfsJob        *job,
+				  DBusConnection *connection,
+				  DBusMessage    *message);
+
+static void
+g_vfs_job_query_info_finalize (GObject *object)
+{
+  GVfsJobQueryInfo *job;
+
+  job = G_VFS_JOB_QUERY_INFO (object);
+
+  g_object_unref (job->file_info);
+  
+  g_free (job->filename);
+  g_file_attribute_matcher_unref (job->attribute_matcher);
+  
+  if (G_OBJECT_CLASS (g_vfs_job_query_info_parent_class)->finalize)
+    (*G_OBJECT_CLASS (g_vfs_job_query_info_parent_class)->finalize) (object);
+}
+
+static void
+g_vfs_job_query_info_class_init (GVfsJobQueryInfoClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GVfsJobClass *job_class = G_VFS_JOB_CLASS (klass);
+  GVfsJobDBusClass *job_dbus_class = G_VFS_JOB_DBUS_CLASS (klass);
+  
+  gobject_class->finalize = g_vfs_job_query_info_finalize;
+  job_class->run = run;
+  job_class->try = try;
+  job_dbus_class->create_reply = create_reply;
+}
+
+static void
+g_vfs_job_query_info_init (GVfsJobQueryInfo *job)
+{
+}
+
+GVfsJob *
+g_vfs_job_query_info_new (DBusConnection *connection,
+			DBusMessage *message,
+			GVfsBackend *backend)
+{
+  GVfsJobQueryInfo *job;
+  DBusMessage *reply;
+  DBusError derror;
+  int path_len;
+  const char *path_data;
+  char *attributes;
+  dbus_uint32_t flags;
+  
+  dbus_error_init (&derror);
+  if (!dbus_message_get_args (message, &derror, 
+			      DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE,
+			      &path_data, &path_len,
+			      DBUS_TYPE_STRING, &attributes,
+			      DBUS_TYPE_UINT32, &flags,
+			      0))
+    {
+      reply = dbus_message_new_error (message,
+				      derror.name,
+                                      derror.message);
+      dbus_error_free (&derror);
+
+      dbus_connection_send (connection, reply, NULL);
+      return NULL;
+    }
+
+  job = g_object_new (G_VFS_TYPE_JOB_QUERY_INFO,
+		      "message", message,
+		      "connection", connection,
+		      NULL);
+
+  job->filename = g_strndup (path_data, path_len);
+  job->backend = backend;
+  job->attribute_matcher = g_file_attribute_matcher_new (attributes);
+  job->flags = flags;
+
+  job->file_info = g_file_info_new ();
+  g_file_info_set_attribute_mask (job->file_info, job->attribute_matcher);
+  
+  return G_VFS_JOB (job);
+}
+
+static void
+run (GVfsJob *job)
+{
+  GVfsJobQueryInfo *op_job = G_VFS_JOB_QUERY_INFO (job);
+  GVfsBackendClass *class = G_VFS_BACKEND_GET_CLASS (op_job->backend);
+
+  if (class->query_info == NULL)
+    {
+      g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+			_("Operation not supported by backend"));
+      return;
+    }
+  
+  class->query_info (op_job->backend,
+		   op_job,
+		   op_job->filename,
+		   op_job->flags,
+		   op_job->file_info,
+		   op_job->attribute_matcher);
+}
+
+static gboolean
+try (GVfsJob *job)
+{
+  GVfsJobQueryInfo *op_job = G_VFS_JOB_QUERY_INFO (job);
+  GVfsBackendClass *class = G_VFS_BACKEND_GET_CLASS (op_job->backend);
+
+  if (class->try_query_info == NULL)
+    return FALSE;
+
+  return class->try_query_info (op_job->backend,
+			      op_job,
+			      op_job->filename,
+			      op_job->flags,
+			      op_job->file_info,
+			      op_job->attribute_matcher);
+}
+
+/* Might be called on an i/o thread */
+static DBusMessage *
+create_reply (GVfsJob *job,
+	      DBusConnection *connection,
+	      DBusMessage *message)
+{
+  GVfsJobQueryInfo *op_job = G_VFS_JOB_QUERY_INFO (job);
+  DBusMessage *reply;
+  DBusMessageIter iter;
+
+  reply = dbus_message_new_method_return (message);
+
+  dbus_message_iter_init_append (reply, &iter);
+
+  _g_dbus_append_file_info (&iter, 
+			   op_job->file_info);
+  
+  return reply;
+}