X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-editor.c;h=aa511e937b69de617bcb4151a827dc971a53ce1e;hp=38250f7ea6959a76ab18e6f1db1458ffb8ed2e0f;hb=66153a44d861ccddf6a176ec5a94ffb959232ad6;hpb=d8659cda7d193dd3e6e035cd0b1b40493d360f0b diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c index 38250f7e..aa511e93 100644 --- a/src/ui/gui/psppire-data-editor.c +++ b/src/ui/gui/psppire-data-editor.c @@ -1203,9 +1203,13 @@ popup_variable_row_menu (PsppireSheet *sheet, gint row, PsppireVarStore *var_store = PSPPIRE_VAR_STORE (psppire_sheet_get_model (sheet)); + + PsppireDict *dict; + const struct variable *v ; - const struct variable *v = - psppire_dict_get_variable (var_store->dict, row); + g_object_get (var_store, "dictionary", &dict, NULL); + + v = psppire_dict_get_variable (dict, row); if ( v && event->button == 3) { @@ -1357,6 +1361,7 @@ psppire_data_editor_delete_cases (PsppireDataEditor *de) void psppire_data_editor_delete_variables (PsppireDataEditor *de) { + PsppireDict *dict = NULL; gint first, n; switch (gtk_notebook_get_current_page (GTK_NOTEBOOK (de))) @@ -1374,7 +1379,9 @@ psppire_data_editor_delete_variables (PsppireDataEditor *de) break; } - psppire_dict_delete_variables (de->var_store->dict, first, n); + g_object_get (de->var_store, "dictionary", &dict, NULL); + + psppire_dict_delete_variables (dict, first, n); psppire_sheet_unselect_range (PSPPIRE_SHEET (de->data_sheet[0])); psppire_sheet_unselect_range (PSPPIRE_SHEET (de->var_sheet));