From c82feb2cbeabc5bac70e2b5d65d2e58652bba9c0 Mon Sep 17 00:00:00 2001
From: Jan-Michael Brummer <jan.brummer@tabos.org>
Date: Tue, 21 Mar 2023 02:38:15 -0400
Subject: Update D-Bus service (#101)

- Remove property handling as it is unused
- Rename query to GetProxiesFor

Co-authored-by: Jan-Michael Brummer <jan-michael.brummer1@volkswagen.de>
---
 src/backend/dbus/dbus.c                 | 20 +-------------------
 src/backend/dbus/org.libproxy.proxy.xml |  4 ++--
 src/libproxy/proxy-dbus.c               |  2 +-
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/src/backend/dbus/dbus.c b/src/backend/dbus/dbus.c
index 200e5c0..7515865 100644
--- a/src/backend/dbus/dbus.c
+++ b/src/backend/dbus/dbus.c
@@ -53,7 +53,7 @@ handle_method_call (GDBusConnection       *connection,
   int idx;
 
   g_application_hold (app);
-  if (g_strcmp0 (method_name, "query") != 0) {
+  if (g_strcmp0 (method_name, "GetProxiesFor") != 0) {
     g_warning ("Invalid method name '%s', aborting.", method_name);
     g_dbus_method_invocation_return_error (invocation,
                                            PX_MANAGER_ERROR,
@@ -85,26 +85,8 @@ handle_method_call (GDBusConnection       *connection,
   g_application_release (app);
 }
 
-static GVariant *
-handle_get_property (GDBusConnection  *connection,
-                     const gchar      *sender,
-                     const gchar      *object_path,
-                     const gchar      *interface_name,
-                     const gchar      *property_name,
-                     GError          **error,
-                     gpointer          user_data)
-{
-  GVariant *ret = NULL;
-
-  if (g_strcmp0 (property_name, "APIVersion") == 0)
-    ret = g_variant_new_string ("1.0");
-
-  return ret;
-}
-
 static const GDBusInterfaceVTable interface_vtable = {
   handle_method_call,
-  handle_get_property
 };
 
 static void
diff --git a/src/backend/dbus/org.libproxy.proxy.xml b/src/backend/dbus/org.libproxy.proxy.xml
index c180df1..bba9251 100644
--- a/src/backend/dbus/org.libproxy.proxy.xml
+++ b/src/backend/dbus/org.libproxy.proxy.xml
@@ -1,13 +1,13 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd" >
 <node>
   <interface name="org.libproxy.proxy">
-    <method name="query">
+    <method name="GetProxiesFor">
       <arg type='s' name='url' direction='in'/>
       <arg type='as' name='response' direction='out'/>
       <doc:doc>
         <doc:description>
           <doc:para>
-            Ask for proxy server for given url.
+            Get proxy servers for given url.
           </doc:para>
         </doc:description>
       </doc:doc>
diff --git a/src/libproxy/proxy-dbus.c b/src/libproxy/proxy-dbus.c
index 57acbd9..d2b90ed 100644
--- a/src/libproxy/proxy-dbus.c
+++ b/src/libproxy/proxy-dbus.c
@@ -94,7 +94,7 @@ px_proxy_factory_get_proxies (pxProxyFactory *self,
     return NULL;
 
   result = g_dbus_proxy_call_sync (self->proxy,
-                                   "query",
+                                   "GetProxiesFor",
                                    g_variant_new ("(s)", url),
                                    G_DBUS_CALL_FLAGS_NONE,
                                    -1,
-- 
cgit v1.2.1