X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fhelper.c;h=75954fbdabbebbaae424d32b8e363b0f97aba4da;hb=27e94a1fb74828d4289110ad8b66e8b3eb8bc55e;hp=a68c0c2b80468de894d8b13780d57b0f43ce21ea;hpb=0c5217288cb57d0994d4c99997f5341e2c3a6871;p=pspp

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index a68c0c2b80..75954fbdab 100644
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2009, 2010  Free Software Foundation
+   Copyright (C) 2007, 2009, 2010, 2011  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
 #include <data/casereader-provider.h>
 #include <libpspp/message.h>
 #include "psppire-syntax-window.h"
-#include <gtk/gtkbuilder.h>
+#include <gtk/gtk.h>
 #include <libpspp/i18n.h>
 
 #include <ctype.h>
@@ -52,7 +52,7 @@
 gchar *
 value_to_text (union value v, const PsppireDict *dict, struct fmt_spec format)
 {
-  gchar *s = 0;
+  gchar *s = NULL;
 
   s = data_out (&v, dict_get_encoding (dict->dict),  &format);
   g_strchug (s);
@@ -208,9 +208,8 @@ connect_help (GtkBuilder *xml)
       GObject *o = i->data;
       if ( GTK_IS_WIDGET (o) )
 	{
-	  gchar *name = NULL;
+	  const gchar *name = gtk_buildable_get_name (GTK_BUILDABLE (o));
 	  gchar s[12] = {0};
-	  g_object_get (o, "name", &name, NULL);
 
 	  if ( name)
 	    strncpy (s, name, 11);