Cleanup headers dependencies

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

        * ps/gsdefaults.c: (gtk_gs_defaults_gconf_client),
        (gtk_gs_defaults_changed):
        * ps/gsdefaults.h:
        * ps/gtkgs.c:
        * ps/gtkgs.h:
        * ps/ps.h:

        Cleanup headers dependencies

diff --git a/ChangeLog b/ChangeLog
index ac4cce93be3e08d068962f1aeae91b889ec15516..52eee6d4e9702a0ac3d84cfbe1b16cd0d05740c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-01-01  Marco Pesenti Gritti  <marco@gnome.org>
+
+       * ps/gsdefaults.c: (gtk_gs_defaults_gconf_client),
+       (gtk_gs_defaults_changed):
+       * ps/gsdefaults.h:
+       * ps/gtkgs.c:
+       * ps/gtkgs.h:
+       * ps/ps.h:
+
+       Cleanup headers dependencies
+
 2005-01-01  Marco Pesenti Gritti  <marco@gnome.org>
 
        * ps/Makefile.am:

diff --git a/ps/gsdefaults.c b/ps/gsdefaults.c
index 8a1ea9a01492da14be437e262b9b132babcc8cea..d20a6c2c25fdefb6d916696bbbb000c82e35c6e1 100644 (file)
--- a/ps/gsdefaults.c
+++ b/ps/gsdefaults.c
@@ -25,11 +25,13 @@
 #include <gnome.h>
 #include <math.h>
 
-#include "gtkgs.h"
 #include "gsdefaults.h"
 
 #include <gconf/gconf-client.h>
 
+static void gtk_gs_defaults_changed (GConfClient * client, guint cnxn_id,
+                                    GConfEntry * entry, gpointer user_data);
+
 /**
  * defaults for GtkGS widgets
  **/
@@ -398,6 +400,23 @@ gtk_gs_defaults_set_zoom_mode(GtkGSZoomMode zoom_mode)
   }
 }
 
+static GConfClient *
+gtk_gs_defaults_gconf_client()
+{
+  if(!gconf_client) {
+    g_assert(gconf_is_initialized());
+    gconf_client = gconf_client_get_default();
+    g_assert(gconf_client != NULL);
+    gconf_client_add_dir(gconf_client, "/apps/ggv/gtkgs",
+                         GCONF_CLIENT_PRELOAD_RECURSIVE, NULL);
+    gconf_client_notify_add(gconf_client,
+                            "/apps/ggv/gtkgs", (GConfClientNotifyFunc)
+                            gtk_gs_defaults_changed, NULL, NULL, NULL);
+  }
+
+  return gconf_client;
+}
+
 void
 gtk_gs_defaults_load()
 {
@@ -496,20 +515,3 @@ gtk_gs_defaults_changed(GConfClient * client, guint cnxn_id,
     gtk_gs_defaults_set_scroll_step
       (gconf_client_get_float(client, "/apps/ggv/gtkgs/scrollstep", NULL));
 }
-
-GConfClient *
-gtk_gs_defaults_gconf_client()
-{
-  if(!gconf_client) {
-    g_assert(gconf_is_initialized());
-    gconf_client = gconf_client_get_default();
-    g_assert(gconf_client != NULL);
-    gconf_client_add_dir(gconf_client, "/apps/ggv/gtkgs",
-                         GCONF_CLIENT_PRELOAD_RECURSIVE, NULL);
-    gconf_client_notify_add(gconf_client,
-                            "/apps/ggv/gtkgs", (GConfClientNotifyFunc)
-                            gtk_gs_defaults_changed, NULL, NULL, NULL);
-  }
-
-  return gconf_client;
-}

diff --git a/ps/gsdefaults.h b/ps/gsdefaults.h
index f70422cd4b811ae356922816e04324dbb1c3d502..0b211c3633c026b6609a2d20c98d2f02efc2c3f7 100644 (file)
--- a/ps/gsdefaults.h
+++ b/ps/gsdefaults.h
@@ -22,7 +22,9 @@
 #ifndef __GS_DEFAULTS_H__
 #define __GS_DEFAULTS_H__
 
-#include <gnome.h>
+#include <glib.h>
+
+#include "gstypes.h"
 
 G_BEGIN_DECLS
 
@@ -64,8 +66,6 @@ void gtk_gs_defaults_set_zoom_mode(GtkGSZoomMode zoom_mode);
 /* prefs IO */
 void gtk_gs_defaults_load(void);
 
-GConfClient *gtk_gs_defaults_gconf_client(void);
-
 G_END_DECLS
 
 #endif /* __GS_DEFAULTS_H__ */

diff --git a/ps/gtkgs.c b/ps/gtkgs.c
index edb700d7f6957612592dfbd3c4d47fc229a4e760..becc018cf679836fe6c972d725ec228398bfec0b 100644 (file)
--- a/ps/gtkgs.c
+++ b/ps/gtkgs.c
@@ -133,6 +133,7 @@ The DONE message indicates that ghostscript has finished processing.
 #include <gdk/gdkprivate.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdk.h>
+#include <glib/gi18n.h>
 #ifdef  HAVE_XINERAMA
 #   include <gdk/gdkx.h>
 #   include <X11/extensions/Xinerama.h>

diff --git a/ps/gtkgs.h b/ps/gtkgs.h
index 763c09c54a5d5bc08d6eb161f1be861bdb97f116..ea76026bb94d0fdb05e09809692962a4b4456fcd 100644 (file)
--- a/ps/gtkgs.h
+++ b/ps/gtkgs.h
@@ -35,6 +35,8 @@
 #include <sys/types.h>
 #include <stdio.h>
 
+#include "gstypes.h"
+
 G_BEGIN_DECLS
 
 #define GTK_GS_TYPE         (gtk_gs_get_type())
@@ -44,21 +46,6 @@ G_BEGIN_DECLS
 
 typedef struct _GtkGS GtkGS;
 typedef struct _GtkGSClass GtkGSClass;
-typedef struct _GtkGSPaperSize GtkGSPaperSize;
-
-typedef enum {
-  GTK_GS_ORIENTATION_NONE = -1,
-  GTK_GS_ORIENTATION_PORTRAIT = 0,
-  GTK_GS_ORIENTATION_SEASCAPE = 3,
-  GTK_GS_ORIENTATION_UPSIDEDOWN = 2,
-  GTK_GS_ORIENTATION_LANDSCAPE = 1
-} GtkGSOrientation;
-
-typedef enum {
-  GTK_GS_ZOOM_ABSOLUTE = 0,
-  GTK_GS_ZOOM_FIT_WIDTH = 1,
-  GTK_GS_ZOOM_FIT_PAGE = 2
-} GtkGSZoomMode;
 
 struct _GtkGS {
   GObject object;
@@ -155,11 +142,6 @@ struct record_list {
   struct record_list *next;
 };
 
-struct _GtkGSPaperSize {
-  gchar *name;
-  gint width, height;
-};
-
 GType gtk_gs_get_type(void);
 
 GObject *gtk_gs_new_from_file(GtkAdjustment * hadj, GtkAdjustment * vadj,

diff --git a/ps/ps.h b/ps/ps.h
index b539b2237a237ab069c6d1a417a6d3dd7786f7d9..b7bcda777877d65ec4a3e91e57cd44f6e3ea794e 100644 (file)
--- a/ps/ps.h
+++ b/ps/ps.h
@@ -27,7 +27,6 @@
 
 #include <stdio.h>
 
-#include <gtkgs.h>
 #include <gsio.h>
 
 G_BEGIN_DECLS