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

[Dan Winship <danw src gnome org>]

commit 7f7830a52ba258d9efa61645332ed89162e7efa6
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                |    2 ++
 src/connection-editor/nm-connection-editor.c   |    3 ++-
 src/connection-editor/page-dsl.c               |    1 +
 src/connection-editor/page-dsl.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-wimax.c             |    1 +
 src/connection-editor/page-wimax.h             |    1 +
 src/connection-editor/page-wired-security.c    |    1 +
 src/connection-editor/page-wired-security.h    |    1 +
 src/connection-editor/page-wired.c             |    1 +
 src/connection-editor/page-wired.h             |    1 +
 src/connection-editor/page-wireless-security.c |    1 +
 src/connection-editor/page-wireless-security.h |    1 +
 src/connection-editor/page-wireless.c          |    1 +
 src/connection-editor/page-wireless.h          |    1 +
 26 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/src/connection-editor/ce-page.h b/src/connection-editor/ce-page.h
index d4bd92e..670e346 100644
--- a/src/connection-editor/ce-page.h
+++ b/src/connection-editor/ce-page.h
@@ -31,6 +31,7 @@
 #include <dbus/dbus-glib.h>
 #include <nm-connection.h>
 #include <nm-client.h>
+#include <nm-remote-settings.h>
 #include "utils.h"
 
 /* for ARPHRD_ETHER / ARPHRD_INFINIBAND for MAC utilies */
@@ -96,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 d3c9f6a..78821c1 100644
--- a/src/connection-editor/nm-connection-editor.c
+++ b/src/connection-editor/nm-connection-editor.c
@@ -772,7 +772,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-dsl.c b/src/connection-editor/page-dsl.c
index 2b6823d..ab8e04f 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 0267de3..ca8c84c 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-infiniband.c b/src/connection-editor/page-infiniband.c
index c031aee..50a8f49 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 665b8bc..ae4df73 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 d397a10..3e92170 100644
--- a/src/connection-editor/page-ip4.c
+++ b/src/connection-editor/page-ip4.c
@@ -965,6 +965,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 41b3a39..90f98e4 100644
--- a/src/connection-editor/page-ip6.c
+++ b/src/connection-editor/page-ip6.c
@@ -929,6 +929,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 90192f2..0f54182 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 84990c9..a8792c3 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 db74245..6853252 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 dc33373..2f26cce 100644
--- a/src/connection-editor/page-vpn.c
+++ b/src/connection-editor/page-vpn.c
@@ -94,6 +94,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 e9022fe..fd8f87a 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-wimax.c b/src/connection-editor/page-wimax.c
index 018ce45..2b7e69e 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 cd31c9d..2e069b9 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);
 
diff --git a/src/connection-editor/page-wired-security.c b/src/connection-editor/page-wired-security.c
index 9fb01b5..5b36f6a 100644
--- a/src/connection-editor/page-wired-security.c
+++ b/src/connection-editor/page-wired-security.c
@@ -103,6 +103,7 @@ CEPage *
 ce_page_wired_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-wired-security.h b/src/connection-editor/page-wired-security.h
index 38638c8..cdb2494 100644
--- a/src/connection-editor/page-wired-security.h
+++ b/src/connection-editor/page-wired-security.h
@@ -52,6 +52,7 @@ GType ce_page_wired_security_get_type (void);
 CEPage *ce_page_wired_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-wired.c b/src/connection-editor/page-wired.c
index ab1b651..cb5cc55 100644
--- a/src/connection-editor/page-wired.c
+++ b/src/connection-editor/page-wired.c
@@ -258,6 +258,7 @@ CEPage *
 ce_page_wired_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-wired.h b/src/connection-editor/page-wired.h
index a6dc25b..ffc2c43 100644
--- a/src/connection-editor/page-wired.h
+++ b/src/connection-editor/page-wired.h
@@ -50,6 +50,7 @@ GType ce_page_wired_get_type (void);
 CEPage *ce_page_wired_new (NMConnection *connection,
                            GtkWindow *parent,
                            NMClient *client,
+                           NMRemoteSettings *settings,
                            const char **out_secrets_setting_name,
                            GError **error);
 
diff --git a/src/connection-editor/page-wireless-security.c b/src/connection-editor/page-wireless-security.c
index 967046e..c7148ac 100644
--- a/src/connection-editor/page-wireless-security.c
+++ b/src/connection-editor/page-wireless-security.c
@@ -347,6 +347,7 @@ CEPage *
 ce_page_wireless_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-wireless-security.h b/src/connection-editor/page-wireless-security.h
index 6b099d3..a0c4176 100644
--- a/src/connection-editor/page-wireless-security.h
+++ b/src/connection-editor/page-wireless-security.h
@@ -57,6 +57,7 @@ GType ce_page_wireless_security_get_type (void);
 CEPage *ce_page_wireless_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-wireless.c b/src/connection-editor/page-wireless.c
index 160c1256..87d1d6f 100644
--- a/src/connection-editor/page-wireless.c
+++ b/src/connection-editor/page-wireless.c
@@ -445,6 +445,7 @@ CEPage *
 ce_page_wireless_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-wireless.h b/src/connection-editor/page-wireless.h
index 34725c3..fe48362 100644
--- a/src/connection-editor/page-wireless.h
+++ b/src/connection-editor/page-wireless.h
@@ -50,6 +50,7 @@ GType ce_page_wireless_get_type (void);
 CEPage *ce_page_wireless_new (NMConnection *connection,
                               GtkWindow *parent,
                               NMClient *client,
+                              NMRemoteSettings *settings,
                               const char **out_secrets_setting_name,
                               GError **error);