X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fbuilder-wrapper.c;h=f856b3e87a7cb9855ccf92afe7795a3830c3e9d5;hb=828bb860056ffb5b1019089f8ed1e0364ecb9973;hp=5db4c824dc808a71bb5ec7f92adacbad9fc263f3;hpb=d46430e7458fcd65dfdf7928f52f2d06fa60127d;p=pspp

diff --git a/src/ui/gui/builder-wrapper.c b/src/ui/gui/builder-wrapper.c
index 5db4c824dc..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,11 +44,11 @@ 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));
    }
 
@@ -74,17 +56,11 @@ get_object_assert (GtkBuilder *builder, const gchar *name, GType type)
 }
 
 
-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)
 {
   GtkWidget *w = GTK_WIDGET (get_object_assert (builder, name, GTK_TYPE_WIDGET));
-  
+
   g_object_set (w, "name", name, NULL);
 
   return w;