Correct erroneous g_object_unref calls

[pspp] / src / ui / gui / regression-dialog.c

diff --git a/src/ui/gui/regression-dialog.c b/src/ui/gui/regression-dialog.c
index 53010c3ffdc47d342afb5adfc0e2cf025a349103..a4a4501c3c5a11c760cf9e5727ff49f4fa222d37 100644 (file)
--- a/src/ui/gui/regression-dialog.c
+++ b/src/ui/gui/regression-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008  Free Software Foundation
+   Copyright (C) 2008, 2010, 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
@@ -23,10 +23,10 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 
-#include <language/syntax-string-source.h>
 #include <ui/gui/psppire-data-window.h>
 #include <ui/gui/dialog-common.h>
 #include <ui/gui/dict-display.h>
+#include <ui/gui/builder-wrapper.h>
 #include <ui/gui/helper.h>
 #include <ui/gui/psppire-dialog.h>
 #include <ui/gui/psppire-var-store.h>
@@ -109,16 +109,12 @@ on_statistics_clicked (struct regression_dialog *rd)
 
   ret = psppire_dialog_run (PSPPIRE_DIALOG (rd->stat_dialog));
 
-  if ( ret == PSPPIRE_RESPONSE_CONTINUE )
-    {
-      g_object_unref (liststore);
-    }
-  else
+  if ( ret != PSPPIRE_RESPONSE_CONTINUE )
     {
-      g_object_unref (rd->stat);
       gtk_tree_view_set_model (GTK_TREE_VIEW (rd->stat_view) , GTK_TREE_MODEL (liststore));
       rd->stat = GTK_TREE_MODEL (liststore);
     }
+  g_object_unref (liststore);
 }
 
 static void
@@ -222,13 +218,12 @@ dialog_state_valid (gpointer data)
 
 /* Pops up the Regression dialog box */
 void
-regression_dialog (GObject *o, gpointer data)
+regression_dialog (PsppireDataWindow *de)
 {
   gint response;
   struct regression_dialog rd;
 
   GtkBuilder *xml = builder_new ("regression.ui");
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
   PsppireVarStore *vs;
 
   GtkWidget *dialog = get_widget_assert   (xml, "regression-dialog");
@@ -289,22 +284,10 @@ regression_dialog (GObject *o, gpointer data)
   switch (response)
     {
     case GTK_RESPONSE_OK:
-      {
-       gchar *syntax = generate_syntax (&rd);
-
-       struct getl_interface *sss = create_syntax_string_source (syntax);
-       execute_syntax (sss);
-
-       g_free (syntax);
-      }
+      g_free (execute_syntax_string (de, generate_syntax (&rd)));
       break;
     case PSPPIRE_RESPONSE_PASTE:
-      {
-       gchar *syntax = generate_syntax (&rd);
-        paste_syntax_in_new_window (syntax);
-
-       g_free (syntax);
-      }
+      g_free (paste_syntax_to_window (generate_syntax (&rd)));
       break;
     default:
       break;