2007-02-20 Tambet Ingo <tambet@ximian.com>
* libnm-glib/nm-device-802-11-wireless.c: Add "network-added" and "network-removed" signals. * libnm-glib/libnm-glib.pc.in: Require NetworkManager >= 0.7.0. * libnm-glib/nm-access-point.c: Add "strength-changed" signal, emit it when receiving the signal from dbus. * src/nm-device-802-11-wireless.c (get_property): Fix PROP_ACTIVE_NETWORK property. * src/NetworkManagerPolicy.c (state_changed): Fix a typo to make the deactivation of the previously activated device working again. * src/nm-activation-request.c: Remove NMActStage property and it's getter and setter. * src/nm-device.c (nm_device_is_activated): Remove. state == NM_DEVICE_STATE_ACTIVATED is just as easy to use. * include/NetworkManager.h: Remove NM_DBUS_NO_DEVICES_ERROR, NM_DBUS_NO_DIALUP_ERROR, NM_DBUS_NO_NETWORKS_ERROR, NM_DBUS_NO_ACTIVE_DEVICE_ERROR, NM_DBUS_NO_ACTIVE_NET_ERROR errors and NM_DBUS_SIGNAL_STATE_CHANGE signal. Remove NMNetworkStatus and NMActStage enums. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2345 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -6,6 +6,16 @@
|
||||
|
||||
G_DEFINE_TYPE (NMAccessPoint, nm_access_point, DBUS_TYPE_G_PROXY)
|
||||
|
||||
enum {
|
||||
STRENGTH_CHANGED,
|
||||
|
||||
LAST_SIGNAL
|
||||
};
|
||||
|
||||
static guint signals[LAST_SIGNAL] = { 0 };
|
||||
|
||||
static void strength_changed_proxy (NMAccessPoint *ap, guchar strength);
|
||||
|
||||
static void
|
||||
nm_access_point_init (NMAccessPoint *ap)
|
||||
{
|
||||
@@ -14,17 +24,47 @@ nm_access_point_init (NMAccessPoint *ap)
|
||||
static void
|
||||
nm_access_point_class_init (NMAccessPointClass *ap_class)
|
||||
{
|
||||
GObjectClass *object_class = G_OBJECT_CLASS (ap_class);
|
||||
|
||||
/* signals */
|
||||
signals[STRENGTH_CHANGED] =
|
||||
g_signal_new ("strength-changed",
|
||||
G_OBJECT_CLASS_TYPE (object_class),
|
||||
G_SIGNAL_RUN_FIRST,
|
||||
G_STRUCT_OFFSET (NMAccessPointClass, strength_changed),
|
||||
NULL, NULL,
|
||||
g_cclosure_marshal_VOID__UCHAR,
|
||||
G_TYPE_NONE, 1,
|
||||
G_TYPE_UCHAR);
|
||||
|
||||
}
|
||||
|
||||
NMAccessPoint *
|
||||
nm_access_point_new (DBusGConnection *connection, const char *path)
|
||||
{
|
||||
return (NMAccessPoint *) g_object_new (NM_TYPE_ACCESS_POINT,
|
||||
"name", NM_DBUS_SERVICE,
|
||||
"path", path,
|
||||
"interface", NM_DBUS_INTERFACE_ACCESS_POINT,
|
||||
"connection", connection,
|
||||
NULL);
|
||||
NMAccessPoint *ap;
|
||||
|
||||
ap = (NMAccessPoint *) g_object_new (NM_TYPE_ACCESS_POINT,
|
||||
"name", NM_DBUS_SERVICE,
|
||||
"path", path,
|
||||
"interface", NM_DBUS_INTERFACE_ACCESS_POINT,
|
||||
"connection", connection,
|
||||
NULL);
|
||||
|
||||
dbus_g_proxy_add_signal (DBUS_G_PROXY (ap), "StrengthChanged", G_TYPE_UCHAR, G_TYPE_INVALID);
|
||||
dbus_g_proxy_connect_signal (DBUS_G_PROXY (ap),
|
||||
"StrengthChanged",
|
||||
G_CALLBACK (strength_changed_proxy),
|
||||
NULL,
|
||||
NULL);
|
||||
|
||||
return ap;
|
||||
}
|
||||
|
||||
static void
|
||||
strength_changed_proxy (NMAccessPoint *ap, guchar strength)
|
||||
{
|
||||
g_signal_emit (ap, signals[STRENGTH_CHANGED], 0, strength);
|
||||
}
|
||||
|
||||
guint32
|
||||
|
Reference in New Issue
Block a user