Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/e_dbus
Dir : e17/libs/e_dbus/src/lib/nm
Modified Files:
E_Nm.h e_nm.c e_nm_device.c e_nm_manager.c
Log Message:
EAPI
===================================================================
RCS file: /cvs/e/e17/libs/e_dbus/src/lib/nm/E_Nm.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- E_Nm.h 29 Oct 2007 02:20:48 -0000 1.1
+++ E_Nm.h 4 Nov 2007 07:51:37 -0000 1.2
@@ -9,8 +9,8 @@
typedef void (*E_NM_Cb_Manager_Device_Added) (void *data, const char *device);
typedef void (*E_NM_Cb_Manager_Device_Removed) (void *data, const char
*device);
-E_NM_Context * e_nm_new(void);
-void e_nm_free(E_NM_Context *ctx);
+EAPI E_NM_Context *e_nm_new(void);
+EAPI void e_nm_free(E_NM_Context *ctx);
/**
@@ -23,28 +23,59 @@
*/
/* org.freedesktop.NetworkManager api */
-int e_nm_get_devices(E_NM_Context *ctx, E_DBus_Callback_Func cb_func, void
*data);
-int e_nm_sleep(E_NM_Context *ctx, E_DBus_Callback_Func cb_func, void *data,
int do_sleep);
+/* methods */
+EAPI int e_nm_get_devices(E_NM_Context *ctx, E_DBus_Callback_Func cb_func,
void *data);
+EAPI int e_nm_get_active_device(E_NM_Context *ctx, E_DBus_Callback_Func
cb_func, void *data);
+/* TODO: EAPI int e_nm_set_active_device() */
+EAPI int e_nm_status(E_NM_Context *ctx, E_DBus_Callback_Func cb_func, void
*data);
+/* signals */
+/* TODO: These have changed! */
+/* deprecated */EAPI void e_nm_callback_manager_state_change_set(E_NM_Context
*ctx, E_NM_Cb_Manager_State_Change cb_func, void *user_data);
+/* deprecated */EAPI void e_nm_callback_manager_device_added_set(E_NM_Context
*ctx, E_NM_Cb_Manager_Device_Added cb_func, void *user_data);
+/* deprecated */EAPI void
e_nm_callback_manager_device_removed_set(E_NM_Context *ctx,
E_NM_Cb_Manager_Device_Removed cb_func, void *user_data);
+/* TODO: EAPI void e_nm_callback_device_no_longer_active() */
+/* TODO: EAPI void e_nm_callback_device_now_active() */
+/* TODO: EAPI void e_nm_callback_device_activating() */
+/* TODO: EAPI void e_nm_callback_devices_changed() */
+/* TODO: EAPI void e_nm_callback_device_activation_failed() */
+/* TODO: EAPI void e_nm_callback_device_strength_changed() */
+/* TODO: EAPI void e_nm_callback_device_ipv4_address_changed() */
+/* TODO: EAPI void e_nm_callback_wireless_network_appeared() */
+/* TODO: EAPI void e_nm_callback_wireless_network_disappeared() */
/* org.freedesktop.NetworkManager.Device api */
-int e_nm_device_get_name(E_NM_Context *ctx, const char *device,
- E_DBus_Callback_Func cb_func, void *data);
-int e_nm_device_get_type(E_NM_Context *ctx, const char *device,
- E_DBus_Callback_Func cb_func, void *data);
-int e_nm_device_get_hal_udi(E_NM_Context *ctx, const char *device,
- E_DBus_Callback_Func cb_func, void *data);
-int e_nm_device_get_ip4_address(E_NM_Context *ctx, const char *device,
- E_DBus_Callback_Func cb_func, void *data);
-int e_nm_device_get_link_active(E_NM_Context *ctx, const char *device,
- E_DBus_Callback_Func cb_func, void *data);
-int e_nm_device_wireless_get_strength(E_NM_Context *ctx, const char *device,
- E_DBus_Callback_Func cb_func, void
*data);
-int e_nm_device_wireless_get_active_network(E_NM_Context *ctx,
- const char *device,
- E_DBus_Callback_Func cb_func,
- void *data);
-int e_nm_device_wireless_get_networks(E_NM_Context *ctx, const char *device,
- E_DBus_Callback_Func cb_func, void
*data);
+EAPI int e_nm_device_get_name(E_NM_Context *ctx, const char *device,
+ E_DBus_Callback_Func cb_func, void *data);
+EAPI int e_nm_device_get_type(E_NM_Context *ctx, const char *device,
+ E_DBus_Callback_Func cb_func, void *data);
+EAPI int e_nm_device_get_hal_udi(E_NM_Context *ctx, const char *device,
+ E_DBus_Callback_Func cb_func, void *data);
+EAPI int e_nm_device_get_ip4_address(E_NM_Context *ctx, const char *device,
+ E_DBus_Callback_Func cb_func, void *data);
+EAPI int e_nm_device_get_link_active(E_NM_Context *ctx, const char *device,
+ E_DBus_Callback_Func cb_func, void *data);
+EAPI int e_nm_device_wireless_get_strength(E_NM_Context *ctx, const char
*device,
+ E_DBus_Callback_Func cb_func, void
*data);
+EAPI int e_nm_device_wireless_get_active_network(E_NM_Context *ctx,
+ const char *device,
+ E_DBus_Callback_Func cb_func,
+ void *data);
+EAPI int e_nm_device_wireless_get_networks(E_NM_Context *ctx, const char
*device,
+ E_DBus_Callback_Func cb_func, void
*data);
+
+/* org.freedesktop.NetworkManager.Devices api */
+/* TODO: EAPI int e_nm_network_get_name() */
+/* TODO: EAPI int e_nm_network_get_address() */
+/* TODO: EAPI int e_nm_network_get_strength() */
+/* TODO: EAPI int e_nm_network_get_frequency() */
+/* TODO: EAPI int e_nm_network_get_rate() */
+/* TODO: EAPI int e_nm_network_get_encrypted() */
+
+/* org.freedesktop.NetworkManagerInfo api */
+/* signals */
+/* TODO: EAPI void e_nmi_callback_trusted_network_update() */
+/* TODO: EAPI void e_nmi_callback_preferred_network_update() */
+
#endif
===================================================================
RCS file: /cvs/e/e17/libs/e_dbus/src/lib/nm/e_nm.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_nm.c 29 Oct 2007 02:20:48 -0000 1.1
+++ e_nm.c 4 Nov 2007 07:51:37 -0000 1.2
@@ -1,7 +1,7 @@
#include "E_Nm.h"
#include "e_nm_private.h"
-E_NM_Context *
+EAPI E_NM_Context *
e_nm_new(void)
{
E_NM_Context *ctx;
@@ -21,7 +21,7 @@
}
-void
+EAPI void
e_nm_free(E_NM_Context *ctx)
{
e_dbus_connection_unref(ctx->conn);
@@ -92,7 +92,7 @@
}
-void
+EAPI void
e_nm_callback_manager_state_change_set(E_NM_Context *ctx,
E_NM_Cb_Manager_State_Change cb_func, void *user_data)
{
ctx->cb_manager_state_change = cb_func;
@@ -101,7 +101,7 @@
e_dbus_signal_handler_add(ctx->conn, E_NM_SERVICE,
E_NM_PATH_NETWORK_MANAGER, E_NM_INTERFACE_NETWORK_MANAGER, "StateChange",
cb_signal_manager_state_change, ctx);
}
-void
+EAPI void
e_nm_callback_manager_device_added_set(E_NM_Context *ctx,
E_NM_Cb_Manager_Device_Added cb_func, void *user_data)
{
ctx->cb_manager_device_added = cb_func;
@@ -110,7 +110,7 @@
e_dbus_signal_handler_add(ctx->conn, E_NM_SERVICE,
E_NM_PATH_NETWORK_MANAGER, E_NM_INTERFACE_NETWORK_MANAGER, "DeviceAdded",
cb_signal_manager_device_added, ctx);
}
-void
+EAPI void
e_nm_callback_manager_device_removed_set(E_NM_Context *ctx,
E_NM_Cb_Manager_Device_Removed cb_func, void *user_data)
{
ctx->cb_manager_device_removed = cb_func;
===================================================================
RCS file: /cvs/e/e17/libs/e_dbus/src/lib/nm/e_nm_device.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_nm_device.c 29 Oct 2007 02:20:48 -0000 1.1
+++ e_nm_device.c 4 Nov 2007 07:51:37 -0000 1.2
@@ -18,7 +18,7 @@
* @param cb a callback, used when the method returns (or an error is received)
* @param data user data to pass to the callback function
*/
-int
+EAPI int
e_nm_device_get_name(E_NM_Context *ctx, const char *device,
E_DBus_Callback_Func cb_func, void *data)
{
@@ -39,7 +39,7 @@
* @param cb a callback, used when the method returns (or an error is received)
* @param data user data to pass to the callback function
*/
-int
+EAPI int
e_nm_device_get_type(E_NM_Context *ctx, const char *device,
E_DBus_Callback_Func cb_func, void *data)
{
@@ -56,7 +56,7 @@
* @param cb a callback, used when the method returns (or an error is received)
* @param data user data to pass to the callback function
*/
-int
+EAPI int
e_nm_device_get_hal_udi(E_NM_Context *ctx, const char *device,
E_DBus_Callback_Func cb_func, void *data)
{
@@ -73,7 +73,7 @@
* @param cb a callback, used when the method returns (or an error is received)
* @param data user data to pass to the callback function
*/
-int
+EAPI int
e_nm_device_get_ip4_address(E_NM_Context *ctx, const char *device,
E_DBus_Callback_Func cb_func, void *data)
{
@@ -90,7 +90,7 @@
* @param cb a callback, used when the method returns (or an error is received)
* @param data user data to pass to the callback function
*/
-int
+EAPI int
e_nm_device_get_link_active(E_NM_Context *ctx, const char *device,
E_DBus_Callback_Func cb_func, void *data)
{
@@ -108,7 +108,7 @@
* @param cb a callback, used when the method returns (or an error is received)
* @param data user data to pass to the callback function
*/
-int
+EAPI int
e_nm_device_wireless_get_strength(E_NM_Context *ctx, const char *device,
E_DBus_Callback_Func cb_func, void *data)
{
@@ -125,7 +125,7 @@
* @param cb a callback, used when the method returns (or an error is received)
* @param data user data to pass to the callback function
*/
-int
+EAPI int
e_nm_device_wireless_get_active_network(E_NM_Context *ctx, const char *device,
E_DBus_Callback_Func cb_func, void
*data)
{
@@ -144,7 +144,7 @@
* @param cb a callback, used when the method returns (or an error is received)
* @param data user data to pass to the callback function
*/
-int
+EAPI int
e_nm_device_wireless_get_networks(E_NM_Context *ctx, const char *device,
E_DBus_Callback_Func cb_func, void *data)
{
===================================================================
RCS file: /cvs/e/e17/libs/e_dbus/src/lib/nm/e_nm_manager.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_nm_manager.c 29 Oct 2007 02:20:48 -0000 1.1
+++ e_nm_manager.c 4 Nov 2007 07:51:37 -0000 1.2
@@ -12,7 +12,7 @@
* @param cb a callback, used when the method returns (or an error is received)
* @param data user data to pass to the callback function
**/
-int
+EAPI int
e_nm_get_devices(E_NM_Context *ctx, E_DBus_Callback_Func cb_func, void *data)
{
DBusMessage *msg;
@@ -35,7 +35,7 @@
* @param cb a callback, used when the method returns (or an error is received)
* @param data user data to pass to the callback function
**/
-int
+EAPI int
e_nm_get_active_device(E_NM_Context *ctx, E_DBus_Callback_Func cb_func,
void *data)
{
@@ -66,7 +66,7 @@
* @param cb a callback, used when the method returns (or an error is received)
* @param data user data to pass to the callback function
**/
-int
+EAPI int
e_nm_status(E_NM_Context *ctx, E_DBus_Callback_Func cb_func,
void *data)
{
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
