everything: use libgudev instead of HAL; merge NM and nm-system-settings
The only thing that doesn't work yet is the system-settings service's "auto eth" connections for ethernet devices that don't have an existing connection. Might also have issues with unmanaged devices that can't provide a MAC address until they are brought up, but we'll see.
This commit is contained in:
@@ -25,6 +25,7 @@
|
||||
#include <glib-object.h>
|
||||
#include "nm-connection.h"
|
||||
#include "nm-active-connection.h"
|
||||
#include "nm-secrets-provider-interface.h"
|
||||
|
||||
#define NM_TYPE_ACT_REQUEST (nm_act_request_get_type ())
|
||||
#define NM_ACT_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_ACT_REQUEST, NMActRequest))
|
||||
@@ -37,27 +38,18 @@ typedef struct {
|
||||
GObject parent;
|
||||
} NMActRequest;
|
||||
|
||||
typedef enum {
|
||||
SECRETS_CALLER_NONE = 0,
|
||||
SECRETS_CALLER_ETHERNET,
|
||||
SECRETS_CALLER_WIFI,
|
||||
SECRETS_CALLER_GSM,
|
||||
SECRETS_CALLER_CDMA,
|
||||
SECRETS_CALLER_PPP
|
||||
} RequestSecretsCaller;
|
||||
|
||||
typedef struct {
|
||||
GObjectClass parent;
|
||||
|
||||
/* Signals */
|
||||
void (*connection_secrets_updated) (NMActRequest *req,
|
||||
NMConnection *connection,
|
||||
GSList *updated_settings,
|
||||
RequestSecretsCaller caller);
|
||||
void (*connection_secrets_failed) (NMActRequest *req,
|
||||
NMConnection *connection,
|
||||
const char *setting,
|
||||
RequestSecretsCaller caller);
|
||||
void (*secrets_updated) (NMActRequest *req,
|
||||
NMConnection *connection,
|
||||
GSList *updated_settings,
|
||||
RequestSecretsCaller caller);
|
||||
void (*secrets_failed) (NMActRequest *req,
|
||||
NMConnection *connection,
|
||||
const char *setting,
|
||||
RequestSecretsCaller caller);
|
||||
|
||||
void (*properties_changed) (NMActRequest *req, GHashTable *properties);
|
||||
} NMActRequestClass;
|
||||
@@ -70,12 +62,6 @@ NMActRequest *nm_act_request_new (NMConnection *connection,
|
||||
gpointer *device); /* An NMDevice */
|
||||
|
||||
NMConnection *nm_act_request_get_connection (NMActRequest *req);
|
||||
gboolean nm_act_request_request_connection_secrets (NMActRequest *req,
|
||||
const char *setting_name,
|
||||
gboolean request_new,
|
||||
RequestSecretsCaller caller,
|
||||
const char *hint1,
|
||||
const char *hint2);
|
||||
const char * nm_act_request_get_specific_object (NMActRequest *req);
|
||||
|
||||
void nm_act_request_set_specific_object (NMActRequest *req,
|
||||
@@ -99,4 +85,12 @@ void nm_act_request_add_share_rule (NMActRequest *req,
|
||||
|
||||
GObject * nm_act_request_get_device (NMActRequest *req);
|
||||
|
||||
gboolean nm_act_request_get_secrets (NMActRequest *req,
|
||||
const char *setting_name,
|
||||
gboolean request_new,
|
||||
RequestSecretsCaller caller,
|
||||
const char *hint1,
|
||||
const char *hint2);
|
||||
|
||||
#endif /* NM_ACTIVATION_REQUEST_H */
|
||||
|
||||
|
Reference in New Issue
Block a user