GtkBuilder *builder = gtk_builder_new ();
GError *err = NULL;
- if ( ! gtk_builder_add_from_file (builder, name, &err))
+ if (! gtk_builder_add_from_file (builder, name, &err))
{
g_critical ("Couldn\'t open user interface file %s: %s", name, err->message);
g_clear_error (&err);
return builder;
}
-
-GtkBuilder *
-builder_new_x (const gchar *obj_name)
-{
- GtkBuilder *b;
- GString *str = g_string_new (PKGDATADIR);
- g_string_append (str, "/");
- g_string_append (str, obj_name);
-
- b = builder_new_real (relocate (str->str));
-
- g_string_free (str, TRUE);
-
- return b;
-}
-
-
-
GObject *
get_object_assert (GtkBuilder *builder, const gchar *name, GType type)
{
o = gtk_builder_get_object (builder, name);
- if ( !o )
+ if (!o)
g_critical ("Object `%s' could not be found\n", name);
- else if ( ! g_type_is_a (G_OBJECT_TYPE (o), type))
+ else 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",
+ 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));
}
get_widget_assert (GtkBuilder *builder, const gchar *name)
{
GtkWidget *w = GTK_WIDGET (get_object_assert (builder, name, GTK_TYPE_WIDGET));
-
+
g_object_set (w, "name", name, NULL);
return w;