X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=a65764f4487d239c8b3bb76694be16a4e3795ab9;hb=6234cd81c073b8a08077847d08a22c1715d903ae;hp=cd63c4a68a6ffef42ef6e60782922c02963c06f4;hpb=b48a20de787a6374000174949dcd8f9666ecc51c;p=pspp-builds.git

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index cd63c4a6..a65764f4 100644
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -120,7 +120,7 @@ builder_new_real (const gchar *name)
 
 
 GObject *
-get_object_assert (GtkBuilder *builder, const gchar *name)
+get_object_assert (GtkBuilder *builder, const gchar *name, GType type)
 {
   GObject *o = NULL;
   g_assert (name);
@@ -130,26 +130,26 @@ get_object_assert (GtkBuilder *builder, const gchar *name)
   if ( !o )
     g_critical ("Object \"%s\" could not be found\n", name);
 
+  if ( ! g_type_is_a (G_OBJECT_TYPE (o), type))
+   {
+     g_critical ("Object \"%s\" was expected to have type %s, but in fact has type %s", 
+	name, g_type_name (type), G_OBJECT_TYPE_NAME (o));
+   }
+
   return o;
 }
 
-GtkWidget *
-get_widget_assert (gpointer x, const gchar *name)
-{
-  GObject *obj = G_OBJECT (x);
-  GtkWidget *w = NULL;
-  g_assert (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);
+GtkAction *
+get_action_assert (GtkBuilder *builder, const gchar *name)
+{
+  return GTK_ACTION (get_object_assert (builder, name, GTK_TYPE_ACTION));
+}
 
-  return w;
+GtkWidget *
+get_widget_assert (GtkBuilder *builder, const gchar *name)
+{
+  return GTK_WIDGET (get_object_assert (builder, name, GTK_TYPE_WIDGET));
 }
 
 /* Converts a string in the pspp locale to utf-8.
@@ -180,17 +180,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