From: John Darrington Date: Sun, 3 Feb 2008 04:15:34 +0000 (+0000) Subject: Fix leak in dialogs, and correct name of options button. X-Git-Tag: v0.6.0~141 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=463d2f08bc7b9a2a2e47090f4f1e5a811278db43;p=pspp-builds.git Fix leak in dialogs, and correct name of options button. --- diff --git a/src/ui/gui/dialog-common.c b/src/ui/gui/dialog-common.c index fe2c7937..bbdc36a2 100644 --- a/src/ui/gui/dialog-common.c +++ b/src/ui/gui/dialog-common.c @@ -280,17 +280,14 @@ numeric_only (GtkWidget *source, GtkWidget *dest) 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); - v = psppire_dict_get_variable (dict, idx[0]); + const struct variable *v = psppire_dict_get_variable (dict, idx[0]); + + gtk_tree_path_free (fpath); if ( var_is_alpha (v)) { diff --git a/src/ui/gui/t-test-independent-samples-dialog.c b/src/ui/gui/t-test-independent-samples-dialog.c index 74b43cc1..c759edfb 100644 --- a/src/ui/gui/t-test-independent-samples-dialog.c +++ b/src/ui/gui/t-test-independent-samples-dialog.c @@ -417,7 +417,7 @@ t_test_independent_samples_dialog (GObject *o, gpointer data) 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)); diff --git a/src/ui/gui/t-test-paired-samples.c b/src/ui/gui/t-test-paired-samples.c index 6b5a6e9e..7bb422ca 100644 --- a/src/ui/gui/t-test-paired-samples.c +++ b/src/ui/gui/t-test-paired-samples.c @@ -196,7 +196,7 @@ t_test_paired_samples_dialog (GObject *o, gpointer data) 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"); diff --git a/src/ui/gui/t-test.glade b/src/ui/gui/t-test.glade index 0ee5f118..e355daf4 100644 --- a/src/ui/gui/t-test.glade +++ b/src/ui/gui/t-test.glade @@ -61,7 +61,7 @@ - + True True True @@ -256,15 +256,15 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Group_2 value: - True - - + True + + 1 2 - - - + + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -282,13 +282,13 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 1 - 2 + 1 + 2 1 2 - - - + + + True True @@ -299,19 +299,19 @@ 2 - - - 1 - 2 - 1 - 2 + + + 1 + 2 + 1 + 2 GTK_EXPAND - - - + + + - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True @@ -512,7 +512,7 @@ 4 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -524,9 +524,9 @@ 12 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK GTK_POLICY_NEVER GTK_POLICY_AUTOMATIC GTK_SHADOW_ETCHED_IN @@ -536,9 +536,9 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False - - - + + + @@ -549,7 +549,7 @@ Test Variable(s): True - + label_item @@ -679,18 +679,18 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_ETCHED_IN - - True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_ETCHED_IN + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False True @@ -710,69 +710,69 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True 5 + + - - - + False False 1 - - - + + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_SHADOW_NONE - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 12 - - True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_ETCHED_IN + GTK_SHADOW_NONE - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_ETCHED_IN + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False + + + + - - - - - + - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Test Variable(s): - True - - - label_item - - - + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Test Variable(s): + True + + + label_item + + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True True True @@ -781,7 +781,7 @@ - + False False 1 @@ -790,8 +790,8 @@ 2 - - + +