Try to render even if psscan fails.

2005-06-02  Marco Pesenti Gritti <mpg@redhat.com>

        * ps/ps-document.c: (output):
        * ps/ps.c: (psscan):

        Try to render even if psscan fails.

diff --git a/ChangeLog b/ChangeLog
index 87e275ae83ea76b2112e07619431b92caa27e011..7b87c94ea5f4d61d73cd2e6a09a553d1aebe7854 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-02  Marco Pesenti Gritti <mpg@redhat.com>
+
+       * ps/ps-document.c: (output):
+       * ps/ps.c: (psscan):
+
+       Try to render even if psscan fails.
+
 2005-06-01  Marco Pesenti Gritti <mpg@redhat.com>
 
        * ps/ps.c: (psscan), (pscopydoc):

diff --git a/ps/ps-document.c b/ps/ps-document.c
index b57c96a37489a8e0f2d0c00d014ac7a769699d23..8684f4d562214b356c72c13166954bc4e5172515 100644 (file)
--- a/ps/ps-document.c
+++ b/ps/ps-document.c
@@ -233,13 +233,6 @@ interpreter_failed (PSDocument *gs, char *msg)
        stop_interpreter (gs);
 }
 
-static void
-interpreter_message (PSDocument *gs, char *msg)
-{
-       /* FIXME maybe we should display a dialog */
-       g_print (msg);
-}
-
 static gboolean
 ps_document_widget_event (GtkWidget *widget, GdkEvent *event, gpointer data)
 {
@@ -524,7 +517,7 @@ is_interpreter_ready (PSDocument *gs)
 static void
 output(gpointer data, gint source, GdkInputCondition condition)
 {
-  char buf[MAX_BUFSIZE + 1], *msg;
+  char buf[MAX_BUFSIZE + 1];
   guint bytes = 0;
   PSDocument *gs = PS_DOCUMENT(data);
 
@@ -564,8 +557,7 @@ output(gpointer data, gint source, GdkInputCondition condition)
   }
   if(bytes > 0) {
     buf[bytes] = '\0';
-    msg = g_strdup(buf);
-    interpreter_message (gs, msg);   
+    printf(buf);
   }
 }
 

diff --git a/ps/ps.c b/ps/ps.c
index 693cc375cefc4506cf5624111692495d15b3d970..c95c8152c683dd7b5dee07d2fd30568cde16dc53 100644 (file)
--- a/ps/ps.c
+++ b/ps/ps.c
@@ -322,18 +322,6 @@ psscan(FILE * file, int respect_eof, const gchar * fname)
        In a way, this makes sense, a program PostScript does not need
        the !PS at the beginning.
      */
-    /* use a test command to determine if ghostscript can
-       understand this document! */
-    gchar *test_cmd;
-
-    test_cmd = g_strdup_printf
-      ("%s -dNOPAUSE -dBATCH -sDEVICE=nullpage %s "
-       "1>/dev/null 2>/dev/null", gtk_gs_defaults_get_interpreter_cmd(), fname);
-    if(system(test_cmd) != 0) {
-      g_free(test_cmd);
-      return NULL;
-    }
-    g_free(test_cmd);
     doc = g_new0(struct document, 1);
     doc->default_page_orientation = GTK_GS_ORIENTATION_NONE;
     doc->orientation = GTK_GS_ORIENTATION_NONE;