[gvfs] metadata: remove unused dbus unset api

[Ondrej Holy <oholy src gnome org>]

commit 322cc1a665f9bcda1a0fcdb306829816a4413c54
Author: Ondrej Holy <oholy redhat com>
Date:   Thu Feb 19 19:48:36 2015 +0100

    metadata: remove unused dbus unset api
    
    Metadata are unset from client side using dbus set api, therefore dbus
    unset api and corresponding code isn't necessary. There is only one
    usage of unset api in private meta-set utility, which is replaced by
    this patch.

 client/gdaemonvfs.c         |    2 +-
 metadata/dbus-interface.xml |    5 -----
 metadata/meta-daemon.c      |   37 -------------------------------------
 metadata/meta-set.c         |   22 ++++++++++++++++------
 4 files changed, 17 insertions(+), 49 deletions(-)
---
diff --git a/client/gdaemonvfs.c b/client/gdaemonvfs.c
index 19e65b1..6b9612f 100644
--- a/client/gdaemonvfs.c
+++ b/client/gdaemonvfs.c
@@ -1192,7 +1192,7 @@ _g_daemon_vfs_append_metadata_for_set (GVariantBuilder *builder,
     {
       if (meta_tree_lookup_key_type (tree, path, key) != META_KEY_TYPE_NONE)
        {
-         char c = 0;
+         unsigned char c = 0;
          res = 1;
          /* Byte => unset */
          g_variant_builder_add (builder, "{sv}", key, g_variant_new_byte (c));
diff --git a/metadata/dbus-interface.xml b/metadata/dbus-interface.xml
index 680bc9e..263994a 100644
--- a/metadata/dbus-interface.xml
+++ b/metadata/dbus-interface.xml
@@ -31,11 +31,6 @@
       <arg type='ay' name='path' direction='in'/>
       <arg type='a{sv}' name='data' direction='in'/>
     </method>
-    <method name="Unset">
-      <arg type='ay' name='treefile' direction='in'/>
-      <arg type='ay' name='path' direction='in'/>
-      <arg type='s' name='key' direction='in'/>
-    </method>
     <method name="Remove">
       <arg type='ay' name='treefile' direction='in'/>
       <arg type='ay' name='path' direction='in'/>
diff --git a/metadata/meta-daemon.c b/metadata/meta-daemon.c
index 18132d3..d3643d1 100644
--- a/metadata/meta-daemon.c
+++ b/metadata/meta-daemon.c
@@ -216,42 +216,6 @@ handle_set (GVfsMetadata *object,
 }
 
 static gboolean
-handle_unset (GVfsMetadata *object,
-              GDBusMethodInvocation *invocation,
-              const gchar *arg_treefile,
-              const gchar *arg_path,
-              const gchar *arg_key,
-              GVfsMetadata *daemon)
-{
-  TreeInfo *info;
-
-  info = tree_info_lookup (arg_treefile);
-  if (info == NULL)
-    {
-      g_dbus_method_invocation_return_error (invocation,
-                                             G_IO_ERROR,
-                                             G_IO_ERROR_NOT_FOUND,
-                                             _("Can't find metadata file %s"),
-                                             arg_treefile);
-      return TRUE;
-    }
-
-  if (!meta_tree_unset (info->tree, arg_path, arg_key))
-    {
-      g_dbus_method_invocation_return_error_literal (invocation,
-                                                     G_IO_ERROR,
-                                                     G_IO_ERROR_FAILED,
-                                                     _("Unable to unset metadata key"));
-      return TRUE;
-    }
-
-  tree_info_schedule_writeout (info);
-  gvfs_metadata_complete_unset (object, invocation);
-
-  return TRUE;
-}
-
-static gboolean
 handle_remove (GVfsMetadata *object,
                GDBusMethodInvocation *invocation,
                const gchar *arg_treefile,
@@ -434,7 +398,6 @@ main (int argc, char *argv[])
   skeleton = gvfs_metadata_skeleton_new ();
 
   g_signal_connect (skeleton, "handle-set", G_CALLBACK (handle_set), skeleton);
-  g_signal_connect (skeleton, "handle-unset", G_CALLBACK (handle_unset), skeleton);
   g_signal_connect (skeleton, "handle-remove", G_CALLBACK (handle_remove), skeleton);
   g_signal_connect (skeleton, "handle-move", G_CALLBACK (handle_move), skeleton);
 
diff --git a/metadata/meta-set.c b/metadata/meta-set.c
index be35a32..39872dd 100644
--- a/metadata/meta-set.c
+++ b/metadata/meta-set.c
@@ -118,19 +118,29 @@ main (int argc,
     {
       if (use_dbus)
        {
+          GVariantBuilder *builder;
+          unsigned char c = 0;
+
           metatreefile = meta_tree_get_filename (tree);
 
-          if (! gvfs_metadata_call_unset_sync (proxy,
-                                               metatreefile,
-                                               tree_path,
-                                               key,
-                                               NULL,
-                                               &error))
+          builder = g_variant_builder_new (G_VARIANT_TYPE_VARDICT);
+
+          /* Byte => unset */
+          g_variant_builder_add (builder, "{sv}", key, g_variant_new_byte (c));
+
+          if (! gvfs_metadata_call_set_sync (proxy,
+                                             metatreefile,
+                                             tree_path,
+                                             g_variant_builder_end (builder),
+                                             NULL,
+                                             &error))
            {
              g_printerr ("Unset error: %s (%s, %d)\n",
                            error->message, g_quark_to_string (error->domain), error->code);
              return 1;
            }
+
+          g_variant_builder_unref (builder);
        }
       else
        {