mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-15 05:28:05 +02:00
485bcfe571
* src/nm-manager.c:
* src/nm-manager.h:
Implement device activation through NMManager.
Implement "pending device activation" here - If the connection
isn't found,
we try to wait for up to 5 seconds for the connection to be
provided.
Add NMConnectionType argument to "connection-added" and
"connection-removed"
signals.
(nm_manager_get): Remove. Finally.
* src/nm-activation-request.c:
* src/nm-activation-request.h:
Remove all the deferred activation code.
* src/nm-device.c: Remove all the deferred activation code. Once
* the device
activation is started, it's started. Update the activation
virtual function
signature.
* src/nm-device-interface.c:
* src/nm-device-interface.h:
Device activation now takes only NMActRequest argument.
Don't expose device activation directly on dbus, it's supposed
to go through
NMManager now.
* src/NetworkManagerPolicy.c (nm_policy_device_change_check):
* Make the code
a bit more compact.
Use the new device activation methods through NMManager.
* introspection/nm-manager-client.xml:
* introspection/nm-manager.xml:
* libnm-glib/nm-client.c:
* libnm-glib/nm-client.h:
Add device activation method.
* libnm-glib/nm-device.c:
* libnm-glib/nm-device.h:
* introspection/nm-device.xml:
Remove device activation method. It's done through NMManager
now.
* src/vpn-manager/nm-vpn-manager.c (impl_vpn_manager_connect):
* Use the shiny
new (nm_manager_get_device_by_path) function, get rid of our own
)find_device).
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2915 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
63 lines
2.1 KiB
C
63 lines
2.1 KiB
C
/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
|
|
|
|
#ifndef NM_CLIENT_H
|
|
#define NM_CLIENT_H 1
|
|
|
|
#include <glib/gtypes.h>
|
|
#include <glib-object.h>
|
|
#include <dbus/dbus-glib.h>
|
|
#include <NetworkManager.h>
|
|
#include "nm-object.h"
|
|
#include "nm-device.h"
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define NM_TYPE_CLIENT (nm_client_get_type ())
|
|
#define NM_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CLIENT, NMClient))
|
|
#define NM_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_CLIENT, NMClientClass))
|
|
#define NM_IS_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_CLIENT))
|
|
#define NM_IS_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_CLIENT))
|
|
#define NM_CLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_CLIENT, NMClientClass))
|
|
|
|
typedef struct {
|
|
NMObject parent;
|
|
} NMClient;
|
|
|
|
typedef struct {
|
|
NMObjectClass parent;
|
|
|
|
/* Signals */
|
|
void (*manager_running) (NMClient *client, gboolean running);
|
|
void (*device_added) (NMClient *client, NMDevice *device);
|
|
void (*device_removed) (NMClient *client, NMDevice *device);
|
|
void (*state_change) (NMClient *client, NMState state);
|
|
} NMClientClass;
|
|
|
|
GType nm_client_get_type (void);
|
|
|
|
|
|
NMClient *nm_client_new (void);
|
|
|
|
gboolean nm_client_manager_is_running (NMClient *client);
|
|
GSList *nm_client_get_devices (NMClient *client);
|
|
NMDevice *nm_client_get_device_by_path (NMClient *client,
|
|
const char *object_path);
|
|
|
|
typedef void (*NMClientActivateDeviceFn) (gpointer user_data, GError *error);
|
|
|
|
void nm_client_activate_device (NMClient *client,
|
|
NMDevice *device,
|
|
const char *service_name,
|
|
const char *connection_path,
|
|
const char *specific_object,
|
|
NMClientActivateDeviceFn callback,
|
|
gpointer user_data);
|
|
|
|
gboolean nm_client_wireless_get_enabled (NMClient *client);
|
|
void nm_client_wireless_set_enabled (NMClient *client, gboolean enabled);
|
|
NMState nm_client_get_state (NMClient *client);
|
|
void nm_client_sleep (NMClient *client, gboolean sleep);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* NM_CLIENT_H */
|