win-usb: introduce a spice_win_usb_driver_op_finish

We want the exported functions to follow the gio async idom. Currently,
both install() and uninstall() are paired with install_finish(). In the
following patch we introduce uninstall_async() uninstall_finish() using
that common internal op_finish() function. Then we correctly pair
associated async/finish() calls.

1 files changed, 19 insertions, 15 deletions

diff --git a/gtk/win-usb-driver-install.c b/gtk/win-usb-driver-install.c
index 674a7c6..5bb623a 100644
--- a/gtk/win-usb-driver-install.c
+++ b/gtk/win-usb-driver-install.c
@@ -326,7 +326,25 @@ void spice_win_usb_driver_op(SpiceWinUsbDriver *self,
     g_clear_object(&result);
 }
 
+/**
+ * Returns: currently returns 0 (failure) and 1 (success)
+ * possibly later we'll add error-codes
+ */
+static gint
+spice_win_usb_driver_op_finish(SpiceWinUsbDriver *self,
+                               GAsyncResult *res, GError **err)
+{
+    GSimpleAsyncResult *result = G_SIMPLE_ASYNC_RESULT(res);
 
+    g_return_val_if_fail(SPICE_IS_WIN_USB_DRIVER(self), 0);
+    g_return_val_if_fail(g_simple_async_result_is_valid(res, G_OBJECT(self),
+                                                        spice_win_usb_driver_op),
+                         FALSE);
+    if (g_simple_async_result_propagate_error(result, err))
+        return 0;
+
+    return self->priv->reply.status;
+}
 
 /**
  * spice_win_usb_driver_install:
@@ -363,25 +381,11 @@ void spice_win_usb_driver_uninstall(SpiceWinUsbDriver *self,
                             callback, user_data);
 }
 
-
-/**
- * Returns: currently returns 0 (failure) and 1 (success)
- * possibly later we'll add error-codes
- */
 G_GNUC_INTERNAL
 gint spice_win_usb_driver_install_finish(SpiceWinUsbDriver *self,
                                           GAsyncResult *res, GError **err)
 {
-    GSimpleAsyncResult *result = G_SIMPLE_ASYNC_RESULT(res);
-
-    g_return_val_if_fail(SPICE_IS_WIN_USB_DRIVER(self), 0);
-    g_return_val_if_fail(g_simple_async_result_is_valid(res, G_OBJECT(self),
-                                                        spice_win_usb_driver_op),
-                         FALSE);
-    if (g_simple_async_result_propagate_error(result, err))
-        return 0;
-
-    return self->priv->reply.status;
+    return spice_win_usb_driver_op_finish(self, res, err);
 }
 
 G_GNUC_INTERNAL