[network-manager-applet] connection-editor: pass the NMRemoteSettings object to page constructors

[Dan Winship <danw src gnome org>]

commit 0b6b83488b91867fe26a5fb767eeaa04a4f36e27
Author: Dan Winship <danw gnome org>
Date:   Tue Feb 21 16:12:50 2012 -0500

    connection-editor: pass the NMRemoteSettings object to page constructors

 src/connection-editor/ce-page.h              |    1 +
 src/connection-editor/nm-connection-editor.c |    3 ++-
 src/connection-editor/page-8021x-security.c  |    1 +
 src/connection-editor/page-8021x-security.h  |    1 +
 src/connection-editor/page-dsl.c             |    1 +
 src/connection-editor/page-dsl.h             |    1 +
 src/connection-editor/page-ethernet.c        |    1 +
 src/connection-editor/page-ethernet.h        |    1 +
 src/connection-editor/page-infiniband.c      |    1 +
 src/connection-editor/page-infiniband.h      |    1 +
 src/connection-editor/page-ip4.c             |    1 +
 src/connection-editor/page-ip4.h             |    1 +
 src/connection-editor/page-ip6.c             |    1 +
 src/connection-editor/page-ip6.h             |    1 +
 src/connection-editor/page-mobile.c          |    1 +
 src/connection-editor/page-mobile.h          |    1 +
 src/connection-editor/page-ppp.c             |    1 +
 src/connection-editor/page-ppp.h             |    1 +
 src/connection-editor/page-vpn.c             |    1 +
 src/connection-editor/page-vpn.h             |    1 +
 src/connection-editor/page-wifi-security.c   |    1 +
 src/connection-editor/page-wifi-security.h   |    1 +
 src/connection-editor/page-wifi.c            |    1 +
 src/connection-editor/page-wifi.h            |    1 +
 src/connection-editor/page-wimax.c           |    1 +
 src/connection-editor/page-wimax.h           |    1 +
 26 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/src/connection-editor/ce-page.h b/src/connection-editor/ce-page.h
index cf09131..5763028 100644
--- a/src/connection-editor/ce-page.h
+++ b/src/connection-editor/ce-page.h
@@ -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);
 
diff --git a/src/connection-editor/nm-connection-editor.c b/src/connection-editor/nm-connection-editor.c
index 6f0f332..2865da4 100644
--- a/src/connection-editor/nm-connection-editor.c
+++ b/src/connection-editor/nm-connection-editor.c
@@ -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,
diff --git a/src/connection-editor/page-8021x-security.c b/src/connection-editor/page-8021x-security.c
index 3bd0980..fbcfa3a 100644
--- a/src/connection-editor/page-8021x-security.c
+++ b/src/connection-editor/page-8021x-security.c
@@ -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)
 {
diff --git a/src/connection-editor/page-8021x-security.h b/src/connection-editor/page-8021x-security.h
index 02e59de..a752979 100644
--- a/src/connection-editor/page-8021x-security.h
+++ b/src/connection-editor/page-8021x-security.h
@@ -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);
 
diff --git a/src/connection-editor/page-dsl.c b/src/connection-editor/page-dsl.c
index 29819ec..08d0f01 100644
--- a/src/connection-editor/page-dsl.c
+++ b/src/connection-editor/page-dsl.c
@@ -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)
 {
diff --git a/src/connection-editor/page-dsl.h b/src/connection-editor/page-dsl.h
index 946e4f3..b07351e 100644
--- a/src/connection-editor/page-dsl.h
+++ b/src/connection-editor/page-dsl.h
@@ -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);
 
diff --git a/src/connection-editor/page-ethernet.c b/src/connection-editor/page-ethernet.c
index 0a2d303..0024ca1 100644
--- a/src/connection-editor/page-ethernet.c
+++ b/src/connection-editor/page-ethernet.c
@@ -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)
 {
diff --git a/src/connection-editor/page-ethernet.h b/src/connection-editor/page-ethernet.h
index 2ba14be..f1d65de 100644
--- a/src/connection-editor/page-ethernet.h
+++ b/src/connection-editor/page-ethernet.h
@@ -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);
 
diff --git a/src/connection-editor/page-infiniband.c b/src/connection-editor/page-infiniband.c
index 3cf3744..c0a4f60 100644
--- a/src/connection-editor/page-infiniband.c
+++ b/src/connection-editor/page-infiniband.c
@@ -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)
 {
diff --git a/src/connection-editor/page-infiniband.h b/src/connection-editor/page-infiniband.h
index 5b81314..295ba70 100644
--- a/src/connection-editor/page-infiniband.h
+++ b/src/connection-editor/page-infiniband.h
@@ -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);
 
diff --git a/src/connection-editor/page-ip4.c b/src/connection-editor/page-ip4.c
index 7d84de6..1ee1e41 100644
--- a/src/connection-editor/page-ip4.c
+++ b/src/connection-editor/page-ip4.c
@@ -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)
 {
diff --git a/src/connection-editor/page-ip4.h b/src/connection-editor/page-ip4.h
index 9a99729..428f3f8 100644
--- a/src/connection-editor/page-ip4.h
+++ b/src/connection-editor/page-ip4.h
@@ -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);
 
diff --git a/src/connection-editor/page-ip6.c b/src/connection-editor/page-ip6.c
index 7eda2dd..94bacf4 100644
--- a/src/connection-editor/page-ip6.c
+++ b/src/connection-editor/page-ip6.c
@@ -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)
 {
diff --git a/src/connection-editor/page-ip6.h b/src/connection-editor/page-ip6.h
index cbd93f0..c14569a 100644
--- a/src/connection-editor/page-ip6.h
+++ b/src/connection-editor/page-ip6.h
@@ -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);
 
diff --git a/src/connection-editor/page-mobile.c b/src/connection-editor/page-mobile.c
index 481e76f..14fcb56 100644
--- a/src/connection-editor/page-mobile.c
+++ b/src/connection-editor/page-mobile.c
@@ -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)
 {
diff --git a/src/connection-editor/page-mobile.h b/src/connection-editor/page-mobile.h
index 9f08241..67683d0 100644
--- a/src/connection-editor/page-mobile.h
+++ b/src/connection-editor/page-mobile.h
@@ -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);
 
diff --git a/src/connection-editor/page-ppp.c b/src/connection-editor/page-ppp.c
index e2050cc..d5961b8 100644
--- a/src/connection-editor/page-ppp.c
+++ b/src/connection-editor/page-ppp.c
@@ -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)
 {
diff --git a/src/connection-editor/page-ppp.h b/src/connection-editor/page-ppp.h
index ea9951e..763609e 100644
--- a/src/connection-editor/page-ppp.h
+++ b/src/connection-editor/page-ppp.h
@@ -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);
 
diff --git a/src/connection-editor/page-vpn.c b/src/connection-editor/page-vpn.c
index a98628e..7bcf540 100644
--- a/src/connection-editor/page-vpn.c
+++ b/src/connection-editor/page-vpn.c
@@ -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)
 {
diff --git a/src/connection-editor/page-vpn.h b/src/connection-editor/page-vpn.h
index a09dec5..58bbe57 100644
--- a/src/connection-editor/page-vpn.h
+++ b/src/connection-editor/page-vpn.h
@@ -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);
 
diff --git a/src/connection-editor/page-wifi-security.c b/src/connection-editor/page-wifi-security.c
index ad6953b..90f4717 100644
--- a/src/connection-editor/page-wifi-security.c
+++ b/src/connection-editor/page-wifi-security.c
@@ -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)
 {
diff --git a/src/connection-editor/page-wifi-security.h b/src/connection-editor/page-wifi-security.h
index 516fb88..2960d4d 100644
--- a/src/connection-editor/page-wifi-security.h
+++ b/src/connection-editor/page-wifi-security.h
@@ -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);
 
diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c
index d28714e..4199a2f 100644
--- a/src/connection-editor/page-wifi.c
+++ b/src/connection-editor/page-wifi.c
@@ -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)
 {
diff --git a/src/connection-editor/page-wifi.h b/src/connection-editor/page-wifi.h
index 95b2f10..7973ef7 100644
--- a/src/connection-editor/page-wifi.h
+++ b/src/connection-editor/page-wifi.h
@@ -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);
 
diff --git a/src/connection-editor/page-wimax.c b/src/connection-editor/page-wimax.c
index 304804c..c51fa0f 100644
--- a/src/connection-editor/page-wimax.c
+++ b/src/connection-editor/page-wimax.c
@@ -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)
 {
diff --git a/src/connection-editor/page-wimax.h b/src/connection-editor/page-wimax.h
index 49be464..65af53d 100644
--- a/src/connection-editor/page-wimax.h
+++ b/src/connection-editor/page-wimax.h
@@ -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);