[Pspp-cvs] pspp/src/ui/gui dialog-common.c t-test-independ...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   08/02/03 04:15:34

Modified files:
        src/ui/gui     : dialog-common.c 
                         t-test-independent-samples-dialog.c 
                         t-test-paired-samples.c t-test.glade 

Log message:
        Fix leak in dialogs, and correct name of options button.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/dialog-common.c?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/t-test-independent-samples-dialog.c?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/t-test-paired-samples.c?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/t-test.glade?cvsroot=pspp&r1=1.4&r2=1.5

Patches:
Index: dialog-common.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/dialog-common.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- dialog-common.c     29 Jan 2008 11:12:59 -0000      1.7
+++ dialog-common.c     3 Feb 2008 04:15:34 -0000       1.8
@@ -280,17 +280,14 @@
   for (l = list; l ; l = l->next)
     {
       GtkTreePath *path = l->data;
-      GtkTreePath *fpath;
-      gint *idx;
-
-      const struct variable *v;
-
-      fpath = gtk_tree_model_filter_convert_path_to_child_path
+      GtkTreePath *fpath = gtk_tree_model_filter_convert_path_to_child_path
        (GTK_TREE_MODEL_FILTER (model), path);
 
-      idx = gtk_tree_path_get_indices (fpath);
+      gint *idx = gtk_tree_path_get_indices (fpath);
+
+      const struct variable *v = psppire_dict_get_variable (dict, idx[0]);
 
-      v = psppire_dict_get_variable (dict, idx[0]);
+      gtk_tree_path_free (fpath);
 
       if ( var_is_alpha (v))
        {

Index: t-test-independent-samples-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/t-test-independent-samples-dialog.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t-test-independent-samples-dialog.c 29 Jan 2008 11:13:00 -0000      1.9
+++ t-test-independent-samples-dialog.c 3 Feb 2008 04:15:34 -0000       1.10
@@ -417,7 +417,7 @@
     get_widget_assert (xml, "indep-samples-t-test-selector1");
 
   GtkWidget *options_button =
-    get_widget_assert (xml, "options-button");
+    get_widget_assert (xml, "indep-samples-t-test-options-button");
 
   vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
 

Index: t-test-paired-samples.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/t-test-paired-samples.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t-test-paired-samples.c     29 Jan 2008 11:26:05 -0000      1.1
+++ t-test-paired-samples.c     3 Feb 2008 04:15:34 -0000       1.2
@@ -196,7 +196,7 @@
   GtkWidget *dict_view =
     get_widget_assert (xml, "paired-samples-t-test-treeview1");
 
-  GtkWidget *options_button = get_widget_assert (xml, "options-button");
+  GtkWidget *options_button = get_widget_assert (xml, 
"paired-samples-t-test-options-button");
 
   GtkWidget *selector = get_widget_assert (xml, "psppire-selector3");
 

Index: t-test.glade
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/t-test.glade,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t-test.glade        29 Jan 2008 11:13:01 -0000      1.4
+++ t-test.glade        3 Feb 2008 04:15:34 -0000       1.5
@@ -61,7 +61,7 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="options-button">
+                      <widget class="GtkButton" 
id="indep-samples-t-test-options-button">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -772,7 +772,7 @@
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
                     <child>
-                      <widget class="GtkButton" id="options-button">
+                      <widget class="GtkButton" 
id="paired-samples-t-test-options-button">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>