This property isn't in Gtk3, it doesn't look like we need the workaround anymore, and since the glade adaptor is setting a property that isn't in GtkWidget anymore, it doesn't show up as a regular gobject property anymore and makes things looks really weird for gobject-introspection. --- pyanaconda/ui/gui/hubs/progress.glade | 2 -- pyanaconda/ui/gui/hubs/summary.glade | 2 -- pyanaconda/ui/gui/spokes/custom.glade | 2 -- pyanaconda/ui/gui/spokes/datetime_spoke.glade | 2 -- pyanaconda/ui/gui/spokes/filter.glade | 2 -- pyanaconda/ui/gui/spokes/keyboard.glade | 2 -- pyanaconda/ui/gui/spokes/langsupport.glade | 2 -- pyanaconda/ui/gui/spokes/network.glade | 4 ---- pyanaconda/ui/gui/spokes/password.glade | 2 -- pyanaconda/ui/gui/spokes/software.glade | 2 -- pyanaconda/ui/gui/spokes/source.glade | 2 -- pyanaconda/ui/gui/spokes/storage.glade | 2 -- pyanaconda/ui/gui/spokes/user.glade | 2 -- pyanaconda/ui/gui/spokes/welcome.glade | 2 -- widgets/glade/AnacondaWidgets.xml | 1 - widgets/src/glade-adaptor.c | 9 --------- 16 files changed, 40 deletions(-)
diff --git a/pyanaconda/ui/gui/hubs/progress.glade b/pyanaconda/ui/gui/hubs/progress.glade index 3794c71..46bad85 100644 --- a/pyanaconda/ui/gui/hubs/progress.glade +++ b/pyanaconda/ui/gui/hubs/progress.glade @@ -4,9 +4,7 @@ <!-- interface-requires gtk+ 3.0 --> <!-- interface-requires AnacondaWidgets 1.0 --> <object class="AnacondaHubWindow" id="progressWindow"> - <property name="startup_id">filler</property> <property name="can_focus">False</property> - <property name="startup_id">filler</property> <property name="window_name" translatable="yes">CONFIGURATION</property> <child internal-child="main_box"> <object class="GtkBox" id="AnacondaHubWindow-main_box1"> diff --git a/pyanaconda/ui/gui/hubs/summary.glade b/pyanaconda/ui/gui/hubs/summary.glade index 6bcdea4..103f971 100644 --- a/pyanaconda/ui/gui/hubs/summary.glade +++ b/pyanaconda/ui/gui/hubs/summary.glade @@ -4,9 +4,7 @@ <!-- interface-requires gtk+ 3.0 --> <!-- interface-requires AnacondaWidgets 1.0 --> <object class="AnacondaHubWindow" id="summaryWindow"> - <property name="startup_id">filler</property> <property name="can_focus">False</property> - <property name="startup_id">filler</property> <property name="window_name" translatable="yes">INSTALLATION SUMMARY</property> <child internal-child="main_box"> <object class="GtkBox" id="AnacondaHubWindow-main_box1"> diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade index 592fd49..8476e66 100644 --- a/pyanaconda/ui/gui/spokes/custom.glade +++ b/pyanaconda/ui/gui/spokes/custom.glade @@ -710,10 +710,8 @@ use. Try something else?</property> </action-widgets> </object> <object class="AnacondaSpokeWindow" id="customStorageWindow"> - <property name="startup_id">filler</property> <property name="can_focus">False</property> <property name="events">GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> - <property name="startup_id">filler</property> <property name="window_name" translatable="yes">MANUAL PARTITIONING</property> <signal name="button-clicked" handler="on_back_clicked" swapped="no"/> <signal name="info-bar-clicked" handler="on_info_bar_clicked" swapped="no"/> diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.glade b/pyanaconda/ui/gui/spokes/datetime_spoke.glade index 1662e11..413f92c 100644 --- a/pyanaconda/ui/gui/spokes/datetime_spoke.glade +++ b/pyanaconda/ui/gui/spokes/datetime_spoke.glade @@ -76,9 +76,7 @@ </columns> </object> <object class="AnacondaSpokeWindow" id="datetimeWindow"> - <property name="startup_id">filler</property> <property name="can_focus">False</property> - <property name="startup_id">filler</property> <property name="window_name" translatable="yes">DATE & TIME</property> <signal name="button-clicked" handler="on_back_clicked" swapped="no"/> <child internal-child="main_box"> diff --git a/pyanaconda/ui/gui/spokes/filter.glade b/pyanaconda/ui/gui/spokes/filter.glade index 4e2b461..f5ef863 100644 --- a/pyanaconda/ui/gui/spokes/filter.glade +++ b/pyanaconda/ui/gui/spokes/filter.glade @@ -55,11 +55,9 @@ <property name="child_model">diskStore</property> </object> <object class="AnacondaSpokeWindow" id="filterWindow"> - <property name="startup_id">filler</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="startup_id">filler</property> <property name="window_name" translatable="yes">INSTALLATION DESTINATION</property> <signal name="button-clicked" handler="on_back_clicked" swapped="no"/> <child internal-child="main_box"> diff --git a/pyanaconda/ui/gui/spokes/keyboard.glade b/pyanaconda/ui/gui/spokes/keyboard.glade index 2fb391d..ac9f06e 100644 --- a/pyanaconda/ui/gui/spokes/keyboard.glade +++ b/pyanaconda/ui/gui/spokes/keyboard.glade @@ -199,9 +199,7 @@ </object> <object class="GtkTextBuffer" id="layoutTestBuffer"/> <object class="AnacondaSpokeWindow" id="keyboardWindow"> - <property name="startup_id">filler</property> <property name="can_focus">False</property> - <property name="startup_id">filler</property> <property name="window_name" translatable="yes">KEYBOARD LAYOUT</property> <signal name="button-clicked" handler="on_back_clicked" swapped="no"/> <child internal-child="main_box"> diff --git a/pyanaconda/ui/gui/spokes/langsupport.glade b/pyanaconda/ui/gui/spokes/langsupport.glade index bc0df87..0c0c440 100644 --- a/pyanaconda/ui/gui/spokes/langsupport.glade +++ b/pyanaconda/ui/gui/spokes/langsupport.glade @@ -29,9 +29,7 @@ </columns> </object> <object class="AnacondaSpokeWindow" id="langsupportWindow"> - <property name="startup_id">filler</property> <property name="can_focus">False</property> - <property name="startup_id">filler</property> <property name="window_name" translatable="yes">LANGUAGE SUPPORT</property> <signal name="button-clicked" handler="on_back_clicked" swapped="no"/> <child internal-child="main_box"> diff --git a/pyanaconda/ui/gui/spokes/network.glade b/pyanaconda/ui/gui/spokes/network.glade index 5101e1b..d1fdd94 100644 --- a/pyanaconda/ui/gui/spokes/network.glade +++ b/pyanaconda/ui/gui/spokes/network.glade @@ -157,9 +157,7 @@ </columns> </object> <object class="AnacondaStandaloneWindow" id="networkStandaloneWindow"> - <property name="startup_id">filler</property> <property name="can_focus">False</property> - <property name="startup_id">filler</property> <property name="window_name" translatable="yes">NETWORK CONFIGURATION</property> <child internal-child="main_box"> <object class="GtkBox" id="AnacondaStandaloneWindow-main_box5"> @@ -233,9 +231,7 @@ updates available for you.</property> </child> </object> <object class="AnacondaSpokeWindow" id="networkWindow"> - <property name="startup_id">filler</property> <property name="can_focus">False</property> - <property name="startup_id">filler</property> <property name="window_name" translatable="yes">NETWORK CONFIGURATION</property> <signal name="button-clicked" handler="on_back_clicked" swapped="no"/> <child internal-child="main_box"> diff --git a/pyanaconda/ui/gui/spokes/password.glade b/pyanaconda/ui/gui/spokes/password.glade index a508e1c..a6c8724 100644 --- a/pyanaconda/ui/gui/spokes/password.glade +++ b/pyanaconda/ui/gui/spokes/password.glade @@ -3,9 +3,7 @@ <!-- interface-requires gtk+ 3.6 --> <!-- interface-requires AnacondaWidgets 1.0 --> <object class="AnacondaSpokeWindow" id="passwordWindow"> - <property name="startup_id">filler</property> <property name="can_focus">False</property> - <property name="startup_id">filler</property> <property name="window_name" translatable="yes">ROOT PASSWORD</property> <signal name="button-clicked" handler="on_back_clicked" swapped="no"/> <child internal-child="main_box"> diff --git a/pyanaconda/ui/gui/spokes/software.glade b/pyanaconda/ui/gui/spokes/software.glade index 7a9a717..3ea3fbb 100644 --- a/pyanaconda/ui/gui/spokes/software.glade +++ b/pyanaconda/ui/gui/spokes/software.glade @@ -26,11 +26,9 @@ </columns> </object> <object class="AnacondaSpokeWindow" id="softwareWindow"> - <property name="startup_id">filler</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="startup_id">filler</property> <property name="window_name" translatable="yes">SOFTWARE SELECTION</property> <signal name="button-clicked" handler="on_back_clicked" swapped="no"/> <signal name="info-bar-clicked" handler="on_info_bar_clicked" swapped="no"/> diff --git a/pyanaconda/ui/gui/spokes/source.glade b/pyanaconda/ui/gui/spokes/source.glade index 3dbf2b4..47ebfd6 100644 --- a/pyanaconda/ui/gui/spokes/source.glade +++ b/pyanaconda/ui/gui/spokes/source.glade @@ -490,9 +490,7 @@ </columns> </object> <object class="AnacondaSpokeWindow" id="sourceWindow"> - <property name="startup_id">filler</property> <property name="can_focus">False</property> - <property name="startup_id">filler</property> <property name="window_name" translatable="yes">INSTALLATION SOURCE</property> <signal name="button-clicked" handler="on_back_clicked" swapped="no"/> <child internal-child="main_box"> diff --git a/pyanaconda/ui/gui/spokes/storage.glade b/pyanaconda/ui/gui/spokes/storage.glade index 4486bf9..325e227 100644 --- a/pyanaconda/ui/gui/spokes/storage.glade +++ b/pyanaconda/ui/gui/spokes/storage.glade @@ -794,9 +794,7 @@ </columns> </object> <object class="AnacondaSpokeWindow" id="storageWindow"> - <property name="startup_id">filler</property> <property name="can_focus">False</property> - <property name="startup_id">filler</property> <property name="window_name" translatable="yes">INSTALLATION DESTINATION</property> <signal name="button-clicked" handler="on_back_clicked" swapped="no"/> <signal name="info-bar-clicked" handler="on_info_bar_clicked" swapped="no"/> diff --git a/pyanaconda/ui/gui/spokes/user.glade b/pyanaconda/ui/gui/spokes/user.glade index 123dfb3..949b33e 100644 --- a/pyanaconda/ui/gui/spokes/user.glade +++ b/pyanaconda/ui/gui/spokes/user.glade @@ -4,11 +4,9 @@ <!-- interface-requires gtk+ 3.6 --> <!-- interface-requires AnacondaWidgets 1.0 --> <object class="AnacondaSpokeWindow" id="userCreationWindow"> - <property name="startup_id">filler</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="startup_id">filler</property> <property name="window_name" translatable="yes">CREATE USER</property> <signal name="button-clicked" handler="on_back_clicked" swapped="no"/> <child internal-child="main_box"> diff --git a/pyanaconda/ui/gui/spokes/welcome.glade b/pyanaconda/ui/gui/spokes/welcome.glade index 7d88912..faa6b14 100644 --- a/pyanaconda/ui/gui/spokes/welcome.glade +++ b/pyanaconda/ui/gui/spokes/welcome.glade @@ -275,9 +275,7 @@ </action-widgets> </object> <object class="AnacondaStandaloneWindow" id="welcomeWindow"> - <property name="startup_id">filler</property> <property name="can_focus">False</property> - <property name="startup_id">filler</property> <property name="window_name"/> <child internal-child="main_box"> <object class="GtkBox" id="AnacondaStandaloneWindow-main_box1"> diff --git a/widgets/glade/AnacondaWidgets.xml b/widgets/glade/AnacondaWidgets.xml index 7a496c3..d078bcf 100644 --- a/widgets/glade/AnacondaWidgets.xml +++ b/widgets/glade/AnacondaWidgets.xml @@ -17,7 +17,6 @@ <property id="height-request" disabled="True" /> <property id="modal" disabled="True" /> <property id="resizable" disabled="True" /> - <property id="startup-id" visible="False" /> <property id="title" disabled="True" /> <property id="type" disabled="True" /> <property id="width-request" disabled="True" /> diff --git a/widgets/src/glade-adaptor.c b/widgets/src/glade-adaptor.c index edf52da..00c2f55 100644 --- a/widgets/src/glade-adaptor.c +++ b/widgets/src/glade-adaptor.c @@ -76,18 +76,9 @@ void anaconda_standalone_window_post_create(GladeWidgetAdaptor *adaptor, void anaconda_standalone_window_write_widget(GladeWidgetAdaptor *adaptor, GladeWidget *widget, GladeXmlContext *context, GladeXmlNode *node) { - GladeProperty *startup_id_prop; - if (!glade_xml_node_verify (node, GLADE_XML_TAG_WIDGET)) return;
- /* Set a bogus startup-id in the output XML file. This doesn't really seem - * like it should be necessary, but glade will crash if I don't. - */ - startup_id_prop = glade_widget_get_property(widget, "startup-id"); - glade_property_set(startup_id_prop, "filler"); - glade_property_write(startup_id_prop, context, node); - /* Chain up and write the parent's properties */ GWA_GET_CLASS (GTK_TYPE_WINDOW)->write_widget (adaptor, widget, context, node); }