X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=75954fbdabbebbaae424d32b8e363b0f97aba4da;hb=292700057732bffe0808f7ed862c04321e92eacf;hp=9a1172a4db3329fd93f8bbcb75ac0d5a78839764;hpb=173d1687aea88e0e5e1b1d8615ed68ebefb15d08;p=pspp

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index 9a1172a4db..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);
@@ -97,11 +97,8 @@ text_to_value (const gchar *text,
     }
 
   value_init (val, width);
-  msg_disable ();
-  data_in (ss_cstr (text), UTF8, format->type, 0, 0, 0,
-		dict->dict,
-                val, width);
-  msg_enable ();
+  free (data_in (ss_cstr (text), UTF8, format->type, val, width,
+                 dict_get_encoding (dict->dict)));
 
   return val;
 }
@@ -211,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);
@@ -285,8 +281,8 @@ on_delete (GtkWindow *window, GdkEvent *e, GtkWindow **addr)
   return FALSE;
 }
 
-void
-paste_syntax_to_window (const gchar *syntax)
+char *
+paste_syntax_to_window (gchar *syntax)
 {
   static GtkWidget *the_syntax_pasteboard = NULL;
 
@@ -307,6 +303,8 @@ paste_syntax_to_window (const gchar *syntax)
   gtk_text_buffer_end_user_action (buffer);
 
   gtk_widget_show (the_syntax_pasteboard);
+
+  return syntax;
 }