colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: move most activation request logic to the active connection class

Browse Source 
We'll want to use NMActiveConnection more in the manager and also fold
the PendingActivation functionality into it.  All this functionality
applies to the VPN connections too, so it makes sense to have it all
in the base class instead of both NMActRequest and NMVPNConnection.
This commit is contained in:
Dan Williams
2012-08-22 09:38:01 -05:00
parent 7a3c53e8ff
commit 84603c2380
7 changed files with 297 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/nm-activation-request.h
View File

@@ -23,6 +23,7 @@
#include <glib.h>
#include <glib-object.h>
#include "nm-types.h"
#include "nm-connection.h"
#include "nm-active-connection.h"
#include "nm-settings-flags.h"
@@ -35,11 +36,11 @@
#define NM_ACT_REQUEST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_ACT_REQUEST, NMActRequestClass))
typedef struct {
GObject parent;
NMActiveConnection parent;
} NMActRequest;
typedef struct {
GObjectClass parent;
NMActiveConnectionClass parent;
/* Signals */
void (*properties_changed) (NMActRequest *req, GHashTable *properties);
@@ -53,12 +54,10 @@ NMActRequest *nm_act_request_new (NMConnection *connection,
gulong user_uid,
const char *dbus_sender,
gboolean assumed,
gpointer *device, /* An NMDevice */
gpointer *master); /* An NMDevice */
NMDevice *device,
NMDevice *master);
NMConnection *nm_act_request_get_connection (NMActRequest *req);
gboolean nm_act_request_get_user_requested (NMActRequest *req);
NMConnection *nm_act_request_get_connection (NMActRequest *req);
gulong nm_act_request_get_user_uid (NMActRequest *req);
@@ -72,12 +71,6 @@ void nm_act_request_add_share_rule (NMActRequest *req,
const char *table,
const char *rule);
GObject * nm_act_request_get_device (NMActRequest *req);
gboolean nm_act_request_get_assumed (NMActRequest *req);
GObject * nm_act_request_get_master (NMActRequest *req);
/* Secrets handling */
typedef void (*NMActRequestSecretsFunc) (NMActRequest *req,