projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix possible memory corruption when creating dialogs with selectors.
[pspp]
/
src
/
ui
/
gui
/
psppire-data-store.c
diff --git
a/src/ui/gui/psppire-data-store.c
b/src/ui/gui/psppire-data-store.c
index 9a59638fc897fe1239fbfacb990f7d1277134391..fb89dfa20e928c68557a82186b63680e5601b84b 100644
(file)
--- a/
src/ui/gui/psppire-data-store.c
+++ b/
src/ui/gui/psppire-data-store.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2006, 2008, 2009 Free Software Foundation
+ Copyright (C) 2006, 2008, 2009
, 2010, 2012
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
@@
-239,7
+239,7
@@
psppire_data_store_get_case_count_wrapper (const PsppireSheetModel *model)
static void
psppire_data_store_init (PsppireDataStore *data_store)
{
static void
psppire_data_store_init (PsppireDataStore *data_store)
{
- data_store->dict =
0
;
+ data_store->dict =
NULL
;
data_store->datasheet = NULL;
data_store->dispose_has_run = FALSE;
}
data_store->datasheet = NULL;
data_store->dispose_has_run = FALSE;
}
@@
-301,8
+301,8
@@
psppire_data_store_sheet_model_init (PsppireSheetModelIface *iface)
A callback which occurs after a variable has been deleted.
*/
static void
A callback which occurs after a variable has been deleted.
*/
static void
-delete_variable_callback (GObject *obj,
gint dict_index
,
-
gint case_index, gint width
,
+delete_variable_callback (GObject *obj,
const struct variable *var UNUSED
,
+
gint dict_index, gint case_index
,
gpointer data)
{
PsppireDataStore *store = PSPPIRE_DATA_STORE (data);
gpointer data)
{
PsppireDataStore *store = PSPPIRE_DATA_STORE (data);
@@
-419,7
+419,7
@@
psppire_data_store_new (PsppireDict *dict)
{
PsppireDataStore *retval;
{
PsppireDataStore *retval;
- retval = g_object_new (
GTK
_TYPE_DATA_STORE, NULL);
+ retval = g_object_new (
PSPPIRE
_TYPE_DATA_STORE, NULL);
psppire_data_store_set_dictionary (retval, dict);
psppire_data_store_set_dictionary (retval, dict);
@@
-621,7
+621,7
@@
psppire_data_store_get_string (PsppireDataStore *store, glong row, glong column)
}
}
}
}
- fp = var_get_
write
_format (pv);
+ fp = var_get_
print
_format (pv);
text = data_out (&v, dict_get_encoding (dict), fp);
text = data_out (&v, dict_get_encoding (dict), fp);
@@
-679,7
+679,7
@@
psppire_data_store_set_string (PsppireDataStore *store,
psppire_data_store_data_in (store, row,
var_get_case_index (pv), ss_cstr (text),
psppire_data_store_data_in (store, row,
var_get_case_index (pv), ss_cstr (text),
- var_get_
write
_format (pv));
+ var_get_
print
_format (pv));
psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (store), row, col, row, col);
psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (store), row, col, row, col);
@@
-879,7
+879,7
@@
psppire_data_store_insert_case (PsppireDataStore *ds,
g_return_val_if_fail (ds, FALSE);
g_return_val_if_fail (ds->datasheet, FALSE);
g_return_val_if_fail (ds, FALSE);
g_return_val_if_fail (ds->datasheet, FALSE);
- case_ref (cc);
+ c
c = c
ase_ref (cc);
result = datasheet_insert_rows (ds->datasheet, posn, &cc, 1);
if ( result )
result = datasheet_insert_rows (ds->datasheet, posn, &cc, 1);
if ( result )
@@
-959,8
+959,8
@@
psppire_data_store_data_in (PsppireDataStore *ds, casenumber casenum, gint idx,
FALSE);
value_init (&value, width);
ok = (datasheet_get_value (ds->datasheet, casenum, idx, &value)
FALSE);
value_init (&value, width);
ok = (datasheet_get_value (ds->datasheet, casenum, idx, &value)
- && data_in
(input, UTF8, fmt->type, 0, 0, 0
,
-
dict->dict, &value, width
)
+ && data_in
_msg (input, UTF8, fmt->type, &value, width
,
+
dict_get_encoding (dict->dict)
)
&& datasheet_put_value (ds->datasheet, casenum, idx, &value));
value_destroy (&value, width);
&& datasheet_put_value (ds->datasheet, casenum, idx, &value));
value_destroy (&value, width);