[PATCH] Remove startup-id from AnacondaBaseWindow.
Chris Lumens
clumens at redhat.com
Thu Dec 5 21:33:27 UTC 2013
> 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(-)
Good riddance to bad stuff.
> 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);
> }
We may not even need this function anymore.
- Chris
More information about the anaconda-patches
mailing list