X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fhelper.c;h=a65764f4487d239c8b3bb76694be16a4e3795ab9;hb=f36da737674d3a58b3d8a7f404ca40cb3ba09394;hp=b1fdb27193df933ab583420693bd6b6b5f8481ec;hpb=8460ab652427b0a8e739840166d8f0cfdad29f34;p=pspp-builds.git

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index b1fdb271..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.
@@ -179,8 +179,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 +209,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)