diff options
| -rw-r--r-- | panels/network/cc-network-panel.ui | 36 | ||||
| -rw-r--r-- | tests/network/test-network-panel.c | 3 |
2 files changed, 11 insertions, 28 deletions
diff --git a/panels/network/cc-network-panel.ui b/panels/network/cc-network-panel.ui index da65dd50f..ff78b492c 100644 --- a/panels/network/cc-network-panel.ui +++ b/panels/network/cc-network-panel.ui @@ -40,32 +40,22 @@ <property name="can_focus">False</property> <property name="shadow_type">none</property> <child> - <object class="GtkBox"> + <object class="HdyColumn"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">horizontal</property> - <property name="valign">start</property> - - <!-- Stub box --> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - </child> - + <property name="maximum_width">600</property> + <property name="linear_growth_width">400</property> + <property name="margin_top">32</property> + <property name="margin_bottom">32</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="spacing">12</property> - <property name="margin_top">32</property> - <property name="margin_bottom">32</property> - <property name="margin_left">18</property> - <property name="margin_right">18</property> <property name="orientation">vertical</property> + <property name="valign">start</property> <!-- Each GtkBox below will contain GtkStacks from the NetDevices --> <child> @@ -216,16 +206,6 @@ </child> </object> </child> - - <!-- Stub box --> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - </child> - </object> </child> </object> diff --git a/tests/network/test-network-panel.c b/tests/network/test-network-panel.c index 0ce09ba56..7ee765914 100644 --- a/tests/network/test-network-panel.c +++ b/tests/network/test-network-panel.c @@ -33,6 +33,8 @@ #include <sys/types.h> #include <signal.h> #include <gtk/gtk.h> +#define HANDY_USE_UNSTABLE_API +#include <handy.h> #include "cc-test-window.h" #include "shell/cc-object-storage.h" @@ -645,6 +647,7 @@ main (int argc, char **argv) g_setenv ("LC_ALL", "C", TRUE); gtk_test_init (&argc, &argv, NULL); + hdy_init (&argc, &argv); g_test_add ("/network-panel-wired/empty-ui", NetworkPanelFixture, |