From: barbieri Date: Fri, 3 Apr 2009 21:46:45 +0000 (+0000) Subject: methods should return DBusCallPending so we can cancel them. X-Git-Tag: 2.0_alpha~43^2~379 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b2e03d53e0e7c54e48f53704b25808169b811b5e;p=framework%2Fuifw%2Fedbus.git methods should return DBusCallPending so we can cancel them. someone please convert all other methods in e_dbus as well. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/e_dbus@39844 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/lib/hal/E_Hal.h b/src/lib/hal/E_Hal.h index 58c79a9..4e124a2 100644 --- a/src/lib/hal/E_Hal.h +++ b/src/lib/hal/E_Hal.h @@ -105,15 +105,15 @@ extern "C" { #endif /* org.freedesktop.Hal.Device */ - EAPI int e_hal_device_get_property(E_DBus_Connection *conn, const char *udi, const char *property, E_DBus_Callback_Func cb_func, void *data); - EAPI int e_hal_device_get_all_properties(E_DBus_Connection *conn, const char *udi, E_DBus_Callback_Func cb_func, void *data); - EAPI int e_hal_device_query_capability(E_DBus_Connection *conn, const char *udi, const char *capability, E_DBus_Callback_Func cb_func, void *data); + EAPI DBusPendingCall *e_hal_device_get_property(E_DBus_Connection *conn, const char *udi, const char *property, E_DBus_Callback_Func cb_func, void *data); + EAPI DBusPendingCall *e_hal_device_get_all_properties(E_DBus_Connection *conn, const char *udi, E_DBus_Callback_Func cb_func, void *data); + EAPI DBusPendingCall *e_hal_device_query_capability(E_DBus_Connection *conn, const char *udi, const char *capability, E_DBus_Callback_Func cb_func, void *data); /* org.freedesktop.Hal.Manager */ - EAPI int e_hal_manager_get_all_devices(E_DBus_Connection *conn, E_DBus_Callback_Func cb_func, void *data); - EAPI int e_hal_manager_device_exists(E_DBus_Connection *conn, const char *udi, E_DBus_Callback_Func cb_func, void *data); - EAPI int e_hal_manager_find_device_string_match(E_DBus_Connection *conn, const char *key, const char *value, E_DBus_Callback_Func cb_func, void *data); - EAPI int e_hal_manager_find_device_by_capability(E_DBus_Connection *conn, const char *capability, E_DBus_Callback_Func cb_func, void *data); + EAPI DBusPendingCall *e_hal_manager_get_all_devices(E_DBus_Connection *conn, E_DBus_Callback_Func cb_func, void *data); + EAPI DBusPendingCall *e_hal_manager_device_exists(E_DBus_Connection *conn, const char *udi, E_DBus_Callback_Func cb_func, void *data); + EAPI DBusPendingCall *e_hal_manager_find_device_string_match(E_DBus_Connection *conn, const char *key, const char *value, E_DBus_Callback_Func cb_func, void *data); + EAPI DBusPendingCall *e_hal_manager_find_device_by_capability(E_DBus_Connection *conn, const char *capability, E_DBus_Callback_Func cb_func, void *data); /* utility functions */ EAPI void e_hal_property_free(E_Hal_Property *prop); @@ -125,9 +125,9 @@ extern "C" { EAPI Eina_List *e_hal_property_strlist_get(E_Hal_Properties *properties, const char *key, int *err); /* (un)mount */ - EAPI int e_hal_device_volume_mount(E_DBus_Connection *conn, const char *udi, const char *mount_point, const char *fstype, Eina_List *options, E_DBus_Callback_Func cb_func, void *data); - EAPI int e_hal_device_volume_unmount(E_DBus_Connection *conn, const char *udi, Eina_List *options, E_DBus_Callback_Func cb_func, void *data); - EAPI int e_hal_device_volume_eject(E_DBus_Connection *conn, const char *udi, Eina_List *options, E_DBus_Callback_Func cb_func, void *data); + EAPI DBusPendingCall *e_hal_device_volume_mount(E_DBus_Connection *conn, const char *udi, const char *mount_point, const char *fstype, Eina_List *options, E_DBus_Callback_Func cb_func, void *data); + EAPI DBusPendingCall *e_hal_device_volume_unmount(E_DBus_Connection *conn, const char *udi, Eina_List *options, E_DBus_Callback_Func cb_func, void *data); + EAPI DBusPendingCall *e_hal_device_volume_eject(E_DBus_Connection *conn, const char *udi, Eina_List *options, E_DBus_Callback_Func cb_func, void *data); #ifdef __cplusplus } diff --git a/src/lib/hal/e_hal_device.c b/src/lib/hal/e_hal_device.c index 3dc0ecc..47de317 100644 --- a/src/lib/hal/e_hal_device.c +++ b/src/lib/hal/e_hal_device.c @@ -54,15 +54,15 @@ free_device_get_property(void *data) free(ret); } -EAPI int +EAPI DBusPendingCall * e_hal_device_get_property(E_DBus_Connection *conn, const char *udi, const char *property, E_DBus_Callback_Func cb_func, void *data) { DBusMessage *msg; - int ret; + DBusPendingCall *ret; msg = e_hal_device_call_new(udi, "GetProperty"); dbus_message_append_args(msg, DBUS_TYPE_STRING, &property, DBUS_TYPE_INVALID); - ret = e_dbus_method_call_send(conn, msg, unmarshal_device_get_property, cb_func, free_device_get_property, -1, data) ? 1 : 0; + ret = e_dbus_method_call_send(conn, msg, unmarshal_device_get_property, cb_func, free_device_get_property, -1, data); dbus_message_unref(msg); return ret; } @@ -160,14 +160,14 @@ free_device_get_all_properties(void *data) free(ret); } -EAPI int +EAPI DBusPendingCall * e_hal_device_get_all_properties(E_DBus_Connection *conn, const char *udi, E_DBus_Callback_Func cb_func, void *data) { DBusMessage *msg; - int ret; + DBusPendingCall *ret; msg = e_hal_device_call_new(udi, "GetAllProperties"); - ret = e_dbus_method_call_send(conn, msg, unmarshal_device_get_all_properties, cb_func, free_device_get_all_properties, -1, data) ? 1 : 0; + ret = e_dbus_method_call_send(conn, msg, unmarshal_device_get_all_properties, cb_func, free_device_get_all_properties, -1, data); dbus_message_unref(msg); return ret; } @@ -211,15 +211,15 @@ free_device_query_capability(void *data) free(ret); } -EAPI int +EAPI DBusPendingCall * e_hal_device_query_capability(E_DBus_Connection *conn, const char *udi, const char *capability, E_DBus_Callback_Func cb_func, void *data) { DBusMessage *msg; - int ret; + DBusPendingCall *ret; msg = e_hal_device_call_new(udi, "QueryCapability"); dbus_message_append_args(msg, DBUS_TYPE_STRING, &capability, DBUS_TYPE_INVALID); - ret = e_dbus_method_call_send(conn, msg, unmarshal_device_query_capability, cb_func, free_device_query_capability, -1, data) ? 1 : 0; + ret = e_dbus_method_call_send(conn, msg, unmarshal_device_query_capability, cb_func, free_device_query_capability, -1, data); dbus_message_unref(msg); return ret; } @@ -239,13 +239,13 @@ e_hal_device_query_capability(E_DBus_Connection *conn, const char *udi, const ch * @param cb_func an optional callback to call when the mount is done * @param data custom data pointer for the callback function */ -EAPI int +EAPI DBusPendingCall * e_hal_device_volume_mount(E_DBus_Connection *conn, const char *udi, const char *mount_point, const char *fstype, Eina_List *options, E_DBus_Callback_Func cb_func, void *data) { DBusMessage *msg; DBusMessageIter iter, subiter; Eina_List *l; - int ret; + DBusPendingCall *ret; msg = e_hal_device_volume_call_new(udi, "Mount"); @@ -265,7 +265,7 @@ e_hal_device_volume_mount(E_DBus_Connection *conn, const char *udi, const char * } dbus_message_iter_close_container(&iter, &subiter) ; - ret = e_dbus_method_call_send(conn, msg, NULL, cb_func, NULL, -1, data) ? 1 : 0; + ret = e_dbus_method_call_send(conn, msg, NULL, cb_func, NULL, -1, data); dbus_message_unref(msg); return ret; } @@ -281,13 +281,13 @@ e_hal_device_volume_mount(E_DBus_Connection *conn, const char *udi, const char * * @param cb_func an optional callback to call when the unmount is done * @param data cuatom data pointer for the callback function */ -EAPI int +EAPI DBusPendingCall * e_hal_device_volume_unmount(E_DBus_Connection *conn, const char *udi, Eina_List *options, E_DBus_Callback_Func cb_func, void *data) { DBusMessage *msg; DBusMessageIter iter, subiter; Eina_List *l; - int ret; + DBusPendingCall *ret; msg = e_hal_device_volume_call_new(udi, "Unmount"); @@ -304,7 +304,7 @@ e_hal_device_volume_unmount(E_DBus_Connection *conn, const char *udi, Eina_List } dbus_message_iter_close_container(&iter, &subiter) ; - ret = e_dbus_method_call_send(conn, msg, NULL, cb_func, NULL, -1, data) ? 1 : 0; + ret = e_dbus_method_call_send(conn, msg, NULL, cb_func, NULL, -1, data); dbus_message_unref(msg); return ret; } @@ -318,13 +318,13 @@ e_hal_device_volume_unmount(E_DBus_Connection *conn, const char *udi, Eina_List * @param cb_func an optional callback to call when the eject is done * @param data cuatom data pointer for the callback function */ -EAPI int +EAPI DBusPendingCall * e_hal_device_volume_eject(E_DBus_Connection *conn, const char *udi, Eina_List *options, E_DBus_Callback_Func cb_func, void *data) { DBusMessage *msg; DBusMessageIter iter, subiter; Eina_List *l; - int ret; + DBusPendingCall *ret; msg = e_hal_device_volume_call_new(udi, "Eject"); @@ -341,7 +341,7 @@ e_hal_device_volume_eject(E_DBus_Connection *conn, const char *udi, Eina_List *o } dbus_message_iter_close_container(&iter, &subiter) ; - ret = e_dbus_method_call_send(conn, msg, NULL, cb_func, NULL, -1, data) ? 1 : 0; + ret = e_dbus_method_call_send(conn, msg, NULL, cb_func, NULL, -1, data); dbus_message_unref(msg); return ret; } diff --git a/src/lib/hal/e_hal_manager.c b/src/lib/hal/e_hal_manager.c index f514a06..8bd3f17 100644 --- a/src/lib/hal/e_hal_manager.c +++ b/src/lib/hal/e_hal_manager.c @@ -51,14 +51,14 @@ free_string_list(void *data) free(ret); } -EAPI int +EAPI DBusPendingCall * e_hal_manager_get_all_devices(E_DBus_Connection *conn, E_DBus_Callback_Func cb_func, void *data) { DBusMessage *msg; - int ret; + DBusPendingCall *ret; msg = e_hal_manager_call_new("GetAllDevices"); - ret = e_dbus_method_call_send(conn, msg, unmarshal_string_list, cb_func, free_string_list, -1, data) ? 1 : 0; + ret = e_dbus_method_call_send(conn, msg, unmarshal_string_list, cb_func, free_string_list, -1, data); dbus_message_unref(msg); return ret; } @@ -99,44 +99,44 @@ free_manager_device_exists(void *data) free(ret); } -EAPI int +EAPI DBusPendingCall * e_hal_manager_device_exists(E_DBus_Connection *conn, const char *udi, E_DBus_Callback_Func cb_func, void *data) { - int ret; + DBusPendingCall *ret; DBusMessage *msg; msg = e_hal_manager_call_new("DeviceExists"); dbus_message_append_args(msg, DBUS_TYPE_STRING, &udi, DBUS_TYPE_INVALID); - ret = e_dbus_method_call_send(conn, msg, unmarshal_manager_device_exists, cb_func, free_manager_device_exists, -1, data) ? 1 : 0; + ret = e_dbus_method_call_send(conn, msg, unmarshal_manager_device_exists, cb_func, free_manager_device_exists, -1, data); dbus_message_unref(msg); return ret; } /* Manager.FindDeviceStringMatch */ -EAPI int +EAPI DBusPendingCall * e_hal_manager_find_device_string_match(E_DBus_Connection *conn, const char *key, const char *value, E_DBus_Callback_Func cb_func, void *data) { DBusMessage *msg; - int ret; + DBusPendingCall *ret; msg = e_hal_manager_call_new("FindDeviceStringMatch"); dbus_message_append_args(msg, DBUS_TYPE_STRING, &key, DBUS_TYPE_STRING, &value, DBUS_TYPE_INVALID); - ret = e_dbus_method_call_send(conn, msg, unmarshal_string_list, cb_func, free_string_list, -1, data) ? 1 : 0; + ret = e_dbus_method_call_send(conn, msg, unmarshal_string_list, cb_func, free_string_list, -1, data); dbus_message_unref(msg); return ret; } /* Manager.FindDeviceByCapability */ -EAPI int +EAPI DBusPendingCall * e_hal_manager_find_device_by_capability(E_DBus_Connection *conn, const char *capability, E_DBus_Callback_Func cb_func, void *data) { DBusMessage *msg; - int ret; + DBusPendingCall *ret; msg = e_hal_manager_call_new("FindDeviceByCapability"); dbus_message_append_args(msg, DBUS_TYPE_STRING, &capability, DBUS_TYPE_INVALID); - ret = e_dbus_method_call_send(conn, msg, unmarshal_string_list, cb_func, free_string_list, -1, data) ? 1 : 0; + ret = e_dbus_method_call_send(conn, msg, unmarshal_string_list, cb_func, free_string_list, -1, data); dbus_message_unref(msg); return ret; }