undid accidental checkin of text import patch

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index a313a19b109a39b2dbaf346c83b918645f5b5b51..3a1dd3a648d440e071a78bba6654ac84ffe8daa5 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -59,7 +59,6 @@ dist_src_ui_gui_psppire_DATA = \
        $(top_srcdir)/src/ui/gui/rank.glade \
        $(top_srcdir)/src/ui/gui/recode.glade \
        $(top_srcdir)/src/ui/gui/syntax-editor.glade \
-       $(top_srcdir)/src/ui/gui/text-data-import.glade \
        $(top_srcdir)/src/ui/gui/t-test.glade \
        $(top_srcdir)/src/ui/gui/psppicon.png \
        $(top_srcdir)/src/ui/gui/pspplogo.png \
@@ -161,10 +160,6 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/syntax-editor.h \
        src/ui/gui/syntax-editor-source.c \
        src/ui/gui/syntax-editor-source.h \
-       src/ui/gui/text-data-import-dialog.c \
-       src/ui/gui/text-data-import-dialog.h \
-       src/ui/gui/text-data-import-model.c \
-       src/ui/gui/text-data-import-model.h \
        src/ui/gui/transpose-dialog.c \
        src/ui/gui/transpose-dialog.h \
        src/ui/gui/t-test-independent-samples-dialog.c \

diff --git a/src/ui/gui/data-editor.c b/src/ui/gui/data-editor.c
index 1be409be6ccf7a73b7e2141018d1d3745acdafe9..2007c7bbc01c3ba5a06325cda1410b410a33e45b 100644 (file)
--- a/src/ui/gui/data-editor.c
+++ b/src/ui/gui/data-editor.c
@@ -44,7 +44,6 @@
 #include "descriptives-dialog.h"
 #include "crosstabs-dialog.h"
 #include "frequencies-dialog.h"
-#include "text-data-import-dialog.h"
 #include "dict-display.h"
 #include "clipboard.h"
 
@@ -787,11 +786,6 @@ new_data_editor (void)
                    G_CALLBACK (open_syntax_window),
                    e->window);
 
-  g_signal_connect_swapped (get_widget_assert (de->xml,"file_import-text"),
-                           "activate",
-                           G_CALLBACK (gtk_action_activate),
-                           de->invoke_text_import_assistant);
-
   g_signal_connect_swapped (get_widget_assert (de->xml,"file_save"),
                            "activate",
                            G_CALLBACK (gtk_action_activate),
@@ -1517,15 +1511,6 @@ register_data_editor_actions (struct data_editor *de)
 
   g_signal_connect (de->action_data_new, "activate",
                    G_CALLBACK (new_file), de);
-
-  de->invoke_text_import_assistant =
-    gtk_action_new ("file_import-text",
-                   _("_Import Text Data"),
-                   _("Import text data file"),
-                   "");
-
-  g_signal_connect (de->invoke_text_import_assistant, "activate",
-                   G_CALLBACK (text_data_import_assistant), de);
 }
 
 /* Returns true if NAME has a suffix which might denote a PSPP file */

diff --git a/src/ui/gui/data-editor.h b/src/ui/gui/data-editor.h
index 6cd609fa0e2c4c8f0ba306b38095f6173c584f83..ca69dd5a4df717d1eec983ef510daa9c4546ca5a 100644 (file)
--- a/src/ui/gui/data-editor.h
+++ b/src/ui/gui/data-editor.h
@@ -31,7 +31,6 @@ struct data_editor
   GtkAction *action_data_save_as;
   GtkAction *action_data_save;
 
-  GtkAction *invoke_text_import_assistant;
 
   /* Actions which invoke dialog boxes */
   GtkAction *invoke_weight_cases_dialog;