Remove last vestiges of libglade dependencies

[pspp-builds.git] / src / ui / gui / helper.c

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index cd63c4a68a6ffef42ef6e60782922c02963c06f4..aa052c0768d78e08475cd169ca5a56f4175ecf95 100644 (file)
--- 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);
 
@@ -180,17 +177,34 @@ give_help (void)
 }
 
 void
-connect_help (GladeXML *xml)
+connect_help (GtkBuilder *xml)
 {
-  GList *helps = glade_xml_get_widget_prefix (xml, "help_button_");
+  GSList *helps = gtk_builder_get_objects (xml);
 
-  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);
+  GSList *i;
+  for ( i = helps; i ; i = g_slist_next (i))
+    {
+      GObject *o = i->data;
+      if ( GTK_IS_WIDGET (o) )
+       {
+         gchar *name = NULL;
+         gchar s[12] = {0};
+         g_object_get (o, "name", &name, NULL);
+
+         if ( name)
+           strncpy (s, name, 11);
+         s[11] = '\0';
 
-  g_list_free (helps);
-}
 
+         if ( 0 == strcmp ("help_button", s))
+           {
+           g_signal_connect (GTK_WIDGET (o), "clicked", give_help, 0);
+           }
+       }
+    }
+
+  g_slist_free (helps);
+}
 
 
 void