X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-variable.c;h=3fa71ea30b5330fe194df1e6fd8e4745f286b527;hb=b1b43c0d6a64d29a13953aa15d98dd74117faa95;hp=6443ee901ed2c069744c9cd9943956afcc100fb6;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp

diff --git a/src/ui/gui/psppire-variable.c b/src/ui/gui/psppire-variable.c
index 6443ee901e..3fa71ea30b 100644
--- a/src/ui/gui/psppire-variable.c
+++ b/src/ui/gui/psppire-variable.c
@@ -21,9 +21,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "missing-values.h"
-#include "value-labels.h"
-#include "format.h"
+#include <data/missing-values.h>
+#include <data/value-labels.h>
+#include <data/format.h>
 
 #include "psppire-variable.h"
 #include "psppire-dict.h"
@@ -87,11 +87,13 @@ psppire_variable_set_label(struct PsppireVariable *pv, const gchar *label)
 gboolean
 psppire_variable_set_decimals(struct PsppireVariable *pv, gint decimals)
 {
+  struct fmt_spec fmt;
+
   g_return_val_if_fail(pv, FALSE);
   g_return_val_if_fail(pv->dict, FALSE);
   g_return_val_if_fail(pv->v, FALSE);
 
-  struct fmt_spec fmt = pv->v->write;
+  fmt = pv->v->write;
 
   fmt.d = decimals;
 
@@ -103,11 +105,12 @@ psppire_variable_set_decimals(struct PsppireVariable *pv, gint decimals)
 gboolean
 psppire_variable_set_width(struct PsppireVariable *pv, gint width)
 {
+  struct fmt_spec fmt ;
   g_return_val_if_fail(pv, FALSE);
   g_return_val_if_fail(pv->dict, FALSE);
   g_return_val_if_fail(pv->v, FALSE);
 
-  struct fmt_spec fmt = pv->v->write;
+  fmt = pv->v->write;
 
   fmt.w = width;
 
@@ -342,8 +345,9 @@ psppire_variable_get_width(const struct PsppireVariable *pv)
   return pv->v->width;
 }
 
+
 gint
-psppire_variable_get_index(const struct PsppireVariable *pv)
+psppire_variable_get_fv(const struct PsppireVariable *pv)
 {
   g_return_val_if_fail(pv, -1);
   g_return_val_if_fail(pv->v, -1);
@@ -351,3 +355,14 @@ psppire_variable_get_index(const struct PsppireVariable *pv)
   return pv->v->fv;
 }
 
+
+
+gint
+psppire_variable_get_index(const struct PsppireVariable *pv)
+{
+  g_return_val_if_fail(pv, -1);
+  g_return_val_if_fail(pv->v, -1);
+
+  return pv->v->index;
+}
+