[network-manager-applet/danw/vlan: 3/4] connection-editor: keep track of the NMRemoteSettings on CEPage



commit bc2d558878806a62736022a4ed629b86119d731d
Author: Dan Winship <danw gnome org>
Date:   Tue Sep 4 09:09:40 2012 -0400

    connection-editor: keep track of the NMRemoteSettings on CEPage

 src/connection-editor/ce-page.c             |    2 ++
 src/connection-editor/ce-page.h             |    2 ++
 src/connection-editor/page-8021x-security.c |    1 +
 src/connection-editor/page-bond.c           |    1 +
 src/connection-editor/page-dsl.c            |    1 +
 src/connection-editor/page-ethernet.c       |    1 +
 src/connection-editor/page-infiniband.c     |    1 +
 src/connection-editor/page-ip4.c            |    1 +
 src/connection-editor/page-ip6.c            |    1 +
 src/connection-editor/page-mobile.c         |    1 +
 src/connection-editor/page-ppp.c            |    1 +
 src/connection-editor/page-vpn.c            |    1 +
 src/connection-editor/page-wifi-security.c  |    1 +
 src/connection-editor/page-wifi.c           |    1 +
 src/connection-editor/page-wimax.c          |    1 +
 15 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/src/connection-editor/ce-page.c b/src/connection-editor/ce-page.c
index f363351..bf2798c 100644
--- a/src/connection-editor/ce-page.c
+++ b/src/connection-editor/ce-page.c
@@ -570,6 +570,7 @@ ce_page_new (GType page_type,
              NMConnection *connection,
              GtkWindow *parent_window,
              NMClient *client,
+             NMRemoteSettings *settings,
              const char *ui_file,
              const char *widget_name,
              const char *title)
@@ -587,6 +588,7 @@ ce_page_new (GType page_type,
 	                              NULL));
 	self->title = g_strdup (title);
 	self->client = client;
+	self->settings = settings;
 
 	if (ui_file) {
 		if (!gtk_builder_add_from_file (self->builder, ui_file, &error)) {
diff --git a/src/connection-editor/ce-page.h b/src/connection-editor/ce-page.h
index bf90ebd..c91345f 100644
--- a/src/connection-editor/ce-page.h
+++ b/src/connection-editor/ce-page.h
@@ -75,6 +75,7 @@ typedef struct {
 	NMConnection *connection;
 	GtkWindow *parent_window;
 	NMClient *client;
+	NMRemoteSettings *settings;
 
 	gboolean disposed;
 } CEPage;
@@ -145,6 +146,7 @@ CEPage *ce_page_new (GType page_type,
                      NMConnection *connection,
                      GtkWindow *parent_window,
                      NMClient *client,
+                     NMRemoteSettings *settings,
                      const char *ui_file,
                      const char *widget_name,
                      const char *title);
diff --git a/src/connection-editor/page-8021x-security.c b/src/connection-editor/page-8021x-security.c
index fbcfa3a..643751e 100644
--- a/src/connection-editor/page-8021x-security.c
+++ b/src/connection-editor/page-8021x-security.c
@@ -115,6 +115,7 @@ ce_page_8021x_security_new (NMConnection *connection,
 	                                            connection,
 	                                            parent_window,
 	                                            client,
+	                                            settings,
 	                                            NULL,
 	                                            NULL,
 	                                            _("802.1x Security")));
diff --git a/src/connection-editor/page-bond.c b/src/connection-editor/page-bond.c
index 121a0d6..67056e7 100644
--- a/src/connection-editor/page-bond.c
+++ b/src/connection-editor/page-bond.c
@@ -741,6 +741,7 @@ ce_page_bond_new (NMConnection *connection,
 	                                  connection,
 	                                  parent_window,
 	                                  client,
+	                                  settings,
 	                                  UIDIR "/ce-page-bond.ui",
 	                                  "BondPage",
 	                                  _("Bond")));
diff --git a/src/connection-editor/page-dsl.c b/src/connection-editor/page-dsl.c
index fe1f007..b7d8157 100644
--- a/src/connection-editor/page-dsl.c
+++ b/src/connection-editor/page-dsl.c
@@ -135,6 +135,7 @@ ce_page_dsl_new (NMConnection *connection,
 	                                 connection,
 	                                 parent_window,
 	                                 client,
+	                                 settings,
 	                                 UIDIR "/ce-page-dsl.ui",
 	                                 "DslPage",
 	                                 _("DSL")));
diff --git a/src/connection-editor/page-ethernet.c b/src/connection-editor/page-ethernet.c
index d0485c1..69263a0 100644
--- a/src/connection-editor/page-ethernet.c
+++ b/src/connection-editor/page-ethernet.c
@@ -245,6 +245,7 @@ ce_page_ethernet_new (NMConnection *connection,
 	                                      connection,
 	                                      parent_window,
 	                                      client,
+	                                      settings,
 	                                      UIDIR "/ce-page-ethernet.ui",
 	                                      "EthernetPage",
 	                                      _("Ethernet")));
diff --git a/src/connection-editor/page-infiniband.c b/src/connection-editor/page-infiniband.c
index f298e27..be54a37 100644
--- a/src/connection-editor/page-infiniband.c
+++ b/src/connection-editor/page-infiniband.c
@@ -162,6 +162,7 @@ ce_page_infiniband_new (NMConnection *connection,
 	                                        connection,
 	                                        parent_window,
 	                                        client,
+	                                        settings,
 	                                        UIDIR "/ce-page-infiniband.ui",
 	                                        "InfinibandPage",
 	                                        _("InfiniBand")));
diff --git a/src/connection-editor/page-ip4.c b/src/connection-editor/page-ip4.c
index 8fd2c7c..9493723 100644
--- a/src/connection-editor/page-ip4.c
+++ b/src/connection-editor/page-ip4.c
@@ -988,6 +988,7 @@ ce_page_ip4_new (NMConnection *connection,
 	                                 connection,
 	                                 parent_window,
 	                                 client,
+	                                 settings,
 	                                 UIDIR "/ce-page-ip4.ui",
 	                                 "IP4Page",
 	                                 _("IPv4 Settings")));
diff --git a/src/connection-editor/page-ip6.c b/src/connection-editor/page-ip6.c
index 829fc6e..0724ccc 100644
--- a/src/connection-editor/page-ip6.c
+++ b/src/connection-editor/page-ip6.c
@@ -952,6 +952,7 @@ ce_page_ip6_new (NMConnection *connection,
 	                                 connection,
 	                                 parent_window,
 	                                 client,
+	                                 settings,
 	                                 UIDIR "/ce-page-ip6.ui",
 	                                 "IP6Page",
 	                                 _("IPv6 Settings")));
diff --git a/src/connection-editor/page-mobile.c b/src/connection-editor/page-mobile.c
index e86767f..e01f8a1 100644
--- a/src/connection-editor/page-mobile.c
+++ b/src/connection-editor/page-mobile.c
@@ -383,6 +383,7 @@ ce_page_mobile_new (NMConnection *connection,
 	                                    connection,
 	                                    parent_window,
 	                                    client,
+	                                    settings,
 	                                    UIDIR "/ce-page-mobile.ui",
 	                                    "MobilePage",
 	                                    _("Mobile Broadband")));
diff --git a/src/connection-editor/page-ppp.c b/src/connection-editor/page-ppp.c
index d5961b8..f688782 100644
--- a/src/connection-editor/page-ppp.c
+++ b/src/connection-editor/page-ppp.c
@@ -278,6 +278,7 @@ ce_page_ppp_new (NMConnection *connection,
 	                                 connection,
 	                                 parent_window,
 	                                 client,
+	                                 settings,
 	                                 UIDIR "/ce-page-ppp.ui",
 	                                 "PppPage",
 	                                 _("PPP Settings")));
diff --git a/src/connection-editor/page-vpn.c b/src/connection-editor/page-vpn.c
index 7bcf540..080b422 100644
--- a/src/connection-editor/page-vpn.c
+++ b/src/connection-editor/page-vpn.c
@@ -107,6 +107,7 @@ ce_page_vpn_new (NMConnection *connection,
 	                                 connection,
 	                                 parent_window,
 	                                 client,
+	                                 settings,
 	                                 NULL,
 	                                 NULL,
 	                                 _("VPN")));
diff --git a/src/connection-editor/page-wifi-security.c b/src/connection-editor/page-wifi-security.c
index 90f4717..ee9af72 100644
--- a/src/connection-editor/page-wifi-security.c
+++ b/src/connection-editor/page-wifi-security.c
@@ -401,6 +401,7 @@ ce_page_wifi_security_new (NMConnection *connection,
 	                                           connection,
 	                                           parent_window,
 	                                           client,
+	                                           settings,
 	                                           UIDIR "/ce-page-wifi-security.ui",
 	                                           "WifiSecurityPage",
 	                                           _("Wi-Fi Security")));
diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c
index 0c8d6ce..abab26c 100644
--- a/src/connection-editor/page-wifi.c
+++ b/src/connection-editor/page-wifi.c
@@ -433,6 +433,7 @@ ce_page_wifi_new (NMConnection *connection,
 	                                  connection,
 	                                  parent_window,
 	                                  client,
+	                                  settings,
 	                                  UIDIR "/ce-page-wifi.ui",
 	                                  "WifiPage",
 	                                  _("Wi-Fi")));
diff --git a/src/connection-editor/page-wimax.c b/src/connection-editor/page-wimax.c
index 9d99ae8..71d3120 100644
--- a/src/connection-editor/page-wimax.c
+++ b/src/connection-editor/page-wimax.c
@@ -128,6 +128,7 @@ ce_page_wimax_new (NMConnection *connection,
 	                                   connection,
 	                                   parent_window,
 	                                   client,
+	                                   settings,
 	                                   UIDIR "/ce-page-wimax.ui",
 	                                   "WimaxPage",
 	                                   _("WiMAX")));



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]