From 96bd167b77d1ac2a037ff9b98551d3eb5c8171df Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Tue, 1 Oct 2019 10:58:38 +1300
Subject: [PATCH] network: Replace deprecated GtkTable with GtkGrid

---
 .../wireless-security/eap-method-fast.c       |  2 +-
 .../wireless-security/eap-method-fast.ui      | 45 ++++++-------------
 .../wireless-security/eap-method-leap.c       |  6 +--
 .../wireless-security/eap-method-leap.ui      | 25 ++++-------
 .../wireless-security/eap-method-simple.c     |  6 +--
 .../wireless-security/eap-method-simple.ui    | 23 ++++------
 .../wireless-security/ws-dynamic-wep.c        |  2 +-
 .../wireless-security/ws-dynamic-wep.ui       | 23 +++-------
 panels/network/wireless-security/ws-leap.c    |  2 +-
 panels/network/wireless-security/ws-leap.ui   | 25 ++++-------
 panels/network/wireless-security/ws-wep-key.c |  2 +-
 .../network/wireless-security/ws-wep-key.ui   | 39 +++++-----------
 panels/network/wireless-security/ws-wpa-eap.c |  2 +-
 .../network/wireless-security/ws-wpa-eap.ui   | 17 +++----
 panels/network/wireless-security/ws-wpa-psk.c |  2 +-
 .../network/wireless-security/ws-wpa-psk.ui   | 29 ++++--------
 16 files changed, 84 insertions(+), 166 deletions(-)

diff --git a/panels/network/wireless-security/eap-method-fast.c b/panels/network/wireless-security/eap-method-fast.c
index 31206f146..1e56706ce 100644
--- a/panels/network/wireless-security/eap-method-fast.c
+++ b/panels/network/wireless-security/eap-method-fast.c
@@ -342,7 +342,7 @@ eap_method_fast_new (WirelessSecurity *ws_parent,
 	                          update_secrets,
 	                          destroy,
 	                          "/org/gnome/ControlCenter/network/eap-method-fast.ui",
-	                          "eap_fast_table",
+	                          "eap_fast_grid",
 	                          "eap_fast_anon_identity_entry",
 	                          FALSE);
 	if (!parent)
diff --git a/panels/network/wireless-security/eap-method-fast.ui b/panels/network/wireless-security/eap-method-fast.ui
index af1fc2ad8..5e550f1a4 100644
--- a/panels/network/wireless-security/eap-method-fast.ui
+++ b/panels/network/wireless-security/eap-method-fast.ui
@@ -29,11 +29,10 @@
       </row>
     </data>
   </object>
-  <object class="GtkTable" id="eap_fast_table">
+  <object class="GtkGrid" id="eap_fast_grid">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="n_rows">5</property>
-    <property name="n_columns">2</property>
+    <property name="valign">start</property>
     <property name="column_spacing">6</property>
     <property name="row_spacing">6</property>
     <child>
@@ -46,20 +45,20 @@
         <property name="mnemonic_widget">eap_fast_anon_identity_entry</property>
       </object>
       <packing>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
       </packing>
     </child>
     <child>
       <object class="GtkEntry" id="eap_fast_anon_identity_entry">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="hexpand">True</property>
         <property name="activates_default">True</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
-        <property name="y_options"/>
+        <property name="top_attach">0</property>
       </packing>
     </child>
     <child>
@@ -72,24 +71,19 @@
         <property name="mnemonic_widget">eap_fast_pac_file_button</property>
       </object>
       <packing>
+        <property name="left_attach">0</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
       </packing>
     </child>
     <child>
       <object class="GtkFileChooserButton" id="eap_fast_pac_file_button">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options">GTK_FILL</property>
       </packing>
     </child>
     <child>
@@ -102,10 +96,9 @@
         </child>
       </object>
       <packing>
-        <property name="right_attach">2</property>
+        <property name="left_attach">0</property>
+        <property name="width">2</property>
         <property name="top_attach">4</property>
-        <property name="bottom_attach">5</property>
-        <property name="x_options">GTK_FILL</property>
       </packing>
     </child>
     <child>
@@ -118,16 +111,15 @@
         <property name="mnemonic_widget">eap_fast_inner_auth_combo</property>
       </object>
       <packing>
+        <property name="left_attach">0</property>
         <property name="top_attach">3</property>
-        <property name="bottom_attach">4</property>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
       </packing>
     </child>
     <child>
       <object class="GtkComboBox" id="eap_fast_inner_auth_combo">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
         <property name="model">model8</property>
         <child>
           <object class="GtkCellRendererText" id="renderer8"/>
@@ -138,11 +130,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">3</property>
-        <property name="bottom_attach">4</property>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options">GTK_FILL</property>
       </packing>
     </child>
     <child>
@@ -155,16 +143,15 @@
         <property name="draw_indicator">True</property>
       </object>
       <packing>
+        <property name="left_attach">0</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
       </packing>
     </child>
     <child>
       <object class="GtkComboBox" id="eap_fast_pac_provision_combo">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
         <property name="model">model9</property>
         <child>
           <object class="GtkCellRendererText" id="renderer9"/>
@@ -175,11 +162,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options">GTK_FILL</property>
       </packing>
     </child>
   </object>
diff --git a/panels/network/wireless-security/eap-method-leap.c b/panels/network/wireless-security/eap-method-leap.c
index 5af38eba8..29936e523 100644
--- a/panels/network/wireless-security/eap-method-leap.c
+++ b/panels/network/wireless-security/eap-method-leap.c
@@ -174,7 +174,7 @@ destroy (EAPMethod *parent)
 	EAPMethodLEAP *method = (EAPMethodLEAP *) parent;
 	GtkWidget *widget;
 
-	widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_table"));
+	widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_grid"));
 	g_assert (widget);
 	g_signal_handlers_disconnect_by_data (widget, method);
 
@@ -200,7 +200,7 @@ eap_method_leap_new (WirelessSecurity *ws_parent,
 	                          update_secrets,
 	                          destroy,
 	                          "/org/gnome/ControlCenter/network/eap-method-leap.ui",
-	                          "eap_leap_table",
+	                          "eap_leap_grid",
 	                          "eap_leap_username_entry",
 	                          FALSE);
 	if (!parent)
@@ -211,7 +211,7 @@ eap_method_leap_new (WirelessSecurity *ws_parent,
 	method->editing_connection = secrets_only ? FALSE : TRUE;
 	method->ws_parent = ws_parent;
 
-	widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_table"));
+	widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_grid"));
 	g_assert (widget);
 	g_signal_connect (G_OBJECT (widget), "realize",
 	                  (GCallback) widgets_realized,
diff --git a/panels/network/wireless-security/eap-method-leap.ui b/panels/network/wireless-security/eap-method-leap.ui
index fe677de4f..743a7a5a5 100644
--- a/panels/network/wireless-security/eap-method-leap.ui
+++ b/panels/network/wireless-security/eap-method-leap.ui
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.4"/>
-  <object class="GtkTable" id="eap_leap_table">
+  <object class="GtkGrid" id="eap_leap_grid">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="valign">start</property>
-    <property name="n_rows">3</property>
-    <property name="n_columns">2</property>
     <property name="column_spacing">6</property>
     <property name="row_spacing">6</property>
     <child>
@@ -22,8 +20,8 @@
         <property name="mnemonic_widget">eap_leap_username_entry</property>
       </object>
       <packing>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
       </packing>
     </child>
     <child>
@@ -36,25 +34,21 @@
         <property name="mnemonic_widget">eap_leap_password_entry</property>
       </object>
       <packing>
+        <property name="left_attach">0</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
       </packing>
     </child>
     <child>
       <object class="GtkEntry" id="eap_leap_password_entry">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="hexpand">True</property>
         <property name="visibility">False</property>
         <property name="activates_default">True</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="y_options"/>
       </packing>
     </child>
     <child>
@@ -62,28 +56,25 @@
         <property name="label" translatable="yes">Sho_w password</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="hexpand">True</property>
         <property name="receives_default">False</property>
         <property name="use_underline">True</property>
         <property name="draw_indicator">True</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
       </packing>
     </child>
     <child>
       <object class="GtkEntry" id="eap_leap_username_entry">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="hexpand">True</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
-        <property name="y_options"/>
+        <property name="top_attach">0</property>
       </packing>
     </child>
   </object>
diff --git a/panels/network/wireless-security/eap-method-simple.c b/panels/network/wireless-security/eap-method-simple.c
index abcf330d1..16cb636b5 100644
--- a/panels/network/wireless-security/eap-method-simple.c
+++ b/panels/network/wireless-security/eap-method-simple.c
@@ -266,7 +266,7 @@ destroy (EAPMethod *parent)
 	EAPMethodSimple *method = (EAPMethodSimple *) parent;
 	GtkWidget *widget;
 
-	widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_table"));
+	widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_grid"));
 	g_assert (widget);
 	g_signal_handlers_disconnect_by_data (widget, method);
 
@@ -296,7 +296,7 @@ eap_method_simple_new (WirelessSecurity *ws_parent,
 	                          update_secrets,
 	                          destroy,
 	                          "/org/gnome/ControlCenter/network/eap-method-simple.ui",
-	                          "eap_simple_table",
+	                          "eap_simple_grid",
 	                          "eap_simple_username_entry",
 	                          flags & EAP_METHOD_SIMPLE_FLAG_PHASE2);
 	if (!parent)
@@ -309,7 +309,7 @@ eap_method_simple_new (WirelessSecurity *ws_parent,
 	method->type = type;
 	g_assert (type < EAP_METHOD_SIMPLE_TYPE_LAST);
 
-	widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_table"));
+	widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_grid"));
 	g_assert (widget);
 	g_signal_connect (G_OBJECT (widget), "realize",
 	                  (GCallback) widgets_realized,
diff --git a/panels/network/wireless-security/eap-method-simple.ui b/panels/network/wireless-security/eap-method-simple.ui
index d6a17a117..dda1437fa 100644
--- a/panels/network/wireless-security/eap-method-simple.ui
+++ b/panels/network/wireless-security/eap-method-simple.ui
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.4"/>
-  <object class="GtkTable" id="eap_simple_table">
+  <object class="GtkGrid" id="eap_simple_grid">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="valign">start</property>
-    <property name="n_rows">3</property>
-    <property name="n_columns">2</property>
     <property name="column_spacing">6</property>
     <property name="row_spacing">6</property>
     <child>
@@ -22,8 +20,8 @@
         <property name="mnemonic_widget">eap_simple_username_entry</property>
       </object>
       <packing>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
       </packing>
     </child>
     <child>
@@ -36,43 +34,40 @@
         <property name="mnemonic_widget">eap_simple_password_entry</property>
       </object>
       <packing>
+        <property name="left_attach">0</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
       </packing>
     </child>
     <child>
       <object class="GtkEntry" id="eap_simple_password_entry">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="hexpand">True</property>
         <property name="visibility">False</property>
         <property name="activates_default">True</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="y_options"/>
       </packing>
     </child>
     <child>
       <object class="GtkEntry" id="eap_simple_username_entry">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="hexpand">True</property>
         <property name="activates_default">True</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
-        <property name="y_options"/>
+        <property name="top_attach">0</property>
       </packing>
     </child>
     <child>
       <object class="GtkBox" id="vbox5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkCheckButton" id="show_checkbutton_eapsimple">
@@ -95,9 +90,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
       </packing>
     </child>
   </object>
diff --git a/panels/network/wireless-security/ws-dynamic-wep.c b/panels/network/wireless-security/ws-dynamic-wep.c
index 2bb3df21b..3767e9706 100644
--- a/panels/network/wireless-security/ws-dynamic-wep.c
+++ b/panels/network/wireless-security/ws-dynamic-wep.c
@@ -110,7 +110,7 @@ ws_dynamic_wep_new (NMConnection *connection,
 	                                 update_secrets,
 	                                 destroy,
 	                                 "/org/gnome/ControlCenter/network/ws-dynamic-wep.ui",
-	                                 "dynamic_wep_table",
+	                                 "dynamic_wep_grid",
 	                                 NULL);
 	if (!parent)
 		return NULL;
diff --git a/panels/network/wireless-security/ws-dynamic-wep.ui b/panels/network/wireless-security/ws-dynamic-wep.ui
index c8ec44c19..a7f2f9a7a 100644
--- a/panels/network/wireless-security/ws-dynamic-wep.ui
+++ b/panels/network/wireless-security/ws-dynamic-wep.ui
@@ -12,19 +12,11 @@
       </row>
     </data>
   </object>
-  <object class="GtkTable" id="dynamic_wep_table">
+  <object class="GtkGrid" id="dynamic_wep_grid">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="n_rows">3</property>
-    <property name="n_columns">2</property>
     <property name="column_spacing">6</property>
     <property name="row_spacing">6</property>
-    <child>
-      <placeholder/>
-    </child>
-    <child>
-      <placeholder/>
-    </child>
     <child>
       <object class="GtkLabel" id="dynamic_wep_auth_label">
         <property name="visible">True</property>
@@ -35,14 +27,15 @@
         <property name="mnemonic_widget">dynamic_wep_auth_combo</property>
       </object>
       <packing>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
       </packing>
     </child>
     <child>
       <object class="GtkComboBox" id="dynamic_wep_auth_combo">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
         <property name="model">model7</property>
         <child>
           <object class="GtkCellRendererText" id="renderer7"/>
@@ -53,8 +46,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
-        <property name="y_options">GTK_FILL</property>
+        <property name="top_attach">0</property>
       </packing>
     </child>
     <child>
@@ -68,10 +60,9 @@
         </child>
       </object>
       <packing>
-        <property name="right_attach">2</property>
+        <property name="left_attach">0</property>
+        <property name="width">2</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">GTK_FILL</property>
       </packing>
     </child>
   </object>
diff --git a/panels/network/wireless-security/ws-leap.c b/panels/network/wireless-security/ws-leap.c
index 6549ea170..17f2a53ec 100644
--- a/panels/network/wireless-security/ws-leap.c
+++ b/panels/network/wireless-security/ws-leap.c
@@ -155,7 +155,7 @@ ws_leap_new (NMConnection *connection, gboolean secrets_only)
 	                                 update_secrets,
 	                                 NULL,
 	                                 "/org/gnome/ControlCenter/network/ws-leap.ui",
-	                                 "leap_table",
+	                                 "leap_grid",
 	                                 "leap_username_entry");
 	if (!parent)
 		return NULL;
diff --git a/panels/network/wireless-security/ws-leap.ui b/panels/network/wireless-security/ws-leap.ui
index 40c2cc8b5..449397517 100644
--- a/panels/network/wireless-security/ws-leap.ui
+++ b/panels/network/wireless-security/ws-leap.ui
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.4"/>
-  <object class="GtkTable" id="leap_table">
+  <object class="GtkGrid" id="leap_grid">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="valign">start</property>
-    <property name="n_rows">3</property>
-    <property name="n_columns">2</property>
     <property name="column_spacing">6</property>
     <property name="row_spacing">6</property>
     <child>
@@ -22,8 +20,8 @@
         <property name="mnemonic_widget">leap_username_entry</property>
       </object>
       <packing>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
       </packing>
     </child>
     <child>
@@ -36,25 +34,21 @@
         <property name="mnemonic_widget">leap_password_entry</property>
       </object>
       <packing>
+        <property name="left_attach">0</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
       </packing>
     </child>
     <child>
       <object class="GtkEntry" id="leap_password_entry">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="hexpand">True</property>
         <property name="visibility">False</property>
         <property name="activates_default">True</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="y_options"/>
       </packing>
     </child>
     <child>
@@ -62,29 +56,26 @@
         <property name="label" translatable="yes">Sho_w password</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="hexpand">True</property>
         <property name="receives_default">False</property>
         <property name="use_underline">True</property>
         <property name="draw_indicator">True</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
       </packing>
     </child>
     <child>
       <object class="GtkEntry" id="leap_username_entry">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="hexpand">True</property>
         <property name="activates_default">True</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
-        <property name="y_options"/>
+        <property name="top_attach">0</property>
       </packing>
     </child>
   </object>
diff --git a/panels/network/wireless-security/ws-wep-key.c b/panels/network/wireless-security/ws-wep-key.c
index ff9997377..d6f483e4a 100644
--- a/panels/network/wireless-security/ws-wep-key.c
+++ b/panels/network/wireless-security/ws-wep-key.c
@@ -265,7 +265,7 @@ ws_wep_key_new (NMConnection *connection,
 	                                 update_secrets,
 	                                 destroy,
 	                                 "/org/gnome/ControlCenter/network/ws-wep-key.ui",
-	                                 "wep_key_table",
+	                                 "wep_key_grid",
 	                                 "wep_key_entry");
 	if (!parent)
 		return NULL;
diff --git a/panels/network/wireless-security/ws-wep-key.ui b/panels/network/wireless-security/ws-wep-key.ui
index 66804c703..e3abe1372 100644
--- a/panels/network/wireless-security/ws-wep-key.ui
+++ b/panels/network/wireless-security/ws-wep-key.ui
@@ -35,11 +35,9 @@
       </row>
     </data>
   </object>
-  <object class="GtkTable" id="wep_key_table">
+  <object class="GtkGrid" id="wep_key_grid">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="n_rows">4</property>
-    <property name="n_columns">2</property>
     <property name="column_spacing">6</property>
     <property name="row_spacing">6</property>
     <child>
@@ -52,22 +50,22 @@
         <property name="mnemonic_widget">wep_key_entry</property>
       </object>
       <packing>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
       </packing>
     </child>
     <child>
       <object class="GtkEntry" id="wep_key_entry">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="hexpand">True</property>
         <property name="max_length">64</property>
         <property name="visibility">False</property>
         <property name="activates_default">True</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
-        <property name="y_options"/>
+        <property name="top_attach">0</property>
       </packing>
     </child>
     <child>
@@ -77,10 +75,8 @@
         <property name="xalign">0</property>
       </object>
       <packing>
+        <property name="left_attach">0</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
       </packing>
     </child>
     <child>
@@ -88,17 +84,14 @@
         <property name="label" translatable="yes">Sho_w key</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="hexpand">True</property>
         <property name="receives_default">False</property>
         <property name="use_underline">True</property>
         <property name="draw_indicator">True</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
       </packing>
     </child>
     <child>
@@ -111,16 +104,15 @@
         <property name="mnemonic_widget">auth_method_combo</property>
       </object>
       <packing>
+        <property name="left_attach">0</property>
         <property name="top_attach">3</property>
-        <property name="bottom_attach">4</property>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
       </packing>
     </child>
     <child>
       <object class="GtkComboBox" id="auth_method_combo">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
         <property name="model">model3</property>
         <child>
           <object class="GtkCellRendererText" id="renderer3"/>
@@ -131,11 +123,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">3</property>
-        <property name="bottom_attach">4</property>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options">GTK_FILL</property>
       </packing>
     </child>
     <child>
@@ -148,16 +136,15 @@
         <property name="mnemonic_widget">key_index_combo</property>
       </object>
       <packing>
+        <property name="left_attach">0</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
       </packing>
     </child>
     <child>
       <object class="GtkComboBox" id="key_index_combo">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
         <property name="model">model4</property>
         <child>
           <object class="GtkCellRendererText" id="renderer4"/>
@@ -168,11 +155,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options">GTK_FILL</property>
       </packing>
     </child>
   </object>
diff --git a/panels/network/wireless-security/ws-wpa-eap.c b/panels/network/wireless-security/ws-wpa-eap.c
index cac646a15..71b7489b1 100644
--- a/panels/network/wireless-security/ws-wpa-eap.c
+++ b/panels/network/wireless-security/ws-wpa-eap.c
@@ -111,7 +111,7 @@ ws_wpa_eap_new (NMConnection *connection,
 	                                 update_secrets,
 	                                 destroy,
 	                                 "/org/gnome/ControlCenter/network/ws-wpa-eap.ui",
-	                                 "wpa_eap_table",
+	                                 "wpa_eap_grid",
 	                                 NULL);
 	if (!parent)
 		return NULL;
diff --git a/panels/network/wireless-security/ws-wpa-eap.ui b/panels/network/wireless-security/ws-wpa-eap.ui
index ede859d59..958a31b56 100644
--- a/panels/network/wireless-security/ws-wpa-eap.ui
+++ b/panels/network/wireless-security/ws-wpa-eap.ui
@@ -12,11 +12,9 @@
       </row>
     </data>
   </object>
-  <object class="GtkTable" id="wpa_eap_table">
+  <object class="GtkGrid" id="wpa_eap_grid">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="n_rows">2</property>
-    <property name="n_columns">2</property>
     <property name="column_spacing">6</property>
     <property name="row_spacing">6</property>
     <child>
@@ -29,14 +27,15 @@
         <property name="mnemonic_widget">wpa_eap_auth_combo</property>
       </object>
       <packing>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
       </packing>
     </child>
     <child>
       <object class="GtkComboBox" id="wpa_eap_auth_combo">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
         <property name="model">model5</property>
         <child>
           <object class="GtkCellRendererText" id="renderer5"/>
@@ -47,8 +46,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
-        <property name="y_options">GTK_FILL</property>
+        <property name="top_attach">0</property>
       </packing>
     </child>
     <child>
@@ -61,10 +59,9 @@
         </child>
       </object>
       <packing>
-        <property name="right_attach">2</property>
+        <property name="left_attach">0</property>
+        <property name="width">2</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">GTK_FILL</property>
       </packing>
     </child>
   </object>
diff --git a/panels/network/wireless-security/ws-wpa-psk.c b/panels/network/wireless-security/ws-wpa-psk.c
index dbac2099d..640eb8a6c 100644
--- a/panels/network/wireless-security/ws-wpa-psk.c
+++ b/panels/network/wireless-security/ws-wpa-psk.c
@@ -183,7 +183,7 @@ ws_wpa_psk_new (NMConnection *connection, gboolean secrets_only)
 	                                 update_secrets,
 	                                 NULL,
 	                                 "/org/gnome/ControlCenter/network/ws-wpa-psk.ui",
-	                                 "wpa_psk_table",
+	                                 "wpa_psk_grid",
 	                                 "wpa_psk_entry");
 	if (!parent)
 		return NULL;
diff --git a/panels/network/wireless-security/ws-wpa-psk.ui b/panels/network/wireless-security/ws-wpa-psk.ui
index a4eaf1cc4..d758ef73e 100644
--- a/panels/network/wireless-security/ws-wpa-psk.ui
+++ b/panels/network/wireless-security/ws-wpa-psk.ui
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.4"/>
-  <object class="GtkTable" id="wpa_psk_table">
+  <object class="GtkGrid" id="wpa_psk_grid">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="n_rows">3</property>
-    <property name="n_columns">2</property>
     <property name="column_spacing">6</property>
     <property name="row_spacing">6</property>
     <child>
@@ -18,22 +16,22 @@
         <property name="mnemonic_widget">wpa_psk_entry</property>
       </object>
       <packing>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
       </packing>
     </child>
     <child>
       <object class="GtkEntry" id="wpa_psk_entry">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="hexpand">True</property>
         <property name="max_length">64</property>
         <property name="visibility">False</property>
         <property name="activates_default">True</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
-        <property name="y_options"/>
+        <property name="top_attach">0</property>
       </packing>
     </child>
     <child>
@@ -46,10 +44,8 @@
         <property name="mnemonic_widget">wpa_psk_type_combo</property>
       </object>
       <packing>
+        <property name="left_attach">0</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
       </packing>
     </child>
     <child>
@@ -59,10 +55,8 @@
         <property name="xalign">0</property>
       </object>
       <packing>
+        <property name="left_attach">0</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
       </packing>
     </child>
     <child>
@@ -70,30 +64,25 @@
         <property name="label" translatable="yes">Sho_w password</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="hexpand">True</property>
         <property name="receives_default">False</property>
         <property name="use_underline">True</property>
         <property name="draw_indicator">True</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options"/>
       </packing>
     </child>
     <child>
       <object class="GtkComboBox" id="wpa_psk_type_combo">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="y_options">GTK_FILL</property>
       </packing>
     </child>
   </object>