diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ps/gsdefaults.c | 38 | ||||
| -rw-r--r-- | ps/gsdefaults.h | 6 | ||||
| -rw-r--r-- | ps/gtkgs.c | 1 | ||||
| -rw-r--r-- | ps/gtkgs.h | 22 | ||||
| -rw-r--r-- | ps/ps.h | 1 |
6 files changed, 37 insertions, 42 deletions
@@ -1,5 +1,16 @@ 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: * ps/ggvutils.c: * ps/ggvutils.h: diff --git a/ps/gsdefaults.c b/ps/gsdefaults.c index 8a1ea9a..d20a6c2 100644 --- 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 f70422c..0b211c3 100644 --- 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__ */ @@ -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> @@ -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, @@ -27,7 +27,6 @@ #include <stdio.h> -#include <gtkgs.h> #include <gsio.h> G_BEGIN_DECLS |