X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fbuilder-wrapper.c;h=f856b3e87a7cb9855ccf92afe7795a3830c3e9d5;hb=ff5de86ff88b3d3c8552ac0e29c94f4ce3a4f2eb;hp=94b1b365de8ae812753c72ae0e4b32ea1a818a60;hpb=6e097c89af440da90b43ce90864394c4d0c843d5;p=pspp diff --git a/src/ui/gui/builder-wrapper.c b/src/ui/gui/builder-wrapper.c index 94b1b365de..f856b3e87a 100644 --- a/src/ui/gui/builder-wrapper.c +++ b/src/ui/gui/builder-wrapper.c @@ -27,7 +27,7 @@ builder_new_real (const gchar *name) 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); @@ -36,24 +36,6 @@ builder_new_real (const gchar *name) 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) { @@ -62,9 +44,9 @@ 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", name, g_type_name (type), G_OBJECT_TYPE_NAME (o));