Remove some unnecessary casts

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

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index 1d4ae02729348d495ed79a3ac9938cd44f3939de..6294e886f694983fb506572e03a2f422008ae402 100644 (file)
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -119,24 +119,37 @@ builder_new_real (const gchar *name)
 }
 
 
-
-GtkWidget *
-get_widget_assert (gpointer x, const gchar *name)
+GObject *
+get_object_assert (GtkBuilder *builder, const gchar *name, GType type)
 {
-  GObject *obj = G_OBJECT (x);
-  GtkWidget *w = NULL;
+  GObject *o = NULL;
   g_assert (name);
 
-  if (GTK_IS_BUILDER (obj))
-    w = GTK_WIDGET (gtk_builder_get_object (GTK_BUILDER (obj), name));
+  o = gtk_builder_get_object (builder, name);
+
+  if ( !o )
+    g_critical ("Object \"%s\" could not be found\n", name);
 
-  if (GLADE_IS_XML (obj))
-    w = glade_xml_get_widget (GLADE_XML (obj), 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;
+}
 
-  if ( !w )
-    g_critical ("Widget \"%s\" could not be found\n", name);
 
-  return w;
+GtkAction *
+get_action_assert (GtkBuilder *builder, const gchar *name)
+{
+  return GTK_ACTION (get_object_assert (builder, name, GTK_TYPE_ACTION));
+}
+
+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.
@@ -167,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 (o, "clicked", give_help, 0);
+           }
+       }
+    }
+
+  g_slist_free (helps);
+}
 
 
 void