applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

network: Remove unused GtkNotebooks

Browse source 
The security widgets were inside GtkNotebooks, but only ever had one page and
tabs hidden. So they weren't doing anything.
This commit is contained in:
Robert Ancell 2019-10-01 10:35:25 +13:00 • committed by Georges Basile Stavracas Neto
parent e7cec00235
commit 84c53b01c5
22 changed files with 1161 additions and 1249 deletions
Download patch file Download diff file Expand all files Collapse all files

2
panels/network/wireless-security/eap-method-fast.c
View file

@ -342,7 +342,7 @@ eap_method_fast_new (WirelessSecurity *ws_parent,
update_secrets, update_secrets,
destroy, destroy,
"/org/gnome/ControlCenter/network/eap-method-fast.ui", "/org/gnome/ControlCenter/network/eap-method-fast.ui",
"eap_fast_notebook", "eap_fast_table",
"eap_fast_anon_identity_entry", "eap_fast_anon_identity_entry",
FALSE); FALSE);
if (!parent) if (!parent)

10
panels/network/wireless-security/eap-method-fast.ui
View file

@ -29,13 +29,7 @@
</row> </row>
</data> </data>
</object> </object>
<object class="GtkNotebook" id="eap_fast_notebook"> <object class="GtkTable" id="eap_fast_table">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
<object class="GtkTable" id="table13">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="n_rows">5</property> <property name="n_rows">5</property>
@ -189,6 +183,4 @@
</packing> </packing>
</child> </child>
</object> </object>
</child>
</object>
</interface> </interface>

6
panels/network/wireless-security/eap-method-leap.c
View file

@ -174,7 +174,7 @@ destroy (EAPMethod *parent)
EAPMethodLEAP *method = (EAPMethodLEAP *) parent; EAPMethodLEAP *method = (EAPMethodLEAP *) parent;
GtkWidget *widget; GtkWidget *widget;
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_notebook")); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_table"));
g_assert (widget); g_assert (widget);
g_signal_handlers_disconnect_by_data (widget, method); g_signal_handlers_disconnect_by_data (widget, method);
@ -200,7 +200,7 @@ eap_method_leap_new (WirelessSecurity *ws_parent,
update_secrets, update_secrets,
destroy, destroy,
"/org/gnome/ControlCenter/network/eap-method-leap.ui", "/org/gnome/ControlCenter/network/eap-method-leap.ui",
"eap_leap_notebook", "eap_leap_table",
"eap_leap_username_entry", "eap_leap_username_entry",
FALSE); FALSE);
if (!parent) if (!parent)
@ -211,7 +211,7 @@ eap_method_leap_new (WirelessSecurity *ws_parent,
method->editing_connection = secrets_only ? FALSE : TRUE; method->editing_connection = secrets_only ? FALSE : TRUE;
method->ws_parent = ws_parent; method->ws_parent = ws_parent;
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_notebook")); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_table"));
g_assert (widget); g_assert (widget);
g_signal_connect (G_OBJECT (widget), "realize", g_signal_connect (G_OBJECT (widget), "realize",
(GCallback) widgets_realized, (GCallback) widgets_realized,

10
panels/network/wireless-security/eap-method-leap.ui
View file

@ -1,13 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<requires lib="gtk+" version="3.4"/> <requires lib="gtk+" version="3.4"/>
<object class="GtkNotebook" id="eap_leap_notebook"> <object class="GtkTable" id="eap_leap_table">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
<object class="GtkTable" id="table9">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="valign">start</property> <property name="valign">start</property>
@ -93,6 +87,4 @@
</packing> </packing>
</child> </child>
</object> </object>
</child>
</object>
</interface> </interface>

2
panels/network/wireless-security/eap-method-peap.c
View file

@ -338,7 +338,7 @@ eap_method_peap_new (WirelessSecurity *ws_parent,
update_secrets, update_secrets,
destroy, destroy,
"/org/gnome/ControlCenter/network/eap-method-peap.ui", "/org/gnome/ControlCenter/network/eap-method-peap.ui",
"eap_peap_notebook", "eap_peap_grid",
"eap_peap_anon_identity_entry", "eap_peap_anon_identity_entry",
FALSE); FALSE);
if (!parent) if (!parent)

8
panels/network/wireless-security/eap-method-peap.ui
View file

@ -29,12 +29,6 @@
</row> </row>
</data> </data>
</object> </object>
<object class="GtkNotebook" id="eap_peap_notebook">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
<object class="GtkGrid" id="eap_peap_grid"> <object class="GtkGrid" id="eap_peap_grid">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
@ -186,6 +180,4 @@
</packing> </packing>
</child> </child>
</object> </object>
</child>
</object>
</interface> </interface>

6
panels/network/wireless-security/eap-method-simple.c
View file

@ -266,7 +266,7 @@ destroy (EAPMethod *parent)
EAPMethodSimple *method = (EAPMethodSimple *) parent; EAPMethodSimple *method = (EAPMethodSimple *) parent;
GtkWidget *widget; GtkWidget *widget;
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_notebook")); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_table"));
g_assert (widget); g_assert (widget);
g_signal_handlers_disconnect_by_data (widget, method); g_signal_handlers_disconnect_by_data (widget, method);
@ -296,7 +296,7 @@ eap_method_simple_new (WirelessSecurity *ws_parent,
update_secrets, update_secrets,
destroy, destroy,
"/org/gnome/ControlCenter/network/eap-method-simple.ui", "/org/gnome/ControlCenter/network/eap-method-simple.ui",
"eap_simple_notebook", "eap_simple_table",
"eap_simple_username_entry", "eap_simple_username_entry",
flags & EAP_METHOD_SIMPLE_FLAG_PHASE2); flags & EAP_METHOD_SIMPLE_FLAG_PHASE2);
if (!parent) if (!parent)
@ -309,7 +309,7 @@ eap_method_simple_new (WirelessSecurity *ws_parent,
method->type = type; method->type = type;
g_assert (type < EAP_METHOD_SIMPLE_TYPE_LAST); g_assert (type < EAP_METHOD_SIMPLE_TYPE_LAST);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_notebook")); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_table"));
g_assert (widget); g_assert (widget);
g_signal_connect (G_OBJECT (widget), "realize", g_signal_connect (G_OBJECT (widget), "realize",
(GCallback) widgets_realized, (GCallback) widgets_realized,

10
panels/network/wireless-security/eap-method-simple.ui
View file

@ -1,13 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<requires lib="gtk+" version="3.4"/> <requires lib="gtk+" version="3.4"/>
<object class="GtkNotebook" id="eap_simple_notebook"> <object class="GtkTable" id="eap_simple_table">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
<object class="GtkTable" id="table11">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="valign">start</property> <property name="valign">start</property>
@ -107,6 +101,4 @@
</packing> </packing>
</child> </child>
</object> </object>
</child>
</object>
</interface> </interface>

2
panels/network/wireless-security/eap-method-tls.c
View file

@ -442,7 +442,7 @@ eap_method_tls_new (WirelessSecurity *ws_parent,
update_secrets, update_secrets,
NULL, NULL,
"/org/gnome/ControlCenter/network/eap-method-tls.ui", "/org/gnome/ControlCenter/network/eap-method-tls.ui",
"eap_tls_notebook", "eap_tls_grid",
"eap_tls_identity_entry", "eap_tls_identity_entry",
phase2); phase2);
if (!parent) if (!parent)

8
panels/network/wireless-security/eap-method-tls.ui
View file

@ -1,12 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<requires lib="gtk+" version="3.4"/> <requires lib="gtk+" version="3.4"/>
<object class="GtkNotebook" id="eap_tls_notebook">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
<object class="GtkGrid" id="eap_tls_grid"> <object class="GtkGrid" id="eap_tls_grid">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
@ -175,6 +169,4 @@
</packing> </packing>
</child> </child>
</object> </object>
</child>
</object>
</interface> </interface>

2
panels/network/wireless-security/eap-method-ttls.c
View file

@ -393,7 +393,7 @@ eap_method_ttls_new (WirelessSecurity *ws_parent,
update_secrets, update_secrets,
destroy, destroy,
"/org/gnome/ControlCenter/network/eap-method-ttls.ui", "/org/gnome/ControlCenter/network/eap-method-ttls.ui",
"eap_ttls_notebook", "eap_ttls_grid",
"eap_ttls_anon_identity_entry", "eap_ttls_anon_identity_entry",
FALSE); FALSE);
if (!parent) if (!parent)

8
panels/network/wireless-security/eap-method-ttls.ui
View file

@ -12,12 +12,6 @@
</row> </row>
</data> </data>
</object> </object>
<object class="GtkNotebook" id="eap_ttls_notebook">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
<object class="GtkGrid" id="eap_ttls_grid"> <object class="GtkGrid" id="eap_ttls_grid">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
@ -165,6 +159,4 @@
</packing> </packing>
</child> </child>
</object> </object>
</child>
</object>
</interface> </interface>

2
panels/network/wireless-security/ws-dynamic-wep.c
View file

@ -110,7 +110,7 @@ ws_dynamic_wep_new (NMConnection *connection,
update_secrets, update_secrets,
destroy, destroy,
"/org/gnome/ControlCenter/network/ws-dynamic-wep.ui", "/org/gnome/ControlCenter/network/ws-dynamic-wep.ui",
"dynamic_wep_notebook", "dynamic_wep_table",
NULL); NULL);
if (!parent) if (!parent)
return NULL; return NULL;

10
panels/network/wireless-security/ws-dynamic-wep.ui
View file

@ -12,13 +12,7 @@
</row> </row>
</data> </data>
</object> </object>
<object class="GtkNotebook" id="dynamic_wep_notebook"> <object class="GtkTable" id="dynamic_wep_table">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
<object class="GtkTable" id="table12">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="n_rows">3</property> <property name="n_rows">3</property>
@ -81,6 +75,4 @@
</packing> </packing>
</child> </child>
</object> </object>
</child>
</object>
</interface> </interface>

2
panels/network/wireless-security/ws-leap.c
View file

@ -155,7 +155,7 @@ ws_leap_new (NMConnection *connection, gboolean secrets_only)
update_secrets, update_secrets,
NULL, NULL,
"/org/gnome/ControlCenter/network/ws-leap.ui", "/org/gnome/ControlCenter/network/ws-leap.ui",
"leap_notebook", "leap_table",
"leap_username_entry"); "leap_username_entry");
if (!parent) if (!parent)
return NULL; return NULL;

10
panels/network/wireless-security/ws-leap.ui
View file

@ -1,13 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<requires lib="gtk+" version="3.4"/> <requires lib="gtk+" version="3.4"/>
<object class="GtkNotebook" id="leap_notebook"> <object class="GtkTable" id="leap_table">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
<object class="GtkTable" id="table5">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="valign">start</property> <property name="valign">start</property>
@ -94,6 +88,4 @@
</packing> </packing>
</child> </child>
</object> </object>
</child>
</object>
</interface> </interface>

2
panels/network/wireless-security/ws-wep-key.c
View file

@ -265,7 +265,7 @@ ws_wep_key_new (NMConnection *connection,
update_secrets, update_secrets,
destroy, destroy,
"/org/gnome/ControlCenter/network/ws-wep-key.ui", "/org/gnome/ControlCenter/network/ws-wep-key.ui",
"wep_key_notebook", "wep_key_table",
"wep_key_entry"); "wep_key_entry");
if (!parent) if (!parent)
return NULL; return NULL;

10
panels/network/wireless-security/ws-wep-key.ui
View file

@ -35,13 +35,7 @@
</row> </row>
</data> </data>
</object> </object>
<object class="GtkNotebook" id="wep_key_notebook"> <object class="GtkTable" id="wep_key_table">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
<object class="GtkTable" id="table6">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="n_rows">4</property> <property name="n_rows">4</property>
@ -182,6 +176,4 @@
</packing> </packing>
</child> </child>
</object> </object>
</child>
</object>
</interface> </interface>

2
panels/network/wireless-security/ws-wpa-eap.c
View file

@ -111,7 +111,7 @@ ws_wpa_eap_new (NMConnection *connection,
update_secrets, update_secrets,
destroy, destroy,
"/org/gnome/ControlCenter/network/ws-wpa-eap.ui", "/org/gnome/ControlCenter/network/ws-wpa-eap.ui",
"wpa_eap_notebook", "wpa_eap_table",
NULL); NULL);
if (!parent) if (!parent)
return NULL; return NULL;

8
panels/network/wireless-security/ws-wpa-eap.ui
View file

@ -12,12 +12,6 @@
</row> </row>
</data> </data>
</object> </object>
<object class="GtkNotebook" id="wpa_eap_notebook">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
<object class="GtkTable" id="wpa_eap_table"> <object class="GtkTable" id="wpa_eap_table">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
@ -74,6 +68,4 @@
</packing> </packing>
</child> </child>
</object> </object>
</child>
</object>
</interface> </interface>

2
panels/network/wireless-security/ws-wpa-psk.c
View file

@ -183,7 +183,7 @@ ws_wpa_psk_new (NMConnection *connection, gboolean secrets_only)
update_secrets, update_secrets,
NULL, NULL,
"/org/gnome/ControlCenter/network/ws-wpa-psk.ui", "/org/gnome/ControlCenter/network/ws-wpa-psk.ui",
"wpa_psk_notebook", "wpa_psk_table",
"wpa_psk_entry"); "wpa_psk_entry");
if (!parent) if (!parent)
return NULL; return NULL;

8
panels/network/wireless-security/ws-wpa-psk.ui
View file

@ -1,12 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<requires lib="gtk+" version="3.4"/> <requires lib="gtk+" version="3.4"/>
<object class="GtkNotebook" id="wpa_psk_notebook">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
<object class="GtkTable" id="wpa_psk_table"> <object class="GtkTable" id="wpa_psk_table">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
@ -103,6 +97,4 @@
</packing> </packing>
</child> </child>
</object> </object>
</child>
</object>
</interface> </interface>