Commit ea4114b9 authored by Bastien Nocera's avatar Bastien Nocera Committed by Daniel Drake
Browse files

Make GetProperties async

as the rest of our functions.
parent 924e08d2
...@@ -55,7 +55,6 @@ static void fprint_device_delete_enrolled_fingers(FprintDevice *rdev, ...@@ -55,7 +55,6 @@ static void fprint_device_delete_enrolled_fingers(FprintDevice *rdev,
const char *username, const char *username,
DBusGMethodInvocation *context); DBusGMethodInvocation *context);
static void fprint_device_get_properties (FprintDevice *rdev, static void fprint_device_get_properties (FprintDevice *rdev,
GHashTable **props,
DBusGMethodInvocation *context); DBusGMethodInvocation *context);
#include "device-dbus-glue.h" #include "device-dbus-glue.h"
...@@ -1037,9 +1036,7 @@ static void fprint_device_delete_enrolled_fingers(FprintDevice *rdev, ...@@ -1037,9 +1036,7 @@ static void fprint_device_delete_enrolled_fingers(FprintDevice *rdev,
dbus_g_method_return(context); dbus_g_method_return(context);
} }
static void static void fprint_device_get_properties (FprintDevice *rdev,
fprint_device_get_properties (FprintDevice *rdev,
GHashTable **props,
DBusGMethodInvocation *context) DBusGMethodInvocation *context)
{ {
FprintDevicePrivate *priv = DEVICE_GET_PRIVATE(rdev); FprintDevicePrivate *priv = DEVICE_GET_PRIVATE(rdev);
...@@ -1053,6 +1050,6 @@ fprint_device_get_properties (FprintDevice *rdev, ...@@ -1053,6 +1050,6 @@ fprint_device_get_properties (FprintDevice *rdev,
driver_name = fp_driver_get_full_name (driver); driver_name = fp_driver_get_full_name (driver);
g_hash_table_insert (table, "Name", g_strdup (driver_name)); g_hash_table_insert (table, "Name", g_strdup (driver_name));
*props = table; dbus_g_method_return (context, table);
} }
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
<method name="GetProperties"> <method name="GetProperties">
<arg type="a{ss}" name="properties" direction="out" /> <arg type="a{ss}" name="properties" direction="out" />
<annotation name="org.freedesktop.DBus.GLib.Async" value="" />
</method> </method>
</interface> </interface>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment