projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed some bad interaction between variable and data sheets.
[pspp]
/
src
/
ui
/
gui
/
psppire-dict.c
diff --git
a/src/ui/gui/psppire-dict.c
b/src/ui/gui/psppire-dict.c
index a8a8f63640cbc7ec41bed73759aa49e171006422..0927f9c99e7e58b53b1370673e62acea5a285c01 100644
(file)
--- a/
src/ui/gui/psppire-dict.c
+++ b/
src/ui/gui/psppire-dict.c
@@
-46,7
+46,6
@@
static GObjectClass *parent_class = NULL;
enum {VARIABLE_CHANGED,
VARIABLE_INSERTED,
enum {VARIABLE_CHANGED,
VARIABLE_INSERTED,
- VARIABLE_DELETED,
VARIABLES_DELETED,
n_SIGNALS};
VARIABLES_DELETED,
n_SIGNALS};
@@
-119,17
+118,6
@@
psppire_dict_class_init (PsppireDictClass *class)
1,
G_TYPE_INT);
1,
G_TYPE_INT);
- signal[VARIABLE_DELETED] =
- g_signal_new ("variable_deleted",
- G_TYPE_FROM_CLASS(class),
- G_SIGNAL_RUN_FIRST,
- 0,
- NULL, NULL,
- g_cclosure_marshal_VOID__INT,
- G_TYPE_NONE,
- 1,
- G_TYPE_INT);
-
signal[VARIABLES_DELETED] =
g_signal_new ("variables_deleted",
signal[VARIABLES_DELETED] =
g_signal_new ("variables_deleted",
@@
-332,7
+320,9
@@
psppire_dict_get_variable(PsppireDict *d, gint idx)
struct PsppireVariable *var ;
g_return_val_if_fail(d, NULL);
g_return_val_if_fail(d->dict, NULL);
struct PsppireVariable *var ;
g_return_val_if_fail(d, NULL);
g_return_val_if_fail(d->dict, NULL);
- g_return_val_if_fail(d->variables, NULL);
+
+ if ( ! d->variables)
+ return NULL;
if (idx < 0 || idx >= psppire_dict_get_var_cnt(d))
return NULL;
if (idx < 0 || idx >= psppire_dict_get_var_cnt(d))
return NULL;