projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite...
[pspp]
/
src
/
ui
/
gui
/
recode-dialog.c
diff --git
a/src/ui/gui/recode-dialog.c
b/src/ui/gui/recode-dialog.c
index 34145b0eddd2eaccb20ba87f36be9736ca2a0d62..314367462e6f403d691f2c9896972086b610075f 100644
(file)
--- a/
src/ui/gui/recode-dialog.c
+++ b/
src/ui/gui/recode-dialog.c
@@
-25,7
+25,6
@@
#include "recode-dialog.h"
#include <gtk/gtk.h>
#include "recode-dialog.h"
#include <gtk/gtk.h>
-#include <gtksheet/gtksheet.h>
#include <language/syntax-string-source.h>
#include <ui/gui/data-editor.h>
#include <language/syntax-string-source.h>
#include <ui/gui/data-editor.h>
@@
-35,7
+34,7
@@
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
#include <ui/gui/syntax-editor.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
#include <ui/gui/syntax-editor.h>
-#include <
libpspp
/syntax-gen.h>
+#include <
ui
/syntax-gen.h>
#include "psppire-acr.h"
#include "psppire-acr.h"
@@
-1339,9
+1338,8
@@
new_value_append_syntax (GString *str, const struct new_value *nv)
break;
case NV_STRING:
{
break;
case NV_STRING:
{
- struct string ds;
- ds_init_cstr (&ds, nv->v.s);
- gen_quoted_string (&ds);
+ struct string ds = DS_EMPTY_INITIALIZER;
+ syntax_gen_string (&ds, ss_cstr (nv->v.s));
g_string_append (str, ds_cstr (&ds));
ds_destroy (&ds);
}
g_string_append (str, ds_cstr (&ds));
ds_destroy (&ds);
}
@@
-1372,9
+1370,8
@@
old_value_append_syntax (GString *str, const struct old_value *ov)
break;
case OV_STRING:
{
break;
case OV_STRING:
{
- struct string ds;
- ds_init_cstr (&ds, ov->v.s);
- gen_quoted_string (&ds);
+ struct string ds = DS_EMPTY_INITIALIZER;
+ syntax_gen_string (&ds, ss_cstr (ov->v.s));
g_string_append (str, ds_cstr (&ds));
ds_destroy (&ds);
}
g_string_append (str, ds_cstr (&ds));
ds_destroy (&ds);
}
@@
-1538,9
+1535,9
@@
generate_syntax (const struct recode_dialog *rd)
continue;
}
continue;
}
- ds_init_cstr (&ls, label);
+ ds_init_empty (&ls);
+ syntax_gen_string (&ls, ss_cstr (label));
g_free (label);
g_free (label);
- gen_quoted_string (&ls);
g_string_append_printf (str, "\nVARIABLE LABELS %s %s.",
name, ds_cstr (&ls));
g_string_append_printf (str, "\nVARIABLE LABELS %s %s.",
name, ds_cstr (&ls));