X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fcount-dialog.c;h=135cc473304fa91c43eaf9b59ea5eec75bfecafb;hb=fc3f48c05a02829466ab0dc472c96be3e14259e3;hp=39a99dbd9d8ad2ece22839c5e3ce319d85b3c050;hpb=32ee0e0402d6d56674f53a47d879ec5c07dabe09;p=pspp diff --git a/src/ui/gui/count-dialog.c b/src/ui/gui/count-dialog.c index 39a99dbd9d..135cc47330 100644 --- a/src/ui/gui/count-dialog.c +++ b/src/ui/gui/count-dialog.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2011 Free Software Foundation + Copyright (C) 2011, 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 @@ -20,7 +20,7 @@ #include "count-dialog.h" #include -#include "helper.h" +#include "builder-wrapper.h" #include "psppire-dialog.h" #include "psppire-selector.h" #include "psppire-val-chooser.h" @@ -28,8 +28,10 @@ #include "psppire-acr.h" #include "dialog-common.h" + #include #include "executor.h" +#include "helper.h" struct cnt_dialog { @@ -112,7 +114,6 @@ dialog_state_valid (gpointer data) void count_dialog (PsppireDataWindow *de) { gint response; - PsppireVarStore *vs = NULL; struct cnt_dialog cnt; GtkBuilder *builder = builder_new ("count.ui"); @@ -135,9 +136,7 @@ void count_dialog (PsppireDataWindow *de) g_signal_connect (cnt.dialog, "refresh", G_CALLBACK (refresh), &cnt); - g_object_get (de->data_editor, "var-store", &vs, NULL); - - g_object_get (vs, "dictionary", &cnt.dict, NULL); + g_object_get (de->data_editor, "dictionary", &cnt.dict, NULL); gtk_window_set_transient_for (GTK_WINDOW (cnt.dialog), GTK_WINDOW (de)); @@ -163,6 +162,7 @@ void count_dialog (PsppireDataWindow *de) } + g_object_unref (cnt.value_list); g_object_unref (builder); }