X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=aa052c0768d78e08475cd169ca5a56f4175ecf95;hb=16034f6f464c026cc3864dce79e367bfc4c1382d;hp=aec2e3d408a5411f86406e80c5d2635e0e946417;hpb=c38762e6de6a20119033f6405f05472372ec7c5a;p=pspp-builds.git diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c index aec2e3d4..aa052c07 100644 --- a/src/ui/gui/helper.c +++ b/src/ui/gui/helper.c @@ -143,9 +143,6 @@ get_widget_assert (gpointer x, const gchar *name) if (GTK_IS_BUILDER (obj)) w = GTK_WIDGET (gtk_builder_get_object (GTK_BUILDER (obj), name)); - if (GLADE_IS_XML (obj)) - w = glade_xml_get_widget (GLADE_XML (obj), name); - if ( !w ) g_critical ("Widget \"%s\" could not be found\n", name); @@ -179,8 +176,8 @@ give_help (void) gtk_widget_destroy (dialog); } -static void -connect_help_builder (GtkBuilder *xml) +void +connect_help (GtkBuilder *xml) { GSList *helps = gtk_builder_get_objects (xml); @@ -209,35 +206,6 @@ connect_help_builder (GtkBuilder *xml) g_slist_free (helps); } -static void -connect_help_glade (GladeXML *xml) -{ - GList *helps = glade_xml_get_widget_prefix (xml, "help_button_"); - - GList *i; - for ( i = g_list_first (helps); i ; i = g_list_next (i)) - g_signal_connect (GTK_WIDGET (i->data), "clicked", give_help, 0); - - g_list_free (helps); -} - - -void -connect_help (gpointer *xml) -{ - if (GTK_IS_BUILDER (xml)) - connect_help_builder (GTK_BUILDER (xml)); - - else if (GLADE_IS_XML (xml)) - connect_help_glade (GLADE_XML (xml)); - - else - { - g_error ("XML of type %s", G_OBJECT_TYPE_NAME (xml)); - } -} - - void reference_manual (GtkMenuItem *menu, gpointer data)