Commit 0b6b8348 authored by Dan Winship's avatar Dan Winship

connection-editor: pass the NMRemoteSettings object to page constructors

parent 5392b468
......@@ -97,6 +97,7 @@ typedef struct {
typedef CEPage* (*CEPageNewFunc)(NMConnection *connection,
GtkWindow *parent,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error);
......
......@@ -775,7 +775,8 @@ add_page (NMConnectionEditor *editor,
g_return_val_if_fail (func != NULL, FALSE);
g_return_val_if_fail (connection != NULL, FALSE);
page = (*func) (connection, GTK_WINDOW (editor->window), editor->client, &secrets_setting_name, error);
page = (*func) (connection, GTK_WINDOW (editor->window), editor->client, editor->settings,
&secrets_setting_name, error);
if (page) {
g_object_set_data_full (G_OBJECT (page),
SECRETS_TAG,
......
......@@ -103,6 +103,7 @@ CEPage *
ce_page_8021x_security_new (NMConnection *connection,
GtkWindow *parent_window,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error)
{
......
......@@ -52,6 +52,7 @@ GType ce_page_8021x_security_get_type (void);
CEPage *ce_page_8021x_security_new (NMConnection *connection,
GtkWindow *parent,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error);
......
......@@ -124,6 +124,7 @@ CEPage *
ce_page_dsl_new (NMConnection *connection,
GtkWindow *parent_window,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error)
{
......
......@@ -50,6 +50,7 @@ GType ce_page_dsl_get_type (void);
CEPage *ce_page_dsl_new (NMConnection *connection,
GtkWindow *parent,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error);
......
......@@ -258,6 +258,7 @@ CEPage *
ce_page_ethernet_new (NMConnection *connection,
GtkWindow *parent_window,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error)
{
......
......@@ -50,6 +50,7 @@ GType ce_page_ethernet_get_type (void);
CEPage *ce_page_ethernet_new (NMConnection *connection,
GtkWindow *parent,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error);
......
......@@ -174,6 +174,7 @@ CEPage *
ce_page_infiniband_new (NMConnection *connection,
GtkWindow *parent_window,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error)
{
......
......@@ -48,6 +48,7 @@ GType ce_page_infiniband_get_type (void);
CEPage *ce_page_infiniband_new (NMConnection *connection,
GtkWindow *parent,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error);
......
......@@ -976,6 +976,7 @@ CEPage *
ce_page_ip4_new (NMConnection *connection,
GtkWindow *parent_window,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error)
{
......
......@@ -50,6 +50,7 @@ GType ce_page_ip4_get_type (void);
CEPage *ce_page_ip4_new (NMConnection *connection,
GtkWindow *parent,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error);
......
......@@ -940,6 +940,7 @@ CEPage *
ce_page_ip6_new (NMConnection *connection,
GtkWindow *parent_window,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error)
{
......
......@@ -50,6 +50,7 @@ GType ce_page_ip6_get_type (void);
CEPage *ce_page_ip6_new (NMConnection *connection,
GtkWindow *parent,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error);
......
......@@ -364,6 +364,7 @@ CEPage *
ce_page_mobile_new (NMConnection *connection,
GtkWindow *parent_window,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error)
{
......
......@@ -50,6 +50,7 @@ GType ce_page_mobile_get_type (void);
CEPage *ce_page_mobile_new (NMConnection *connection,
GtkWindow *parent,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error);
......
......@@ -266,6 +266,7 @@ CEPage *
ce_page_ppp_new (NMConnection *connection,
GtkWindow *parent_window,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error)
{
......
......@@ -50,6 +50,7 @@ GType ce_page_ppp_get_type (void);
CEPage *ce_page_ppp_new (NMConnection *connection,
GtkWindow *parent,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error);
......
......@@ -95,6 +95,7 @@ CEPage *
ce_page_vpn_new (NMConnection *connection,
GtkWindow *parent_window,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error)
{
......
......@@ -50,6 +50,7 @@ GType ce_page_vpn_get_type (void);
CEPage *ce_page_vpn_new (NMConnection *connection,
GtkWindow *parent,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error);
......
......@@ -381,6 +381,7 @@ CEPage *
ce_page_wifi_security_new (NMConnection *connection,
GtkWindow *parent_window,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error)
{
......
......@@ -58,6 +58,7 @@ GType ce_page_wifi_security_get_type (void);
CEPage *ce_page_wifi_security_new (NMConnection *connection,
GtkWindow *parent,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error);
......
......@@ -445,6 +445,7 @@ CEPage *
ce_page_wifi_new (NMConnection *connection,
GtkWindow *parent_window,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error)
{
......
......@@ -50,6 +50,7 @@ GType ce_page_wifi_get_type (void);
CEPage *ce_page_wifi_new (NMConnection *connection,
GtkWindow *parent,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error);
......
......@@ -140,6 +140,7 @@ CEPage *
ce_page_wimax_new (NMConnection *connection,
GtkWindow *parent_window,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error)
{
......
......@@ -48,6 +48,7 @@ GType ce_page_wimax_get_type (void);
CEPage *ce_page_wimax_new (NMConnection *connection,
GtkWindow *parent,
NMClient *client,
NMRemoteSettings *settings,
const char **out_secrets_setting_name,
GError **error);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment