2008-03-20 Dan Williams <dcbw@redhat.com>
* introspection/nm-manager.xml introspection/nm-manager-client.xml - (ActivateConnection): return the object path of the active connection on success - (GetActiveConnections): remove - (DeactivateConnection): new function; deactivate a currently active connection - Add an ActiveConnections property which returns an array of active connection object paths * introspection/nm-device.xml - (Deactivate): remove * introspection/all.xml - Add ActiveConnection introspection * introspection/nm-active-connection.xml - Add the ActiveConnection object * include/NetworkManager.h - Add the Connection.Active D-Bus interface * src/nm-device-interface.c - (impl_device_deactivate): remove * src/nm-activation-request.c src/nm-activation-request.c src/Makefile.am - Implement the Connection.Active D-Bus interface * src/nm-manager.c - (get_property, nm_manager_class_init): add ACTIVE_CONNECTIONS property - (nm_manager_activate_device): return the active connection path - (connection_added_default_handler, impl_manager_activate_connection): return the active connection to the caller - (add_one_connection_element, impl_manager_get_active_connections): remove - (impl_manager_deactivate_connection): new function; deactivate an active connection * libnm-glib/nm-device.c libnm-glib/nm-device.h - Remove Deactivate() function git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3484 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -33,6 +33,13 @@
|
||||
#define NM_IS_ACT_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_ACT_REQUEST))
|
||||
#define NM_ACT_REQUEST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_ACT_REQUEST, NMActRequestClass))
|
||||
|
||||
#define NM_ACTIVE_CONNECTION_SERVICE_NAME "service-name"
|
||||
#define NM_ACTIVE_CONNECTION_CONNECTION "connection"
|
||||
#define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT "specific-object"
|
||||
#define NM_ACTIVE_CONNECTION_SHARED_SERVICE_NAME "shared-service-name"
|
||||
#define NM_ACTIVE_CONNECTION_SHARED_CONNECTION "shared-connection"
|
||||
#define NM_ACTIVE_CONNECTION_DEVICES "devices"
|
||||
|
||||
typedef struct {
|
||||
GObject parent;
|
||||
} NMActRequest;
|
||||
@@ -47,13 +54,16 @@ typedef struct {
|
||||
void (*connection_secrets_failed) (NMActRequest *req,
|
||||
NMConnection *connection,
|
||||
const char * setting);
|
||||
|
||||
void (*properties_changed) (NMActRequest *req, GHashTable *properties);
|
||||
} NMActRequestClass;
|
||||
|
||||
GType nm_act_request_get_type (void);
|
||||
|
||||
NMActRequest *nm_act_request_new (NMConnection *connection,
|
||||
const char *specific_object,
|
||||
gboolean user_requested);
|
||||
gboolean user_requested,
|
||||
gpointer *device); /* An NMDevice */
|
||||
|
||||
NMConnection *nm_act_request_get_connection (NMActRequest *req);
|
||||
gboolean nm_act_request_request_connection_secrets (NMActRequest *req,
|
||||
@@ -66,4 +76,6 @@ void nm_act_request_set_specific_object (NMActRequest *req,
|
||||
|
||||
gboolean nm_act_request_get_user_requested (NMActRequest *req);
|
||||
|
||||
const char * nm_act_request_get_active_connection_path (NMActRequest *req);
|
||||
|
||||
#endif /* NM_ACTIVATION_REQUEST_H */
|
||||
|
Reference in New Issue
Block a user