diff -crN ./libgnomeprint/data/models/GNOME-GENERIC-PS.model /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/data/models/GNOME-GENERIC-PS.model
*** ./libgnomeprint/data/models/GNOME-GENERIC-PS.model Thu Jan 1 01:00:00 1970
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/data/models/GNOME-GENERIC-PS.model Wed Jan 22 15:56:14 2003
***************
*** 0 ****
--- 1,111 ----
+
+
+ Generic PostScript printer
+ GNOME
+ 0.0.1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -crN ./libgnomeprint/data/models/STYLUS-COLOR-740.model /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/data/models/STYLUS-COLOR-740.model
*** ./libgnomeprint/data/models/STYLUS-COLOR-740.model Thu Jan 1 01:00:00 1970
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/data/models/STYLUS-COLOR-740.model Wed Jan 22 15:57:02 2003
***************
*** 0 ****
--- 1,75 ----
+
+
+ Stylus Color 740
+ EPSON
+ 0.0.1
+
+
+
+
+
+
+
+
+
+
+
diff -crN ./libgnomeprint/libgnomeprint/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/libgnomeprint/Makefile.am
*** ./libgnomeprint/libgnomeprint/Makefile.am Fri Aug 8 17:46:49 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/libgnomeprint/Makefile.am Fri Oct 17 10:00:49 2003
***************
*** 1,4 ****
! SUBDIRS = gpa . transports modules
temp_sources = \
art_rgb_affine_private.h \
--- 1,4 ----
! SUBDIRS = gpa . modules transports
temp_sources = \
art_rgb_affine_private.h \
***************
*** 70,76 ****
gnome-print-private.h \
gnome-print-config-private.h \
gp-gc-private.h
-
lib_LTLIBRARIES = libgnomeprint-2-2.la
AM_LDFLAGS = -version-info $(GNOMEPRINT_CURRENT):$(GNOMEPRINT_REVISION):$(GNOMEPRINT_AGE)
--- 70,75 ----
diff -crN ./libgnomeprint/libgnomeprint/drivers/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/libgnomeprint/drivers/Makefile.am
*** ./libgnomeprint/libgnomeprint/drivers/Makefile.am Thu Jan 1 01:00:00 1970
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/libgnomeprint/drivers/Makefile.am Fri Aug 2 12:00:30 2002
***************
*** 0 ****
--- 1,43 ----
+ OMNI2_LIB = libgnomeprint-omni2.la
+ OMNI2_SRC = gnome-print-omni2.cpp gnome-print-omni2.hpp
+ OMNI2_LAD = -L$(OMNI_LIBDIR) -lomni
+ libgnomeprint_omni2_la_SOURCES = $(OMNI2_SRC)
+ libgnomeprint_omni2_la_LDFLAGS = -version-info 0:0:0 -module
+ libgnomeprint_omni2_la_LIBADD = $(OMNI2_LAD)
+
+ FAX_LIB = libgnomeprint-fax.la
+ FAX_SRC = gnome-print-fax.c gnome-print-fax.h gnome-print-fax-g3.h
+ libgnomeprint_fax_la_SOURCES = $(FAX_SRC)
+ libgnomeprint_fax_la_LDFLAGS = -version-info 0:0:0 -module
+ libgnomeprint_fax_la_LIBADD = $(LIBGNOMEPRINT_LIBS) ../libgnomeprint-2.la
+
+ libexecdir = $(libdir)/gnome-print-2.0/drivers
+
+ if HAVE_OMNI
+ omni_libraries = $(OMNI2_LIB)
+ omni_sources = $(OMNI2_SRC)
+ omni_libadd = $(OMNI2_LAD)
+ else
+ omni_libraries =
+ omni_sources =
+ omni_libadd =
+ endif
+
+ libexec_LTLIBRARIES = \
+ $(FAX_LIB) \
+ $(omni_libraries)
+ noinst_LTLIBRARIES =
+
+ # ?? : BV : added @CPPFLAGS@ to avoid the overwriting of the variable
+ CPPFLAGS = \
+ @CPPFLAGS@ \
+ -DWE_ARE_LIBGNOMEPRINT_UI \
+ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -DBINDIR=\""$(bindir)"\" \
+ -DDATADIR=\""$(datadir)"\"
+
+ INCLUDES = \
+ -I$(top_srcdir) \
+ $(OMNI_CFLAGS) \
+ $(LIBGNOMEPRINT_CFLAGS)
+
diff -crN ./libgnomeprint/libgnomeprint/gnome-fontmap.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/libgnomeprint/gnome-fontmap.h
*** ./libgnomeprint/libgnomeprint/gnome-fontmap.h Sat Feb 15 18:04:36 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/libgnomeprint/gnome-fontmap.h Fri Jul 4 09:11:32 2003
***************
*** 44,50 ****
GP_FONT_ENTRY_UNKNOWN,
GP_FONT_ENTRY_TYPE1,
GP_FONT_ENTRY_TRUETYPE,
! GP_FONT_ENTRY_ALIAS,
} GPFontEntryType;
struct _GPFontMap {
--- 44,50 ----
GP_FONT_ENTRY_UNKNOWN,
GP_FONT_ENTRY_TYPE1,
GP_FONT_ENTRY_TRUETYPE,
! GP_FONT_ENTRY_ALIAS
} GPFontEntryType;
struct _GPFontMap {
diff -crN ./libgnomeprint/libgnomeprint/gnome-pgl.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/libgnomeprint/gnome-pgl.h
*** ./libgnomeprint/libgnomeprint/gnome-pgl.h Wed Jan 8 07:36:16 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/libgnomeprint/gnome-pgl.h Thu Jul 3 15:58:46 2003
***************
*** 48,54 ****
enum {
GNOME_PGL_RENDER_DEFAULT = 0,
! GNOME_PGL_RENDER_EXACT = (1 << 8),
};
/* Constructor */
--- 48,54 ----
enum {
GNOME_PGL_RENDER_DEFAULT = 0,
! GNOME_PGL_RENDER_EXACT = (1 << 8)
};
/* Constructor */
diff -crN ./libgnomeprint/libgnomeprint/gnome-print-meta.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/libgnomeprint/gnome-print-meta.c
*** ./libgnomeprint/libgnomeprint/gnome-print-meta.c Wed Jan 8 07:36:16 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/libgnomeprint/gnome-print-meta.c Thu Jul 3 15:59:17 2003
***************
*** 74,80 ****
GNOME_META_GLYPHLIST,
GNOME_META_COLOR,
GNOME_META_LINE,
! GNOME_META_DASH,
} GnomeMetaType;
typedef enum {
--- 74,80 ----
GNOME_META_GLYPHLIST,
GNOME_META_COLOR,
GNOME_META_LINE,
! GNOME_META_DASH
} GnomeMetaType;
typedef enum {
diff -crN ./libgnomeprint/libgnomeprint/gnome-print-pdf.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/libgnomeprint/gnome-print-pdf.c
*** ./libgnomeprint/libgnomeprint/gnome-print-pdf.c Fri Apr 11 08:36:33 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/libgnomeprint/gnome-print-pdf.c Fri Oct 17 10:01:00 2003
***************
*** 65,77 ****
typedef enum {
PDF_GRAPHIC_MODE_GRAPHICS,
! PDF_GRAPHIC_MODE_TEXT,
} PdfGraphicMode;
typedef enum {
PDF_COLOR_MODE_DEVICEGRAY,
PDF_COLOR_MODE_DEVICERGB,
! PDF_COLOR_MODE_DEVICECMYK,
}PdfColorModes;
typedef enum {
--- 65,77 ----
typedef enum {
PDF_GRAPHIC_MODE_GRAPHICS,
! PDF_GRAPHIC_MODE_TEXT
} PdfGraphicMode;
typedef enum {
PDF_COLOR_MODE_DEVICEGRAY,
PDF_COLOR_MODE_DEVICERGB,
! PDF_COLOR_MODE_DEVICECMYK
}PdfColorModes;
typedef enum {
diff -crN ./libgnomeprint/libgnomeprint/gpa/gpa-node-private.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/libgnomeprint/gpa/gpa-node-private.h
*** ./libgnomeprint/libgnomeprint/gpa/gpa-node-private.h Mon Mar 17 17:58:10 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/libgnomeprint/gpa/gpa-node-private.h Wed Nov 12 17:51:01 2003
***************
*** 44,50 ****
#define GPA_NODE_PARENT(n) (GPA_NODE (n)->parent)
typedef enum {
! NODE_FLAG_LOCKED = 1 << 4, /* Used for options when an option can't change from the default */
} GPANodeFlags;
struct _GPANode {
--- 44,50 ----
#define GPA_NODE_PARENT(n) (GPA_NODE (n)->parent)
typedef enum {
! NODE_FLAG_LOCKED = 1 << 4 /* Used for options when an option can't change from the default */
} GPANodeFlags;
struct _GPANode {
diff -crN ./libgnomeprint/libgnomeprint/gpa/gpa-option.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/libgnomeprint/gpa/gpa-option.h
*** ./libgnomeprint/libgnomeprint/gpa/gpa-option.h Thu Mar 6 20:07:38 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/libgnomeprint/gpa/gpa-option.h Fri Jul 4 09:13:07 2003
***************
*** 55,61 ****
GPA_OPTION_TYPE_LIST,
GPA_OPTION_TYPE_ITEM,
GPA_OPTION_TYPE_STRING,
! GPA_OPTION_TYPE_ROOT,
} GPAOptionType;
struct _GPAOption {
--- 55,61 ----
GPA_OPTION_TYPE_LIST,
GPA_OPTION_TYPE_ITEM,
GPA_OPTION_TYPE_STRING,
! GPA_OPTION_TYPE_ROOT
} GPAOptionType;
struct _GPAOption {
diff -crN ./libgnomeprint/libgnomeprint/gpa/gpa-utils.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/libgnomeprint/gpa/gpa-utils.h
*** ./libgnomeprint/libgnomeprint/gpa/gpa-utils.h Wed Jan 8 07:36:17 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/libgnomeprint/gpa/gpa-utils.h Fri Jul 4 09:12:46 2003
***************
*** 47,55 ****
--- 47,59 ----
void gpa_utils_dump_tree (GPANode *node, gint follow_references);
#ifndef __GNUC__
+ #ifndef __FUNCTION__
#define __FUNCTION__ ""
+ #endif
+ #ifndef __PRETTY_FUNCTION__
#define __PRETTY_FUNCTION__ ""
#endif
+ #endif
#define gpa_return_false_if_fail(expr) G_STMT_START{ \
if (expr) { } else \
diff -crN ./libgnomeprint/libgnomeprint/transports/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/libgnomeprint/transports/Makefile.am
*** ./libgnomeprint/libgnomeprint/transports/Makefile.am Fri Aug 8 17:46:51 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/libgnomeprint/transports/Makefile.am Fri Oct 17 10:01:18 2003
***************
*** 4,10 ****
$(LPR_LIB) \
$(CUSTOM_LIB)
! AM_CPPFLAGS = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
INCLUDES = \
--- 4,10 ----
$(LPR_LIB) \
$(CUSTOM_LIB)
! AM_CPPFLAGS = @CPPFLAGS@\
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
INCLUDES = \
diff -crN ./libgnomeprint/tests/generate.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/tests/generate.c
*** ./libgnomeprint/tests/generate.c Mon Mar 17 17:58:18 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/tests/generate.c Fri Jul 4 08:27:39 2003
***************
*** 36,42 ****
BACKEND_PS,
BACKEND_PDF,
BACKEND_META,
! BACKEND_UNKNOWN,
} BackendType;
static gchar *sequence_str = NULL;
--- 36,42 ----
BACKEND_PS,
BACKEND_PDF,
BACKEND_META,
! BACKEND_UNKNOWN
} BackendType;
static gchar *sequence_str = NULL;
diff -crN ./libgnomeprint/tests/gpa-test.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/tests/gpa-test.c
*** ./libgnomeprint/tests/gpa-test.c Mon Mar 17 17:58:18 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/tests/gpa-test.c Fri Oct 17 10:01:28 2003
***************
*** 70,76 ****
TEST_GPA_ERROR = -2,
TEST_GPA_BAD_PARAMETERS = -1,
TEST_GPA_SUCCESS = 0,
! TEST_GPA_SUCCESS_LAST = 99,
} GpaTestRetval;
typedef struct _GpaTestNum GpaTestNum;
--- 70,76 ----
TEST_GPA_ERROR = -2,
TEST_GPA_BAD_PARAMETERS = -1,
TEST_GPA_SUCCESS = 0,
! TEST_GPA_SUCCESS_LAST = 99
} GpaTestRetval;
typedef struct _GpaTestNum GpaTestNum;
diff -crN ./libgnomeprint/tests/tools/pdfcheck.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/tests/tools/pdfcheck.c
*** ./libgnomeprint/tests/tools/pdfcheck.c Wed Jan 8 07:36:18 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprint/tests/tools/pdfcheck.c Fri Jul 4 08:29:59 2003
***************
*** 392,398 ****
if (strcmp (token, "/Length") == 0) {
g_free (token);
token = my_get_next_token (&in);
! // g_print ("Size %s\n", token);
stream_len = atoi (token);
g_free (token);
token = my_get_next_token (&in);
--- 392,398 ----
if (strcmp (token, "/Length") == 0) {
g_free (token);
token = my_get_next_token (&in);
! /* g_print ("Size %s\n", token); */
stream_len = atoi (token);
g_free (token);
token = my_get_next_token (&in);
***************
*** 404,410 ****
/* steram_len contains the object num */
stream_len = my_get_size_from_object (real_in, stream_len, offsets);
}
! // g_print ("Stream len is %d\n", stream_len);
}
/* We should recurse but i am lazy. Bah */
if (strncmp (token, "<<", 2) == 0) {
--- 404,410 ----
/* steram_len contains the object num */
stream_len = my_get_size_from_object (real_in, stream_len, offsets);
}
! /* g_print ("Stream len is %d\n", stream_len); */
}
/* We should recurse but i am lazy. Bah */
if (strncmp (token, "<<", 2) == 0) {
***************
*** 416,422 ****
token = my_get_next_token (&in);
}
if (token [0] == '[') {
! // g_print ("This is an array! -->%s<--\n", token);
my_parse_array (token, &in);
token = g_strdup ("Dont' crash cause token was freed in parse array");
}
--- 416,422 ----
token = my_get_next_token (&in);
}
if (token [0] == '[') {
! /* g_print ("This is an array! -->%s<--\n", token); */
my_parse_array (token, &in);
token = g_strdup ("Dont' crash cause token was freed in parse array");
}