Merge remote-tracking branch 'origin/master' into sheet

[pspp] / src / ui / gui / psppire-dialog-action-var-info.c

diff --git a/src/ui/gui/psppire-dialog-action-var-info.c b/src/ui/gui/psppire-dialog-action-var-info.c
index 21f9f0439ce52e8292ff2ea49eedc2198f572a2b..59c9dabd4707a143046885d04ee5fe36baa8c5d7 100644 (file)
--- 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,7 +52,7 @@ 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 *
@@ -105,7 +105,9 @@ generate_syntax (const PsppireDialogAction *act)
 {
   return generate_syntax__ (act, "");
 }
+
 \f
+
 static void
 populate_output (GtkTreeSelection *selection, gpointer data)
 {
@@ -175,30 +177,28 @@ psppire_dialog_action_var_info_activate (PsppireDialogAction *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_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_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (pda->source)),
-                    "changed", G_CALLBACK (populate_output),
-                   act);
+      g_signal_connect (pda->dialog, "response", G_CALLBACK (jump_to),
+                       pda);
 
-  g_signal_connect (pda->dialog, "response", G_CALLBACK (jump_to),
-                   pda);
-
-  psppire_dialog_action_set_valid_predicate (pda,
-                                            treeview_item_selected);
-
-  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