Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/e_dbus
Dir : e17/libs/e_dbus/src/lib/nm
Modified Files:
E_Nm.h e_nm_manager.c e_nm_private.h
Log Message:
stefan's nm patches for edbus.
===================================================================
RCS file: /cvs/e/e17/libs/e_dbus/src/lib/nm/E_Nm.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- E_Nm.h 6 Nov 2007 23:58:56 -0000 1.4
+++ E_Nm.h 9 Mar 2008 16:08:42 -0000 1.5
@@ -2,6 +2,7 @@
#define E_HM_H
#include <E_DBus.h>
+#include <Ecore_Data.h>
#ifdef EAPI
#undef EAPI
@@ -25,6 +26,77 @@
#endif
typedef struct E_NM_Context E_NM_Context;
+
+/**
+ * Matching structs for the new "object" based DBus API
+ * VPN is missing as this was still missing the redesign for the new 0.7 API
+ */
+typedef struct E_NM_Device E_NM_Device;
+struct E_NM_Device
+{
+ char *udi; /* object_path */
+ char *interface;
+ char *driver;
+ uint capabilities;
+ int ip4address;
+ uint state;
+ char *ip4config; /* object_path */
+ int carrier;
+ uint type;
+};
+
+typedef struct E_NM_Device_Wireless E_NM_Device_Wireless;
+struct E_NM_Device_Wireless
+{
+ char *hwaddress;
+ int mode;
+ uint bitrate;
+ char *activeaccesspoint; /* object_path */
+ uint wirelesscapabilities;
+};
+
+typedef struct E_NM_Device_Wired E_NM_Device_Wired;
+struct E_NM_Device_Wired
+{
+ char *hwaddress;
+ uint speed;
+};
+
+typedef struct E_NM_Access_Point E_NM_Access_Point;
+struct E_NM_Access_Point
+{
+ uint flags;
+ uint wpaflags;
+ uint rsnflags;
+ char *ssid;
+ uint frequency;
+ char *hwaddress;
+ int mode;
+ uint rate;
+ uint strength;
+};
+
+typedef struct E_NM_IP4Config E_NM_IP4Config;
+struct E_NM_IP4Config
+{
+ uint address;
+ uint gateway;
+ uint netmask;
+ uint broadcast;
+ char *hostname;
+ Ecore_List *nameserver; /* uints */
+ Ecore_List *domains; /* char* */
+ char *nisdomain;
+ Ecore_List *nisserver; /* uints */
+};
+
+typedef struct E_NM_Manager E_NM_Manager;
+struct E_NM_Manager
+{
+ int wirelessenabled; /* writeable*/
+ int wirelesshardwareenabled;
+ uint state;
+};
typedef void (*E_NM_Cb_Manager_State_Change) (void *data, int state);
typedef void (*E_NM_Cb_Manager_Device_Added) (void *data, const char *device);
===================================================================
RCS file: /cvs/e/e17/libs/e_dbus/src/lib/nm/e_nm_manager.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_nm_manager.c 4 Nov 2007 07:51:37 -0000 1.2
+++ e_nm_manager.c 9 Mar 2008 16:08:42 -0000 1.3
@@ -18,7 +18,7 @@
DBusMessage *msg;
int ret;
- msg = e_nm_manager_call_new("getDevices");
+ msg = e_nm_manager_call_new("GetDevices");
ret = e_dbus_method_call_send(ctx->conn, msg, cb_nm_string_list, cb_func,
free_nm_string_list, -1, data) ? 1 : 0;
dbus_message_unref(msg);
===================================================================
RCS file: /cvs/e/e17/libs/e_dbus/src/lib/nm/e_nm_private.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_nm_private.h 29 Oct 2007 02:20:48 -0000 1.1
+++ e_nm_private.h 9 Mar 2008 16:08:42 -0000 1.2
@@ -2,10 +2,13 @@
#define E_NM_PRIVATE_H
#define E_NM_SERVICE "org.freedesktop.NetworkManager"
-#define E_NM_INTERFACE_NETWORK_MANAGER "org.freedesktop.NetworkManager"
#define E_NM_PATH_NETWORK_MANAGER "/org/freedesktop/NetworkManager"
+#define E_NM_INTERFACE_NETWORK_MANAGER "org.freedesktop.NetworkManager"
+#define E_NM_INTERFACE_ACCESSPOINT "org.freedesktop.NetworkManager.AccessPoint"
#define E_NM_INTERFACE_DEVICE "org.freedesktop.NetworkManager.Device"
-
+#define E_NM_INTERFACE_DEVICE_WIRELESS
"org.freedesktop.NetworkManager.Device.Wireless"
+#define E_NM_INTERFACE_DEVICE_WIRED
"org.freedesktop.NetworkManager.Device.Wired"
+#define E_NM_INTERFACE_IP4CONFIG "org.freedesktop.NetworkManager.IP4Config"
#define e_nm_manager_call_new(member)
dbus_message_new_method_call(E_NM_SERVICE, E_NM_PATH_NETWORK_MANAGER,
E_NM_INTERFACE_NETWORK_MANAGER, member)
@@ -27,7 +30,6 @@
E_NM_Cb_Manager_Device_Removed cb_manager_device_removed;
void *data_manager_device_removed;
};
-
int e_nm_get_from_nm(E_NM_Context *ctx, E_DBus_Callback_Func cb_func, void
*data,
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
