Get rid of ggvutils

2005-01-01  Marco Pesenti Gritti  <marco@gnome.org>

        * ps/Makefile.am:
        * ps/ggvutils.c:
        * ps/ggvutils.h:
        * ps/gsdefaults.c: (gtk_gs_defaults_get_paper_sizes):
        * ps/gsdefaults.h:
        * ps/gtkgs.c: (file_length), (file_readable),
        (check_filecompressed), (check_pdf), (gtk_gs_load),
        (gtk_gs_get_postscript):

        Get rid of ggvutils

1 files changed, 23 insertions, 13 deletions

diff --git a/ps/gsdefaults.c b/ps/gsdefaults.c
index d5d2fbb..8a1ea9a 100644
--- a/ps/gsdefaults.c
+++ b/ps/gsdefaults.c
@@ -27,7 +27,6 @@
 
 #include "gtkgs.h"
 #include "gsdefaults.h"
-#include "ggvutils.h"
 
 #include <gconf/gconf-client.h>
 
@@ -63,6 +62,28 @@ static GtkGSDefaults gtk_gs_defaults = {
   GTK_GS_ZOOM_ABSOLUTE
 };
 
+GtkGSPaperSize gtk_gs_paper_sizes[] = {
+  {N_("BBox"), 0, 0},
+  {N_("Letter"), 612, 792,},
+  {N_("Tabloid"), 792, 1224,},
+  {N_("Ledger"), 1224, 792,},
+  {N_("Legal"), 612, 1008,},
+  {N_("Statement"), 396, 612,},
+  {N_("Executive"), 540, 720,},
+  {N_("A0"), 2380, 3368,},
+  {N_("A1"), 1684, 2380,},
+  {N_("A2"), 1190, 1684,},
+  {N_("A3"), 842, 1190,},
+  {N_("A4"), 595, 842,},
+  {N_("A5"), 420, 595,},
+  {N_("B4"), 729, 1032,},
+  {N_("B5"), 516, 729,},
+  {N_("Folio"), 612, 936,},
+  {N_("Quarto"), 610, 780,},
+  {N_("10x14"), 720, 1008,},
+  {NULL, 0, 0}
+};
+
 void
 gtk_gs_defaults_set_scroll_step(gfloat step)
 {
@@ -206,18 +227,7 @@ gtk_gs_defaults_get_respect_eof()
 GtkGSPaperSize *
 gtk_gs_defaults_get_paper_sizes()
 {
-  return ggv_paper_sizes;
-}
-
-gint
-gtk_gs_defaults_get_paper_count()
-{
-  gint n = 0;
-
-  while(ggv_paper_sizes[n].name != NULL)
-    n++;
-
-  return n;
+  return gtk_gs_paper_sizes;
 }
 
 gboolean