X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-var-info.c;h=b4fa39e4ac3bf2dbe66bb3a222bc5ae650572e02;hb=9a4fd397b9ef95cbeb033cd7d92a3bebfe8709fc;hp=31580dd9f97e347f923447cd0f1d4db26e3340d7;hpb=ed208cf009043f0bf319a4e919c279d5b1401f36;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-var-info.c b/src/ui/gui/psppire-dialog-action-var-info.c
index 31580dd9f9..b4fa39e4ac 100644
--- a/src/ui/gui/psppire-dialog-action-var-info.c
+++ b/src/ui/gui/psppire-dialog-action-var-info.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2009, 2010, 2011, 2012, 2013, 2014  Free Software Foundation
+   Copyright (C) 2007, 2009, 2010, 2011, 2012, 2013, 2014, 2016  Free Software Foundation
 
 
    This program is free software: you can redistribute it and/or modify
@@ -52,11 +52,11 @@ treeview_item_selected (gpointer data)
   GtkTreeView *tv = GTK_TREE_VIEW (pda->source);
   GtkTreeSelection *selection = gtk_tree_view_get_selection (tv);
 
-  return gtk_tree_selection_count_selected_rows (selection) == 1;
+  return gtk_tree_selection_count_selected_rows (selection) >= 1;
 }
 
 static gchar *
-generate_syntax__ (PsppireDialogAction *act, const char *prefix)
+generate_syntax__ (const PsppireDialogAction *act, const char *prefix)
 {
   struct variable **vars;
   size_t n_vars;
@@ -101,11 +101,13 @@ generate_syntax__ (PsppireDialogAction *act, const char *prefix)
 }
 
 static gchar *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   return generate_syntax__ (act, "");
 }
+
 
+
 static void
 populate_output (GtkTreeSelection *selection, gpointer data)
 {
@@ -164,7 +166,7 @@ jump_to (PsppireDialog *d, gint response, gpointer data)
 }
 
 static void
-psppire_dialog_action_var_info_activate (GtkAction *a)
+psppire_dialog_action_var_info_activate (PsppireDialogAction *a)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionVarInfo *act = PSPPIRE_DIALOG_ACTION_VAR_INFO (pda);
@@ -175,30 +177,28 @@ psppire_dialog_action_var_info_activate (GtkAction *a)
     {
       xml = builder_new ("variable-info.ui");
       g_hash_table_insert (thing, a, xml);
-    }
 
-  act->output = psppire_output_view_new (
-    GTK_LAYOUT (get_widget_assert (xml, "layout1")), NULL, NULL, NULL);
+      act->output =
+	psppire_output_view_new (GTK_LAYOUT (get_widget_assert (xml, "layout1")),
+				 NULL);
 
-  pda->dialog = get_widget_assert (xml, "variable-info-dialog");
-  pda->source = get_widget_assert (xml, "treeview2");
+      pda->dialog = get_widget_assert (xml, "variable-info-dialog");
+      pda->source = get_widget_assert (xml, "treeview2");
 
-  g_object_set (pda->source,
-		"selection-mode", GTK_SELECTION_MULTIPLE,
-		NULL);
-
-  g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (pda->source)),
-                    "changed", G_CALLBACK (populate_output),
-		    act);
+      g_object_set (pda->source,
+		    "selection-mode", GTK_SELECTION_MULTIPLE,
+		    NULL);
 
-  g_signal_connect (pda->dialog, "response", G_CALLBACK (jump_to),
-		    pda);
+      g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (pda->source)),
+			"changed", G_CALLBACK (populate_output),
+			act);
 
-  psppire_dialog_action_set_valid_predicate (pda,
-					     treeview_item_selected);
+      g_signal_connect (pda->dialog, "response", G_CALLBACK (jump_to),
+			pda);
 
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_var_info_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_var_info_parent_class)->activate (pda);
+      psppire_dialog_action_set_valid_predicate (pda,
+						 treeview_item_selected);
+    }
 }
 
 static void