projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
desktop: reversed mimetype to application/x-spss-sps
[pspp]
/
src
/
ui
/
gui
/
helper.c
diff --git
a/src/ui/gui/helper.c
b/src/ui/gui/helper.c
index 84df352fdd48cf47ea671d2bf63c6886f01064f1..40cd8e53878c43c04f089fad3373584aeef10774 100644
(file)
--- a/
src/ui/gui/helper.c
+++ b/
src/ui/gui/helper.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007, 2009, 2010, 2011, 2012 Free Software Foundation
+ Copyright (C) 2007, 2009, 2010, 2011, 2012
, 2013
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
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
@@
-40,7
+40,6
@@
#include <data/settings.h>
#include "psppire-data-store.h"
#include <data/settings.h>
#include "psppire-data-store.h"
-#include "psppire.h"
#include "gl/configmake.h"
#include "xalloc.h"
#include "gl/configmake.h"
#include "xalloc.h"
@@
-96,7
+95,7
@@
value_to_text__ (union value v,
{
gchar *s;
{
gchar *s;
- s = data_out
(&v, encoding, format
);
+ s = data_out
_stretchy (&v, encoding, format, NULL
);
if (fmt_is_numeric (format->type))
g_strchug (s);
else
if (fmt_is_numeric (format->type))
g_strchug (s);
else
@@
-138,25
+137,32
@@
text_to_value__ (const gchar *text,
{
int width = fmt_var_width (format);
{
int width = fmt_var_width (format);
- if (
format->type != FMT_A)
+ if (format->type != FMT_A)
{
{
- if (
! text
) return NULL;
+ if (
! text
) return NULL;
{
const gchar *s = text;
while (*s)
{
{
const gchar *s = text;
while (*s)
{
- if (
!isspace (*s))
+ if (!isspace (*s))
break;
s++;
}
break;
s++;
}
- if (
!*s) return NULL;
+ if (!*s) return NULL;
}
}
value_init (val, width);
}
}
value_init (val, width);
- free (data_in (ss_cstr (text), UTF8, format->type, val, width, encoding));
+ char *err = data_in (ss_cstr (text), UTF8, format->type, val, width, encoding);
+
+ if (err)
+ {
+ value_destroy (val, width);
+ val = NULL;
+ free (err);
+ }
return val;
}
return val;
}
@@
-213,20
+219,20
@@
connect_help (GtkBuilder *xml)
GSList *helps = gtk_builder_get_objects (xml);
GSList *i;
GSList *helps = gtk_builder_get_objects (xml);
GSList *i;
- for (
i = helps; i ; i = g_slist_next (i))
+ for (i = helps; i ; i = g_slist_next (i))
{
GObject *o = i->data;
{
GObject *o = i->data;
- if (
GTK_IS_WIDGET (o)
)
+ if (
GTK_IS_WIDGET (o)
)
{
const gchar *name = gtk_buildable_get_name (GTK_BUILDABLE (o));
gchar s[12] = {0};
{
const gchar *name = gtk_buildable_get_name (GTK_BUILDABLE (o));
gchar s[12] = {0};
- if (
name)
+ if (name)
strncpy (s, name, 11);
s[11] = '\0';
strncpy (s, name, 11);
s[11] = '\0';
- if (
0 == strcmp ("help_button", s))
+ if (0 == strcmp ("help_button", s))
{
g_signal_connect (o, "clicked", give_help, 0);
}
{
g_signal_connect (o, "clicked", give_help, 0);
}
@@
-250,7
+256,7
@@
clone_list_store (const GtkListStore *src)
int row = 0;
GtkListStore *dest;
int row = 0;
GtkListStore *dest;
- for (i = 0 ; i < n_cols; ++i
)
+ for (i = 0 ; i < n_cols; ++i)
types[i] = gtk_tree_model_get_column_type (GTK_TREE_MODEL (src), i);
dest = gtk_list_store_newv (n_cols, types);
types[i] = gtk_tree_model_get_column_type (GTK_TREE_MODEL (src), i);
dest = gtk_list_store_newv (n_cols, types);
@@
-263,7
+269,7
@@
clone_list_store (const GtkListStore *src)
GtkTreeIter dest_iter;
gtk_list_store_append (dest, &dest_iter);
GtkTreeIter dest_iter;
gtk_list_store_append (dest, &dest_iter);
- for (i = 0 ; i < n_cols; ++i
)
+ for (i = 0 ; i < n_cols; ++i)
{
GValue val = {0};
{
GValue val = {0};
@@
-283,7
+289,7
@@
clone_list_store (const GtkListStore *src)
-static gboolean
+static gboolean
on_delete (GtkWindow *window, GdkEvent *e, GtkWindow **addr)
{
*addr = NULL;
on_delete (GtkWindow *window, GdkEvent *e, GtkWindow **addr)
{
*addr = NULL;
@@
-298,7
+304,7
@@
paste_syntax_to_window (gchar *syntax)
GtkTextBuffer *buffer = NULL;
GtkTextBuffer *buffer = NULL;
- if (
NULL == the_syntax_pasteboard)
+ if (NULL == the_syntax_pasteboard)
{
the_syntax_pasteboard = psppire_syntax_window_new (NULL);
g_signal_connect (the_syntax_pasteboard, "delete-event", G_CALLBACK (on_delete),
{
the_syntax_pasteboard = psppire_syntax_window_new (NULL);
g_signal_connect (the_syntax_pasteboard, "delete-event", G_CALLBACK (on_delete),