Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kretzschmar <mkretzschmar@src.gnome.org>2002-09-30 20:48:26 (GMT)
committer Martin Kretzschmar <mkretzschmar@src.gnome.org>2002-09-30 20:48:26 (GMT)
commit4b00949a4ac2bb998bc636338709a3a16e30de57 (patch)
tree3b6495e21c8fd54e34ef12f9fe97ba051cfa515b
parentcb4589332b9121f50118d49053e4a23f4d582423 (diff)
get PDFDoc from GPdfPersistStream, not directly from our embeddable
* xpdf/pdf-view.cc: get PDFDoc from GPdfPersistStream, not directly from our embeddable (various places). * xpdf/Makefile.am: fix gui variable, add gpdf-persist-stream files * xpdf/bonobo-application-x-pdf.cc: include GlobalParams.h, (embeddable_factory): create a GPdfPersistStream first, then create an embeddable. * xpdf/gpdf-embeddable.cc (bed_free_data): move to gpdf-persist-stream.cc as delete_pdf_doc_full (load_pdf_from_stream): move to gpdf-persist-stream.cc (finalize): free priv field (class_init): kill pdf_changed signal, GPdfPersistStream has set_pdf signal, use finalize (gpdf_embeddable_add_interfaces): kill (gpdf_embeddable_construct): take GPdfPersistStream param, use bonobo_object_add_interface not gpdf_embeddable_add_intf (gpdf_embeddable_new): take GPdfPersistStream param * xpdf/gpdf-embeddable.h: remove extern "C" around bonobo includes, they protect themselves. Introduce private struct, still public. Use GPdfPersistStream * xpdf/gpdf-persist-stream.cc, xpdf/gpdf-persist-stream.h: files for new GPdfPersistStream class. Contains PDF loading code * xpdf/BonoboStream.h: hide GList before including gnome headers
-rw-r--r--pdf/xpdf/Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am
index 5b98d0c..549810e 100644
--- a/pdf/xpdf/Makefile.am
+++ b/pdf/xpdf/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = \
$(libpaper_CFLAGS)
if WITH_GNOME
-gui = ""
+gui =
else
gui = xpdf
endif
@@ -111,6 +111,8 @@ bonobo_application_x_pdf_SOURCES = \
gpdf-embeddable.h \
gpdf-embeddable-view.cc \
gpdf-embeddable-view.h \
+ gpdf-persist-stream.cc \
+ gpdf-persist-stream.h \
gpdf-util.h \
gtkgesture.c \
gtkgesture.h \