X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fvariable-info-dialog.c;h=d0b3eeaebf37e99b953537f208e8f8ce26c4f9fd;hb=086322fd8c85a303ba6f552950d6f057f2867add;hp=11cee3e5d78a84b73d4e6ff63f5e85d9eed89cf3;hpb=86166f73821142c2f82fdace3ac40a0933989dcd;p=pspp-builds.git

diff --git a/src/ui/gui/variable-info-dialog.c b/src/ui/gui/variable-info-dialog.c
index 11cee3e5..d0b3eeae 100644
--- a/src/ui/gui/variable-info-dialog.c
+++ b/src/ui/gui/variable-info-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2009  Free Software Foundation
+   Copyright (C) 2007, 2009, 2010  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
@@ -17,19 +17,20 @@
 #include <config.h>
 #include <gtk/gtk.h>
 
-#include "var-display.h"
 #include <data/variable.h>
 #include <data/format.h>
 #include <data/value-labels.h>
+#include <libpspp/i18n.h>
+
+#include "variable-info-dialog.h"
+#include "var-display.h"
+
 #include "psppire-data-window.h"
 #include "psppire-dialog.h"
-#include "psppire-var-store.h"
 #include "psppire-dictview.h"
+#include "psppire-var-store.h"
 #include "helper.h"
 
-#include <language/syntax-string-source.h>
-#include <libpspp/i18n.h>
-#include "helper.h"
 
 
 #include <gettext.h>
@@ -65,7 +66,7 @@ populate_text (PsppireDictView *treeview, gpointer data)
   if ( var == NULL)
     return;
 
-  g_object_get (treeview, "dictionary", &dict,
+  g_object_get (treeview, "model", &dict,
 		NULL);
 
   gstring = g_string_sized_new (200);
@@ -91,8 +92,6 @@ populate_text (PsppireDictView *treeview, gpointer data)
   text = measure_to_string (var, NULL);
   g_string_append_printf (gstring, _("Measurement Level: %s\n"),
 			  text);
-  g_free (text);
-
 
 
   /* Value Labels */
@@ -145,10 +144,8 @@ static gchar * generate_syntax (PsppireDictView *treeview);
 
 
 void
-variable_info_dialog (GObject *o, gpointer data)
+variable_info_dialog (PsppireDataWindow *de)
 {
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
-
   gint response ;
 
   GtkBuilder *xml = builder_new ("variable-info.ui");
@@ -165,7 +162,7 @@ variable_info_dialog (GObject *o, gpointer data)
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
 
   g_object_get (vs, "dictionary", &dict, NULL);
-  g_object_set (treeview, "dictionary", dict,
+  g_object_set (treeview, "model", dict,
 		"selection-mode", GTK_SELECTION_SINGLE,
 		NULL);
 
@@ -199,7 +196,7 @@ variable_info_dialog (GObject *o, gpointer data)
     case PSPPIRE_RESPONSE_PASTE:
       {
 	gchar *syntax = generate_syntax (PSPPIRE_DICT_VIEW (treeview));
-        paste_syntax_in_new_window (syntax);
+        paste_syntax_to_window (syntax);
 
 	g_free (syntax);
       }