Enlightenment CVS committal Author : rephorm Project : e17 Module : proto
Dir : e17/proto/e_dbus/src/lib/hal Modified Files: E_Hal.h e_hal_device.c e_hal_device.h e_hal_manager.c e_hal_manager.h Added Files: e_hal_private.h Log Message: use E_DBus_Connection in the api instead of DBusConnection add refcount of E_DBus_Connection share connections to the system/session bus (e_dbus_bus_get() will return a ref if it is has one) =================================================================== RCS file: /cvs/e/e17/proto/e_dbus/src/lib/hal/E_Hal.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- E_Hal.h 20 Mar 2007 06:34:13 -0000 1.2 +++ E_Hal.h 22 Mar 2007 01:44:13 -0000 1.3 @@ -98,15 +98,15 @@ typedef struct E_Hal_Capability E_Hal_Manager_New_Capability; /* org.freedesktop.Hal.Device */ -int e_hal_device_get_property(DBusConnection *conn, const char *udi, const char *property, E_Hal_Callback_Func cb_func, void *data); -int e_hal_device_get_all_properties(DBusConnection *conn, const char *udi, E_Hal_Callback_Func cb_func, void *data); -int e_hal_device_query_capability(DBusConnection *conn, const char *udi, const char *capability, E_Hal_Callback_Func cb_func, void *data); +int e_hal_device_get_property(E_DBus_Connection *conn, const char *udi, const char *property, E_Hal_Callback_Func cb_func, void *data); +int e_hal_device_get_all_properties(E_DBus_Connection *conn, const char *udi, E_Hal_Callback_Func cb_func, void *data); +int e_hal_device_query_capability(E_DBus_Connection *conn, const char *udi, const char *capability, E_Hal_Callback_Func cb_func, void *data); /* org.freedesktop.Hal.Manager */ -int e_hal_manager_get_all_devices(DBusConnection *conn, E_Hal_Callback_Func cb_func, void *data); -int e_hal_manager_device_exists(DBusConnection *conn, const char *udi, E_Hal_Callback_Func cb_func, void *data); -int e_hal_manager_find_device_string_match(DBusConnection *conn, const char *key, const char *value, E_Hal_Callback_Func cb_func, void *data); -int e_hal_manager_find_device_by_capability(DBusConnection *conn, const char *capability, E_Hal_Callback_Func cb_func, void *data); +int e_hal_manager_get_all_devices(E_DBus_Connection *conn, E_Hal_Callback_Func cb_func, void *data); +int e_hal_manager_device_exists(E_DBus_Connection *conn, const char *udi, E_Hal_Callback_Func cb_func, void *data); +int e_hal_manager_find_device_string_match(E_DBus_Connection *conn, const char *key, const char *value, E_Hal_Callback_Func cb_func, void *data); +int e_hal_manager_find_device_by_capability(E_DBus_Connection *conn, const char *capability, E_Hal_Callback_Func cb_func, void *data); E_Hal_Callback *e_hal_callback_new(E_Hal_Callback_Func cb_func, void *user_data); void e_hal_callback_free(E_Hal_Callback *callback); =================================================================== RCS file: /cvs/e/e17/proto/e_dbus/src/lib/hal/e_hal_device.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_hal_device.c 20 Mar 2007 06:34:13 -0000 1.2 +++ e_hal_device.c 22 Mar 2007 01:44:13 -0000 1.3 @@ -58,7 +58,7 @@ } int -e_hal_device_get_property(DBusConnection *conn, const char *udi, const char *property, E_Hal_Callback_Func cb_func, void *data) +e_hal_device_get_property(E_DBus_Connection *conn, const char *udi, const char *property, E_Hal_Callback_Func cb_func, void *data) { E_Hal_Callback *cb; DBusMessage *msg; @@ -170,7 +170,7 @@ } int -e_hal_device_get_all_properties(DBusConnection *conn, const char *udi, E_Hal_Callback_Func cb_func, void *data) +e_hal_device_get_all_properties(E_DBus_Connection *conn, const char *udi, E_Hal_Callback_Func cb_func, void *data) { E_Hal_Callback *cb; DBusMessage *msg; @@ -217,7 +217,7 @@ } int -e_hal_device_query_capability(DBusConnection *conn, const char *udi, const char *capability, E_Hal_Callback_Func cb_func, void *data) +e_hal_device_query_capability(E_DBus_Connection *conn, const char *udi, const char *capability, E_Hal_Callback_Func cb_func, void *data) { E_Hal_Callback *cb; DBusMessage *msg; @@ -249,14 +249,14 @@ /** * @brief Mount a Volume * - * @param conn the DBusConnection + * @param conn the E_DBus_Connection * @param udi the udi of the device object * @param mount_point the path to mount to, or null for default * @param fstype the fstype of the device (e.g. volume.fstype property) * @param options a list of additional options (not sure... fstype dependant?) */ int -e_hal_device_volume_mount(DBusConnection *conn, const char *udi, const char *mount_point, const char *fstype, Ecore_List *options, E_Hal_Callback_Func cb_func, void *data) +e_hal_device_volume_mount(E_DBus_Connection *conn, const char *udi, const char *mount_point, const char *fstype, Ecore_List *options, E_Hal_Callback_Func cb_func, void *data) { E_Hal_Callback *cb; DBusMessage *msg; @@ -304,12 +304,12 @@ /** * @brief Mount a Volume * - * @param conn the DBusConnection + * @param conn the E_DBus_Connection * @param udi the udi of the device object * @param options a list of additional options (not sure... fstype dependant?) */ int -e_hal_device_volume_unmount(DBusConnection *conn, const char *udi, Ecore_List *options, E_Hal_Callback_Func cb_func, void *data) +e_hal_device_volume_unmount(E_DBus_Connection *conn, const char *udi, Ecore_List *options, E_Hal_Callback_Func cb_func, void *data) { E_Hal_Callback *cb; DBusMessage *msg; =================================================================== RCS file: /cvs/e/e17/proto/e_dbus/src/lib/hal/e_hal_device.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_hal_device.h 15 Mar 2007 08:59:19 -0000 1.1 +++ e_hal_device.h 22 Mar 2007 01:44:13 -0000 1.2 @@ -7,8 +7,8 @@ typedef struct E_Hal_Property E_Hal_Device_Get_Property_Return; typedef struct E_Hal_Bool_Return E_Hal_Device_Query_Capability_Return; -int e_hal_device_get_property(DBusConnection *conn, const char *udi, const char *property, E_Hal_Callback_Func cb_func, void *data); -int e_hal_device_get_all_properties(DBusConnection *conn, const char *udi, E_Hal_Callback_Func cb_func, void *data); -int e_hal_device_query_capability(DBusConnection *conn, const char *udi, const char *capability, E_Hal_Callback_Func cb_func, void *data); +int e_hal_device_get_property(E_DBus_Connection *conn, const char *udi, const char *property, E_Hal_Callback_Func cb_func, void *data); +int e_hal_device_get_all_properties(E_DBus_Connection *conn, const char *udi, E_Hal_Callback_Func cb_func, void *data); +int e_hal_device_query_capability(E_DBus_Connection *conn, const char *udi, const char *capability, E_Hal_Callback_Func cb_func, void *data); #endif =================================================================== RCS file: /cvs/e/e17/proto/e_dbus/src/lib/hal/e_hal_manager.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_hal_manager.c 20 Mar 2007 06:34:13 -0000 1.2 +++ e_hal_manager.c 22 Mar 2007 01:44:13 -0000 1.3 @@ -52,7 +52,7 @@ } int -e_hal_manager_get_all_devices(DBusConnection *conn, E_Hal_Callback_Func cb_func, void *data) +e_hal_manager_get_all_devices(E_DBus_Connection *conn, E_Hal_Callback_Func cb_func, void *data) { E_Hal_Callback *cb; DBusMessage *msg; @@ -98,7 +98,7 @@ } int -e_hal_manager_device_exists(DBusConnection *conn, const char *udi, E_Hal_Callback_Func cb_func, void *data) +e_hal_manager_device_exists(E_DBus_Connection *conn, const char *udi, E_Hal_Callback_Func cb_func, void *data) { E_Hal_Callback *cb; DBusMessage *msg; @@ -150,7 +150,7 @@ } int -e_hal_manager_find_device_string_match(DBusConnection *conn, const char *key, const char *value, E_Hal_Callback_Func cb_func, void *data) +e_hal_manager_find_device_string_match(E_DBus_Connection *conn, const char *key, const char *value, E_Hal_Callback_Func cb_func, void *data) { E_Hal_Callback *cb; DBusMessage *msg; @@ -202,7 +202,7 @@ } int -e_hal_manager_find_device_by_capability(DBusConnection *conn, const char *capability, E_Hal_Callback_Func cb_func, void *data) +e_hal_manager_find_device_by_capability(E_DBus_Connection *conn, const char *capability, E_Hal_Callback_Func cb_func, void *data) { E_Hal_Callback *cb; DBusMessage *msg; =================================================================== RCS file: /cvs/e/e17/proto/e_dbus/src/lib/hal/e_hal_manager.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_hal_manager.h 15 Mar 2007 08:59:19 -0000 1.1 +++ e_hal_manager.h 22 Mar 2007 01:44:13 -0000 1.2 @@ -13,9 +13,9 @@ typedef struct E_Hal_Capability E_Hal_Manager_New_Capability; -int e_hal_manager_get_all_devices(DBusConnection *conn, E_Hal_Callback_Func cb_func, void *data); -int e_hal_manager_device_exists(DBusConnection *conn, const char *udi, E_Hal_Callback_Func cb_func, void *data); -int e_hal_manager_find_device_string_match(DBusConnection *conn, const char *key, const char *value, E_Hal_Callback_Func cb_func, void *data); -int e_hal_manager_find_device_by_capability(DBusConnection *conn, const char *capability, E_Hal_Callback_Func cb_func, void *data); +int e_hal_manager_get_all_devices(E_DBus_Connection *conn, E_Hal_Callback_Func cb_func, void *data); +int e_hal_manager_device_exists(E_DBus_Connection *conn, const char *udi, E_Hal_Callback_Func cb_func, void *data); +int e_hal_manager_find_device_string_match(E_DBus_Connection *conn, const char *key, const char *value, E_Hal_Callback_Func cb_func, void *data); +int e_hal_manager_find_device_by_capability(E_DBus_Connection *conn, const char *capability, E_Hal_Callback_Func cb_func, void *data); #endif ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs