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);
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.
if ( 0 == strcmp ("help_button", s))
{
- g_signal_connect (GTK_WIDGET (o), "clicked", give_help, 0);
+ g_signal_connect (o, "clicked", give_help, 0);
}
}
}
reference_manual (GtkMenuItem *menu, gpointer data)
{
GError *err = NULL;
- if ( ! g_spawn_command_line_async ("yelp info:pspp", &err) )
+ gchar *cmd = g_strdup_printf ("yelp file://%s", relocate (DOCDIR "/pspp.xml"));
+
+ if ( ! g_spawn_command_line_async (cmd, &err) )
{
msg (ME, _("Cannot open reference manual: %s"), err->message);
}
+
+ g_free (cmd);
g_clear_error (&err);
}