X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fbuilder-wrapper.c;h=0750158e34f977aad8be0f050426d32aa95fb4a7;hb=e870838d34e5e0133997434d27035054c605fb4f;hp=a00d796889c2a5f138e61b0e32386a82a5d808d8;hpb=258cbd9cdf386687122b0854274923acafc786d4;p=pspp diff --git a/src/ui/gui/builder-wrapper.c b/src/ui/gui/builder-wrapper.c index a00d796889..0750158e34 100644 --- a/src/ui/gui/builder-wrapper.c +++ b/src/ui/gui/builder-wrapper.c @@ -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) { @@ -66,7 +48,7 @@ get_object_assert (GtkBuilder *builder, const gchar *name, GType type) g_critical ("Object `%s' could not be found\n", name); 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)); } @@ -78,7 +60,7 @@ GtkWidget * 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;