Cleanups

2004-12-31  Marco Pesenti Gritti  <marco@gnome.org>

        * ps/ggvutils.c:
        * ps/ggvutils.h:
        * ps/gsio.h:
        * ps/gtkgs.c: (gtk_gs_set_zoom):

        Cleanups

diff --git a/ChangeLog b/ChangeLog
index 66ce7879c9087084365b77a79bad2dc5ec045a92..7da0f544d5048750d6eae9c76b5128e814b681d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-31  Marco Pesenti Gritti  <marco@gnome.org>
+
+       * ps/ggvutils.c:
+       * ps/ggvutils.h:
+       * ps/gsio.h:
+       * ps/gtkgs.c: (gtk_gs_set_zoom):
+
+       Cleanups
+
 2004-12-31  Marco Pesenti Gritti  <marco@gnome.org>
 
        * ps/gtkgs.c: (gtk_gs_set_zoom), (gtk_gs_set_zoom_mode):

diff --git a/ps/ggvutils.c b/ps/ggvutils.c
index bea0412f0c2059f1d1024af807b8992a85f5c70f..5670a11dca6edce89487513d7e2b448538eda4ca 100644 (file)
--- a/ps/ggvutils.c
+++ b/ps/ggvutils.c
@@ -57,20 +57,6 @@ const gchar *ggv_orientation_labels[] = {
   NULL,
 };
 
-gfloat ggv_zoom_levels[] = {
-  1.0 / 6.0, 1.0 / 5.0, 1.0 / 4.0, 1.0 / 3.0, 1.0 / 2.0, 3.0 / 4.0, 1.0,
-  3.0 / 2.0, 2.0, 3.0, 4.0, 5.0, 6.0
-};
-
-const gchar *ggv_zoom_level_names[] = {
-  "1:6", "1:5", "1:4", "1:3",
-  "1:2", "3:4", "1:1", "3:2",
-  "2:1", "3:1", "4:1", "5:1",
-  "6:1",
-};
-
-const gint ggv_max_zoom_levels = (sizeof(ggv_zoom_levels) / sizeof(gfloat)) - 1;
-
 /* If file exists and is a regular file then return its length, else -1 */
 gint
 ggv_file_length(const gchar * filename)

diff --git a/ps/ggvutils.h b/ps/ggvutils.h
index 093b4c182f1c6bf91b767ea64d17db9ad52b1adf..c9b2f20bbe0dec4a9c50dd6ed0c518916cd9fbc6 100644 (file)
--- a/ps/ggvutils.h
+++ b/ps/ggvutils.h
@@ -26,9 +26,6 @@
 #include "gtkgs.h"
 
 extern GtkGSPaperSize ggv_paper_sizes[];
-extern gfloat ggv_zoom_levels[];
-extern const gchar *ggv_zoom_level_names[];
-extern const gint ggv_max_zoom_levels;
 
 /* If file exists and is a regular file then return its length, else -1 */
 gint ggv_file_length(const gchar * filename);

diff --git a/ps/gsio.h b/ps/gsio.h
index 31a7823bc09ebb8084f320a4aad95f0834666ce3..3f83cb06b5e2903fab03318b8a0041d2257b877d 100644 (file)
--- a/ps/gsio.h
+++ b/ps/gsio.h
@@ -23,15 +23,12 @@
 #ifndef __GS_IO_H__
 #define __GS_IO_H__
 
-#include <gtkgs.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
 typedef struct _GtkGSDocSink GtkGSDocSink;
 
-gchar *gtk_gs_get_pages(GtkGS * gs, gint * pages);
-gchar *gtk_gs_get_document(GtkGS * gs);
-
 GtkGSDocSink *gtk_gs_doc_sink_new(void);
 void gtk_gs_doc_sink_free(GtkGSDocSink * sink);
 void gtk_gs_doc_sink_write(GtkGSDocSink * sink, const gchar * buf, int len);

diff --git a/ps/gtkgs.c b/ps/gtkgs.c
index a710ab52bf0163fb2130c1f8ad237697a38410df..d1586c99a944b0ed29541c10b8f5b91fd90c370b 100644 (file)
--- a/ps/gtkgs.c
+++ b/ps/gtkgs.c
@@ -1736,10 +1736,7 @@ gtk_gs_set_zoom(GtkGS * gs, gfloat zoom)
   default:
     break;
   }
-  if(zoom < ggv_zoom_levels[0])
-    zoom = ggv_zoom_levels[0];
-  else if(zoom > ggv_zoom_levels[ggv_max_zoom_levels])
-    zoom = ggv_zoom_levels[ggv_max_zoom_levels];
+
   if(fabs(gs->zoom_factor - zoom) > 0.001) {
     gs->zoom_factor = zoom;
     set_up_page(gs);