[Pspp-cvs] pspp/src/ui/gui automake.mk data-editor.h data-...

[Jason H Stover]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     Jason H Stover <jstover>        08/02/08 17:50:53

Modified files:
        src/ui/gui     : automake.mk data-editor.h data-editor.c 

Log message:
        undid accidental checkin of text import patch

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/automake.mk?cvsroot=pspp&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-editor.h?cvsroot=pspp&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-editor.c?cvsroot=pspp&r1=1.60&r2=1.61

Patches:
Index: automake.mk
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/automake.mk,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- automake.mk 8 Feb 2008 16:10:12 -0000       1.47
+++ automake.mk 8 Feb 2008 17:50:52 -0000       1.48
@@ -59,7 +59,6 @@
        $(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/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 \

Index: data-editor.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-editor.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- data-editor.h       8 Feb 2008 17:22:27 -0000       1.29
+++ data-editor.h       8 Feb 2008 17:50:52 -0000       1.30
@@ -31,7 +31,6 @@
   GtkAction *action_data_save_as;
   GtkAction *action_data_save;
 
-  GtkAction *invoke_text_import_assistant;
 
   /* Actions which invoke dialog boxes */
   GtkAction *invoke_weight_cases_dialog;

Index: data-editor.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-editor.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- data-editor.c       8 Feb 2008 16:10:12 -0000       1.60
+++ data-editor.c       8 Feb 2008 17:50:52 -0000       1.61
@@ -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 @@
                    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 @@
 
   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 */