Commit c5b70a78 authored by Rui Matos's avatar Rui Matos Committed by Bastien Nocera
Browse files

network: Remove unused toplevel windows from .ui files

https://bugzilla.gnome.org/show_bug.cgi?id=708286
parent 98ec15a5
......@@ -1457,5 +1457,5 @@ cc_network_panel_init (CcNetworkPanel *panel)
widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
"vbox1"));
gtk_widget_reparent (widget, (GtkWidget *) panel);
gtk_container_add (GTK_CONTAINER (panel), widget);
}
......@@ -64,10 +64,7 @@ device_ethernet_add_to_notebook (NetObject *object,
GtkWidget *vbox;
vbox = GTK_WIDGET (gtk_builder_get_object (device->builder, "vbox6"));
g_object_ref (vbox);
gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (vbox)), vbox);
gtk_notebook_append_page (notebook, vbox, NULL);
g_object_unref (vbox);
return vbox;
}
......
......@@ -78,7 +78,6 @@ device_mobile_proxy_add_to_notebook (NetObject *object,
GtkSizeGroup *heading_size_group)
{
GtkWidget *widget;
GtkWindow *window;
NetDeviceMobile *device_mobile = NET_DEVICE_MOBILE (object);
/* add widgets to size group */
......@@ -89,15 +88,9 @@ device_mobile_proxy_add_to_notebook (NetObject *object,
"heading_network"));
gtk_size_group_add_widget (heading_size_group, widget);
/* reparent */
window = GTK_WINDOW (gtk_builder_get_object (device_mobile->priv->builder,
"window_tmp"));
widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->priv->builder,
"vbox7"));
g_object_ref (widget);
gtk_container_remove (GTK_CONTAINER (window), widget);
gtk_notebook_append_page (notebook, widget, NULL);
g_object_unref (widget);
return widget;
}
......
......@@ -49,7 +49,6 @@ device_simple_proxy_add_to_notebook (NetObject *object,
GtkSizeGroup *heading_size_group)
{
GtkWidget *widget;
GtkWindow *window;
NetDeviceSimple *device_simple = NET_DEVICE_SIMPLE (object);
/* add widgets to size group */
......@@ -57,15 +56,9 @@ device_simple_proxy_add_to_notebook (NetObject *object,
"heading_ipv4"));
gtk_size_group_add_widget (heading_size_group, widget);
/* reparent */
window = GTK_WINDOW (gtk_builder_get_object (device_simple->priv->builder,
"window_tmp"));
widget = GTK_WIDGET (gtk_builder_get_object (device_simple->priv->builder,
"vbox6"));
g_object_ref (widget);
gtk_container_remove (GTK_CONTAINER (window), widget);
gtk_notebook_append_page (notebook, widget, NULL);
g_object_unref (widget);
return widget;
}
......
......@@ -87,7 +87,6 @@ device_wifi_proxy_add_to_notebook (NetObject *object,
GtkSizeGroup *heading_size_group)
{
GtkWidget *widget;
GtkWindow *window;
NetDeviceWifi *device_wifi = NET_DEVICE_WIFI (object);
/* add widgets to size group */
......@@ -95,15 +94,9 @@ device_wifi_proxy_add_to_notebook (NetObject *object,
"heading_ipv4"));
gtk_size_group_add_widget (heading_size_group, widget);
/* reparent */
window = GTK_WINDOW (gtk_builder_get_object (device_wifi->priv->builder,
"window_tmp"));
widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->priv->builder,
"notebook_view"));
g_object_ref (widget);
gtk_container_remove (GTK_CONTAINER (window), widget);
gtk_notebook_append_page (notebook, widget, NULL);
g_object_unref (widget);
return widget;
}
......
......@@ -215,7 +215,6 @@ net_proxy_add_to_notebook (NetObject *object,
GtkSizeGroup *heading_size_group)
{
GtkWidget *widget;
GtkWindow *window;
NetProxy *proxy = NET_PROXY (object);
/* add widgets to size group */
......@@ -223,15 +222,9 @@ net_proxy_add_to_notebook (NetObject *object,
"heading_proxy_method"));
gtk_size_group_add_widget (heading_size_group, widget);
/* reparent */
window = GTK_WINDOW (gtk_builder_get_object (proxy->priv->builder,
"window_tmp"));
widget = GTK_WIDGET (gtk_builder_get_object (proxy->priv->builder,
"grid5"));
g_object_ref (widget);
gtk_container_remove (GTK_CONTAINER (window), widget);
gtk_notebook_append_page (notebook, widget, NULL);
g_object_unref (widget);
return widget;
}
......
......@@ -235,7 +235,6 @@ vpn_proxy_add_to_notebook (NetObject *object,
GtkSizeGroup *heading_size_group)
{
GtkWidget *widget;
GtkWindow *window;
NetVpn *vpn = NET_VPN (object);
/* add widgets to size group */
......@@ -243,15 +242,9 @@ vpn_proxy_add_to_notebook (NetObject *object,
"heading_group_password"));
gtk_size_group_add_widget (heading_size_group, widget);
/* reparent */
window = GTK_WINDOW (gtk_builder_get_object (vpn->priv->builder,
"window_tmp"));
widget = GTK_WIDGET (gtk_builder_get_object (vpn->priv->builder,
"vbox9"));
g_object_ref (widget);
gtk_container_remove (GTK_CONTAINER (window), widget);
gtk_notebook_append_page (notebook, widget, NULL);
g_object_unref (widget);
return widget;
}
......
......@@ -7,9 +7,6 @@
<property name="icon_name">emblem-system-symbolic</property>
<property name="icon_size">1</property>
</object>
<object class="GtkWindow" id="window_tmp">
<property name="can_focus">False</property>
<child>
<object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
......@@ -218,7 +215,5 @@
</packing>
</child>
</object>
</child>
</object>
<object class="GtkSizeGroup" id="sizegroup1"/>
</interface>
......@@ -9,9 +9,6 @@
<column type="gchararray"/>
</columns>
</object>
<object class="GtkWindow" id="window_tmp">
<property name="can_focus">False</property>
<child>
<object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
<property name="can_focus">False</property>
......@@ -406,6 +403,4 @@
</packing>
</child>
</object>
</child>
</object>
</interface>
......@@ -39,9 +39,6 @@
</row>
</data>
</object>
<object class="GtkWindow" id="window_tmp">
<property name="can_focus">False</property>
<child>
<object class="GtkGrid" id="grid5">
<property name="visible">True</property>
<property name="can_focus">False</property>
......@@ -487,8 +484,6 @@
</packing>
</child>
</object>
</child>
</object>
<object class="GtkSizeGroup" id="sizegroup3">
<widgets>
<widget name="combobox_proxy_mode"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="window_tmp">
<property name="can_focus">False</property>
<child>
<object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
......@@ -339,7 +336,5 @@
</packing>
</child>
</object>
</child>
</object>
<object class="GtkSizeGroup" id="sizegroup1"/>
</interface>
......@@ -15,9 +15,6 @@
</row>
</data>
</object>
<object class="GtkWindow" id="window_tmp">
<property name="can_focus">False</property>
<child>
<object class="GtkVBox" id="vbox9">
<property name="visible">True</property>
<property name="can_focus">False</property>
......@@ -359,8 +356,6 @@
</packing>
</child>
</object>
</child>
</object>
<object class="GtkSizeGroup" id="sizegroup1">
<widgets>
<widget name="heading_service_type"/>
......
......@@ -1595,9 +1595,6 @@ here</property>
<action-widget response="-5">hotspot-turn-on-button</action-widget>
</action-widgets>
</object>
<object class="GtkWindow" id="window_tmp">
<property name="can_focus">False</property>
<child>
<object class="GtkNotebook" id="notebook_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
......@@ -2043,6 +2040,4 @@ here</property>
</packing>
</child>
</object>
</child>
</object>
</interface>
......@@ -217,9 +217,6 @@
<column type="gchararray"/>
</columns>
</object>
<object class="GtkWindow" id="window1">
<property name="can_focus">False</property>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
......@@ -352,8 +349,6 @@
</packing>
</child>
</object>
</child>
</object>
<object class="GtkSizeGroup" id="sizegroup1">
</object>
</interface>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment