From 13a06349251874bd35d2f03c3fc93217cee749a2 Mon Sep 17 00:00:00 2001 From: Nickolay V. Shmyrev Date: Mon, 08 Jan 2007 12:25:31 +0000 Subject: Reorganize source tree. 2007-01-08 Nickolay V. Shmyrev * Makefile.am: * backend/Makefile.am: * backend/comics/Makefile.am: * backend/djvu/Makefile.am: * backend/dvi/Makefile.am: * backend/ev-async-renderer.c: * backend/ev-async-renderer.h: * backend/ev-attachment.c: * backend/ev-attachment.h: * backend/ev-backend-marshal.c: * backend/ev-document-factory.c: * backend/ev-document-factory.h: * backend/ev-document-find.c: * backend/ev-document-find.h: * backend/ev-document-fonts.c: * backend/ev-document-fonts.h: * backend/ev-document-images.c: * backend/ev-document-images.h: * backend/ev-document-info.h: * backend/ev-document-links.c: * backend/ev-document-links.h: * backend/ev-document-misc.c: * backend/ev-document-misc.h: * backend/ev-document-security.c: * backend/ev-document-security.h: * backend/ev-document-thumbnails.c: * backend/ev-document-thumbnails.h: * backend/ev-document-transition.c: * backend/ev-document-transition.h: * backend/ev-document.c: * backend/ev-document.h: * backend/ev-file-exporter.c: * backend/ev-file-exporter.h: * backend/ev-image.c: * backend/ev-image.h: * backend/ev-link-action.c: * backend/ev-link-action.h: * backend/ev-link-dest.c: * backend/ev-link-dest.h: * backend/ev-link.c: * backend/ev-link.h: * backend/ev-render-context.c: * backend/ev-render-context.h: * backend/ev-selection.c: * backend/ev-selection.h: * backend/impress/Makefile.am: * backend/pdf/Makefile.am: * backend/pixbuf/Makefile.am: * backend/ps/Makefile.am: * backend/ps/ps-document.c: (push_pixbuf), (interpreter_failed), (ps_document_widget_event), (setup_pixmap), (setup_page), (input), (start_interpreter), (stop_interpreter), (document_load), (ps_document_next_page), (render_page): * backend/tiff/Makefile.am: * comics/Makefile.am: * comics/comics-document.c: * comics/comics-document.h: * configure.ac: * cut-n-paste/zoom-control/ephy-zoom-control.c: * djvu/Makefile.am: * djvu/djvu-document-private.h: * djvu/djvu-document.c: * djvu/djvu-document.h: * djvu/djvu-links.c: * djvu/djvu-links.h: * djvu/djvu-text-page.c: * djvu/djvu-text-page.h: * djvu/djvu-text.c: * djvu/djvu-text.h: * dvi/Makefile.am: * dvi/dvi-document.c: * dvi/dvi-document.h: * dvi/fonts.c: * dvi/fonts.h: * dvi/mdvi-lib/Makefile.am: * dvi/mdvi-lib/afmparse.c: * dvi/mdvi-lib/afmparse.h: * dvi/mdvi-lib/bitmap.c: * dvi/mdvi-lib/bitmap.h: * dvi/mdvi-lib/color.c: * dvi/mdvi-lib/color.h: * dvi/mdvi-lib/common.c: * dvi/mdvi-lib/common.h: * dvi/mdvi-lib/defaults.h: * dvi/mdvi-lib/dvimisc.c: * dvi/mdvi-lib/dviopcodes.h: * dvi/mdvi-lib/dviread.c: * dvi/mdvi-lib/files.c: * dvi/mdvi-lib/font.c: * dvi/mdvi-lib/fontmap.c: * dvi/mdvi-lib/fontmap.h: * dvi/mdvi-lib/fontsrch.c: * dvi/mdvi-lib/gf.c: * dvi/mdvi-lib/hash.c: * dvi/mdvi-lib/hash.h: * dvi/mdvi-lib/list.c: * dvi/mdvi-lib/mdvi.h: * dvi/mdvi-lib/pagesel.c: * dvi/mdvi-lib/paper.c: * dvi/mdvi-lib/paper.h: * dvi/mdvi-lib/pk.c: * dvi/mdvi-lib/private.h: * dvi/mdvi-lib/setup.c: * dvi/mdvi-lib/sp-epsf.c: * dvi/mdvi-lib/special.c: * dvi/mdvi-lib/sysdeps.h: * dvi/mdvi-lib/t1.c: * dvi/mdvi-lib/tfm.c: * dvi/mdvi-lib/tfmfile.c: * dvi/mdvi-lib/tt.c: * dvi/mdvi-lib/util.c: * dvi/mdvi-lib/vf.c: * dvi/pixbuf-device.c: * dvi/pixbuf-device.h: * impress/Makefile.am: * impress/common.h: * impress/document.c: * impress/f_oasis.c: * impress/f_oo13.c: * impress/iksemel.c: * impress/iksemel.h: * impress/imposter.h: * impress/impress-document.c: * impress/impress-document.h: * impress/internal.h: * impress/r_back.c: * impress/r_draw.c: * impress/r_geometry.c: * impress/r_gradient.c: * impress/r_style.c: * impress/r_text.c: * impress/render.c: * impress/render.h: * impress/zip.c: * impress/zip.h: * lib/Makefile.am: * lib/ev-debug.c: * lib/ev-debug.h: * lib/ev-file-helpers.c: * lib/ev-file-helpers.h: * lib/ev-gui.c: * lib/ev-gui.h: * lib/ev-tooltip.c: * lib/ev-tooltip.h: * libdocument/Makefile.am: * libdocument/ev-file-helpers.c: * pdf/Makefile.am: * pdf/ev-poppler.cc: * pdf/ev-poppler.h: * pixbuf/Makefile.am: * pixbuf/pixbuf-document.c: * pixbuf/pixbuf-document.h: * properties/Makefile.am: * ps/Makefile.am: * ps/gsdefaults.c: * ps/gsdefaults.h: * ps/gsio.c: * ps/gsio.h: * ps/gstypes.h: * ps/ps-document.c: * ps/ps-document.h: * ps/ps.c: * ps/ps.h: * shell/Makefile.am: * shell/ev-application.h: * shell/ev-sidebar-links.c: * shell/ev-sidebar-links.h: * shell/ev-utils.c: (ev_gui_sanitise_popup_position), (ev_gui_menu_position_tree_selection): * shell/ev-utils.h: * shell/ev-view.c: (ev_view_finalize): * shell/ev-window.c: * shell/main.c: (main): * thumbnailer/Makefile.am: * tiff/Makefile.am: * tiff/tiff-document.c: * tiff/tiff-document.h: * tiff/tiff2ps.c: * tiff/tiff2ps.h: Reorganize source tree. svn path=/trunk/; revision=2197 --- diff --git a/ChangeLog b/ChangeLog index a960679..599be16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,187 @@ +2007-01-08 Nickolay V. Shmyrev + + * Makefile.am: + * backend/Makefile.am: + * backend/comics/Makefile.am: + * backend/djvu/Makefile.am: + * backend/dvi/Makefile.am: + * backend/ev-async-renderer.c: + * backend/ev-async-renderer.h: + * backend/ev-attachment.c: + * backend/ev-attachment.h: + * backend/ev-backend-marshal.c: + * backend/ev-document-factory.c: + * backend/ev-document-factory.h: + * backend/ev-document-find.c: + * backend/ev-document-find.h: + * backend/ev-document-fonts.c: + * backend/ev-document-fonts.h: + * backend/ev-document-images.c: + * backend/ev-document-images.h: + * backend/ev-document-info.h: + * backend/ev-document-links.c: + * backend/ev-document-links.h: + * backend/ev-document-misc.c: + * backend/ev-document-misc.h: + * backend/ev-document-security.c: + * backend/ev-document-security.h: + * backend/ev-document-thumbnails.c: + * backend/ev-document-thumbnails.h: + * backend/ev-document-transition.c: + * backend/ev-document-transition.h: + * backend/ev-document.c: + * backend/ev-document.h: + * backend/ev-file-exporter.c: + * backend/ev-file-exporter.h: + * backend/ev-image.c: + * backend/ev-image.h: + * backend/ev-link-action.c: + * backend/ev-link-action.h: + * backend/ev-link-dest.c: + * backend/ev-link-dest.h: + * backend/ev-link.c: + * backend/ev-link.h: + * backend/ev-render-context.c: + * backend/ev-render-context.h: + * backend/ev-selection.c: + * backend/ev-selection.h: + * backend/impress/Makefile.am: + * backend/pdf/Makefile.am: + * backend/pixbuf/Makefile.am: + * backend/ps/Makefile.am: + * backend/ps/ps-document.c: (push_pixbuf), (interpreter_failed), + (ps_document_widget_event), (setup_pixmap), (setup_page), (input), + (start_interpreter), (stop_interpreter), (document_load), + (ps_document_next_page), (render_page): + * backend/tiff/Makefile.am: + * comics/Makefile.am: + * comics/comics-document.c: + * comics/comics-document.h: + * configure.ac: + * cut-n-paste/zoom-control/ephy-zoom-control.c: + * djvu/Makefile.am: + * djvu/djvu-document-private.h: + * djvu/djvu-document.c: + * djvu/djvu-document.h: + * djvu/djvu-links.c: + * djvu/djvu-links.h: + * djvu/djvu-text-page.c: + * djvu/djvu-text-page.h: + * djvu/djvu-text.c: + * djvu/djvu-text.h: + * dvi/Makefile.am: + * dvi/dvi-document.c: + * dvi/dvi-document.h: + * dvi/fonts.c: + * dvi/fonts.h: + * dvi/mdvi-lib/Makefile.am: + * dvi/mdvi-lib/afmparse.c: + * dvi/mdvi-lib/afmparse.h: + * dvi/mdvi-lib/bitmap.c: + * dvi/mdvi-lib/bitmap.h: + * dvi/mdvi-lib/color.c: + * dvi/mdvi-lib/color.h: + * dvi/mdvi-lib/common.c: + * dvi/mdvi-lib/common.h: + * dvi/mdvi-lib/defaults.h: + * dvi/mdvi-lib/dvimisc.c: + * dvi/mdvi-lib/dviopcodes.h: + * dvi/mdvi-lib/dviread.c: + * dvi/mdvi-lib/files.c: + * dvi/mdvi-lib/font.c: + * dvi/mdvi-lib/fontmap.c: + * dvi/mdvi-lib/fontmap.h: + * dvi/mdvi-lib/fontsrch.c: + * dvi/mdvi-lib/gf.c: + * dvi/mdvi-lib/hash.c: + * dvi/mdvi-lib/hash.h: + * dvi/mdvi-lib/list.c: + * dvi/mdvi-lib/mdvi.h: + * dvi/mdvi-lib/pagesel.c: + * dvi/mdvi-lib/paper.c: + * dvi/mdvi-lib/paper.h: + * dvi/mdvi-lib/pk.c: + * dvi/mdvi-lib/private.h: + * dvi/mdvi-lib/setup.c: + * dvi/mdvi-lib/sp-epsf.c: + * dvi/mdvi-lib/special.c: + * dvi/mdvi-lib/sysdeps.h: + * dvi/mdvi-lib/t1.c: + * dvi/mdvi-lib/tfm.c: + * dvi/mdvi-lib/tfmfile.c: + * dvi/mdvi-lib/tt.c: + * dvi/mdvi-lib/util.c: + * dvi/mdvi-lib/vf.c: + * dvi/pixbuf-device.c: + * dvi/pixbuf-device.h: + * impress/Makefile.am: + * impress/common.h: + * impress/document.c: + * impress/f_oasis.c: + * impress/f_oo13.c: + * impress/iksemel.c: + * impress/iksemel.h: + * impress/imposter.h: + * impress/impress-document.c: + * impress/impress-document.h: + * impress/internal.h: + * impress/r_back.c: + * impress/r_draw.c: + * impress/r_geometry.c: + * impress/r_gradient.c: + * impress/r_style.c: + * impress/r_text.c: + * impress/render.c: + * impress/render.h: + * impress/zip.c: + * impress/zip.h: + * lib/Makefile.am: + * lib/ev-debug.c: + * lib/ev-debug.h: + * lib/ev-file-helpers.c: + * lib/ev-file-helpers.h: + * lib/ev-gui.c: + * lib/ev-gui.h: + * lib/ev-tooltip.c: + * lib/ev-tooltip.h: + * libdocument/Makefile.am: + * libdocument/ev-file-helpers.c: + * pdf/Makefile.am: + * pdf/ev-poppler.cc: + * pdf/ev-poppler.h: + * pixbuf/Makefile.am: + * pixbuf/pixbuf-document.c: + * pixbuf/pixbuf-document.h: + * properties/Makefile.am: + * ps/Makefile.am: + * ps/gsdefaults.c: + * ps/gsdefaults.h: + * ps/gsio.c: + * ps/gsio.h: + * ps/gstypes.h: + * ps/ps-document.c: + * ps/ps-document.h: + * ps/ps.c: + * ps/ps.h: + * shell/Makefile.am: + * shell/ev-application.h: + * shell/ev-sidebar-links.c: + * shell/ev-sidebar-links.h: + * shell/ev-utils.c: (ev_gui_sanitise_popup_position), + (ev_gui_menu_position_tree_selection): + * shell/ev-utils.h: + * shell/ev-view.c: (ev_view_finalize): + * shell/ev-window.c: + * shell/main.c: (main): + * thumbnailer/Makefile.am: + * tiff/Makefile.am: + * tiff/tiff-document.c: + * tiff/tiff-document.h: + * tiff/tiff2ps.c: + * tiff/tiff2ps.h: + + Reorganize source tree. + 2007-01-08 Carlos Garcia Campos * backend/ev-document-factory.c: diff --git a/Makefile.am b/Makefile.am index 0cd6f59..7d23c68 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,53 +1,17 @@ -SUBDIRS = cut-n-paste po help data test - -# Backends - -if ENABLE_PDF -SUBDIRS += pdf -endif - -if ENABLE_PS -SUBDIRS += ps -endif - -if ENABLE_PIXBUF -SUBDIRS += pixbuf -endif - -if ENABLE_DJVU -SUBDIRS += djvu -endif - -if ENABLE_TIFF -SUBDIRS += tiff -endif - -if ENABLE_DVI -SUBDIRS += dvi -endif - -if ENABLE_COMICS - SUBDIRS += comics -endif - -if ENABLE_IMPRESS - SUBDIRS += impress -endif - -SUBDIRS += backend - -# Library - -SUBDIRS += lib - -# Properties (library and application) - -SUBDIRS += properties +SUBDIRS = \ + cut-n-paste \ + po \ + help \ + data \ + test \ + backend \ + libdocument \ + properties \ + shell \ + thumbnailer # Applications -SUBDIRS += shell thumbnailer - intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in EXTRA_DIST = $(intltool_extra) gnome-doc-utils.make diff --git a/backend/Makefile.am b/backend/Makefile.am index a09734d..f22c2e1 100644 --- a/backend/Makefile.am +++ b/backend/Makefile.am @@ -1,121 +1,35 @@ -INCLUDES= \ - -DEVINCE_UIDIR=\"$(pkgdatadir)\" \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/pdf \ - -I$(top_srcdir)/pixbuf \ - -I$(top_srcdir)/tiff \ - -I$(top_srcdir)/ps \ - -I$(top_srcdir)/djvu \ - -I$(top_srcdir)/dvi \ - -I$(top_srcdir)/impress \ - -I$(top_srcdir)/comics \ - $(BACKEND_CFLAGS) \ - $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED) +SUBDIRS = -noinst_LTLIBRARIES = libevbackend.la - -libevbackend_la_SOURCES= \ - ev-async-renderer.c \ - ev-async-renderer.h \ - ev-attachment.c \ - ev-attachment.h \ - ev-backend-marshal.c \ - ev-link.c \ - ev-link.h \ - ev-link-action.c \ - ev-link-action.h \ - ev-link-dest.c \ - ev-link-dest.h \ - ev-image.c \ - ev-image.h \ - ev-document.c \ - ev-document.h \ - ev-document-factory.c \ - ev-document-factory.h \ - ev-document-thumbnails.c \ - ev-document-thumbnails.h \ - ev-document-fonts.c \ - ev-document-fonts.h \ - ev-document-links.c \ - ev-document-links.h \ - ev-document-images.c \ - ev-document-images.h \ - ev-document-security.c \ - ev-document-security.h \ - ev-document-find.c \ - ev-document-find.h \ - ev-document-info.h \ - ev-document-transition.h \ - ev-document-transition.c \ - ev-file-exporter.c \ - ev-file-exporter.h \ - ev-render-context.h \ - ev-render-context.c \ - ev-selection.h \ - ev-selection.c \ - ev-document-misc.h \ - ev-document-misc.c - -libevbackend_la_LIBADD = +# Backends if ENABLE_PDF -libevbackend_la_LIBADD += \ - $(top_builddir)/pdf/libpdfdocument.la +SUBDIRS += pdf endif -if ENABLE_PS -libevbackend_la_LIBADD += \ - $(top_builddir)/ps/libpsdocument.la +if ENABLE_PS +SUBDIRS += ps endif if ENABLE_PIXBUF -libevbackend_la_LIBADD += \ - $(top_builddir)/pixbuf/libpixbufdocument.la +SUBDIRS += pixbuf endif if ENABLE_DJVU -libevbackend_la_LIBADD += \ - $(top_builddir)/djvu/libgtkdjvu.la +SUBDIRS += djvu endif if ENABLE_TIFF -libevbackend_la_LIBADD += \ - $(top_builddir)/tiff/libtiffdocument.la +SUBDIRS += tiff endif if ENABLE_DVI -libevbackend_la_LIBADD += \ - $(top_builddir)/dvi/libgtkdvi.la +SUBDIRS += dvi endif if ENABLE_COMICS -libevbackend_la_LIBADD += \ - $(top_builddir)/comics/libcomicsdocument.la + SUBDIRS += comics endif if ENABLE_IMPRESS -libevbackend_la_LIBADD += \ - $(top_builddir)/impress/libimpressdocument.la + SUBDIRS += impress endif - -BUILT_SOURCES= \ - ev-backend-marshalers.h \ - ev-backend-marshalers.c - -CLEANFILES = $(BUILT_SOURCES) - -ev-backend-marshalers.h: ev-backend-marshalers.list - $(GLIB_GENMARSHAL) --prefix=_ev_backend_marshal $(srcdir)/ev-backend-marshalers.list --header > $@ - -ev-backend-marshalers.c: ev-backend-marshalers.list - $(GLIB_GENMARSHAL) --prefix=_ev_backend_marshal $(srcdir)/ev-backend-marshalers.list --body > $@ - -ev-backend-marshal.c: ev-backend-marshalers.h ev-backend-marshalers.c - -noinst_HEADERS = \ - ev-backend-marshalers.h - -EXTRA_DIST= \ - ev-backend-marshalers.list diff --git a/comics/Makefile.am b/backend/comics/Makefile.am index bf11eb8..8c12139 100644 --- a/comics/Makefile.am +++ b/backend/comics/Makefile.am @@ -1,7 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ - -I$(top_srcdir)/backend \ - -I$(top_srcdir)/lib \ + -I$(top_srcdir)/libdocument \ $(LIB_CFLAGS) noinst_LTLIBRARIES = libcomicsdocument.la diff --git a/comics/comics-document.c b/backend/comics/comics-document.c index 7f53f85..7f53f85 100644 --- a/comics/comics-document.c +++ b/backend/comics/comics-document.c diff --git a/comics/comics-document.h b/backend/comics/comics-document.h index cd5b17b..cd5b17b 100644 --- a/comics/comics-document.h +++ b/backend/comics/comics-document.h diff --git a/djvu/Makefile.am b/backend/djvu/Makefile.am index 62b76a5..fa44bbb 100644 --- a/djvu/Makefile.am +++ b/backend/djvu/Makefile.am @@ -1,7 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ - -I$(top_srcdir)/backend \ - -I$(top_srcdir)/lib \ + -I$(top_srcdir)/libdocument \ -DGNOMEICONDIR=\""${prefix}/${DATADIRNAME}/pixmaps"\" \ $(LIB_CFLAGS) \ $(DJVU_CFLAGS) diff --git a/djvu/djvu-document-private.h b/backend/djvu/djvu-document-private.h index 3fa579f..3fa579f 100644 --- a/djvu/djvu-document-private.h +++ b/backend/djvu/djvu-document-private.h diff --git a/djvu/djvu-document.c b/backend/djvu/djvu-document.c index ad18555..ad18555 100644 --- a/djvu/djvu-document.c +++ b/backend/djvu/djvu-document.c diff --git a/djvu/djvu-document.h b/backend/djvu/djvu-document.h index 402f476..402f476 100644 --- a/djvu/djvu-document.h +++ b/backend/djvu/djvu-document.h diff --git a/djvu/djvu-links.c b/backend/djvu/djvu-links.c index 38fad0d..38fad0d 100644 --- a/djvu/djvu-links.c +++ b/backend/djvu/djvu-links.c diff --git a/djvu/djvu-links.h b/backend/djvu/djvu-links.h index fdbfdeb..fdbfdeb 100644 --- a/djvu/djvu-links.h +++ b/backend/djvu/djvu-links.h diff --git a/djvu/djvu-text-page.c b/backend/djvu/djvu-text-page.c index c19d6f6..c19d6f6 100644 --- a/djvu/djvu-text-page.c +++ b/backend/djvu/djvu-text-page.c diff --git a/djvu/djvu-text-page.h b/backend/djvu/djvu-text-page.h index db53326..db53326 100644 --- a/djvu/djvu-text-page.h +++ b/backend/djvu/djvu-text-page.h diff --git a/djvu/djvu-text.c b/backend/djvu/djvu-text.c index beaac6b..beaac6b 100644 --- a/djvu/djvu-text.c +++ b/backend/djvu/djvu-text.c diff --git a/djvu/djvu-text.h b/backend/djvu/djvu-text.h index 0f99643..0f99643 100644 --- a/djvu/djvu-text.h +++ b/backend/djvu/djvu-text.h diff --git a/dvi/Makefile.am b/backend/dvi/Makefile.am index 169ef13..f23a34b 100644 --- a/dvi/Makefile.am +++ b/backend/dvi/Makefile.am @@ -1,9 +1,8 @@ SUBDIRS = mdvi-lib INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/backend \ - -I$(top_srcdir)/lib \ + -I$(top_srcdir) \ + -I$(top_srcdir)/libdocument \ -I$(srcdir)/mdvi-lib \ $(LIB_CFLAGS) diff --git a/dvi/dvi-document.c b/backend/dvi/dvi-document.c index 4de5e64..4de5e64 100644 --- a/dvi/dvi-document.c +++ b/backend/dvi/dvi-document.c diff --git a/dvi/dvi-document.h b/backend/dvi/dvi-document.h index d92d474..d92d474 100644 --- a/dvi/dvi-document.h +++ b/backend/dvi/dvi-document.h diff --git a/dvi/fonts.c b/backend/dvi/fonts.c index 99be63c..99be63c 100644 --- a/dvi/fonts.c +++ b/backend/dvi/fonts.c diff --git a/dvi/fonts.h b/backend/dvi/fonts.h index e55a8dd..e55a8dd 100644 --- a/dvi/fonts.h +++ b/backend/dvi/fonts.h diff --git a/dvi/mdvi-lib/Makefile.am b/backend/dvi/mdvi-lib/Makefile.am index 73417e1..73417e1 100644 --- a/dvi/mdvi-lib/Makefile.am +++ b/backend/dvi/mdvi-lib/Makefile.am diff --git a/dvi/mdvi-lib/afmparse.c b/backend/dvi/mdvi-lib/afmparse.c index 5b8ac68..5b8ac68 100644 --- a/dvi/mdvi-lib/afmparse.c +++ b/backend/dvi/mdvi-lib/afmparse.c diff --git a/dvi/mdvi-lib/afmparse.h b/backend/dvi/mdvi-lib/afmparse.h index 6cce780..6cce780 100644 --- a/dvi/mdvi-lib/afmparse.h +++ b/backend/dvi/mdvi-lib/afmparse.h diff --git a/dvi/mdvi-lib/bitmap.c b/backend/dvi/mdvi-lib/bitmap.c index 9014dba..9014dba 100644 --- a/dvi/mdvi-lib/bitmap.c +++ b/backend/dvi/mdvi-lib/bitmap.c diff --git a/dvi/mdvi-lib/bitmap.h b/backend/dvi/mdvi-lib/bitmap.h index 4d5f23a..4d5f23a 100644 --- a/dvi/mdvi-lib/bitmap.h +++ b/backend/dvi/mdvi-lib/bitmap.h diff --git a/dvi/mdvi-lib/color.c b/backend/dvi/mdvi-lib/color.c index 366b0ea..366b0ea 100644 --- a/dvi/mdvi-lib/color.c +++ b/backend/dvi/mdvi-lib/color.c diff --git a/dvi/mdvi-lib/color.h b/backend/dvi/mdvi-lib/color.h index 363776e..363776e 100644 --- a/dvi/mdvi-lib/color.h +++ b/backend/dvi/mdvi-lib/color.h diff --git a/dvi/mdvi-lib/common.c b/backend/dvi/mdvi-lib/common.c index 7006682..7006682 100644 --- a/dvi/mdvi-lib/common.c +++ b/backend/dvi/mdvi-lib/common.c diff --git a/dvi/mdvi-lib/common.h b/backend/dvi/mdvi-lib/common.h index fe4d6f7..fe4d6f7 100644 --- a/dvi/mdvi-lib/common.h +++ b/backend/dvi/mdvi-lib/common.h diff --git a/dvi/mdvi-lib/defaults.h b/backend/dvi/mdvi-lib/defaults.h index 46ce6ce..46ce6ce 100644 --- a/dvi/mdvi-lib/defaults.h +++ b/backend/dvi/mdvi-lib/defaults.h diff --git a/dvi/mdvi-lib/dvimisc.c b/backend/dvi/mdvi-lib/dvimisc.c index 06250ca..06250ca 100644 --- a/dvi/mdvi-lib/dvimisc.c +++ b/backend/dvi/mdvi-lib/dvimisc.c diff --git a/dvi/mdvi-lib/dviopcodes.h b/backend/dvi/mdvi-lib/dviopcodes.h index f99af05..f99af05 100644 --- a/dvi/mdvi-lib/dviopcodes.h +++ b/backend/dvi/mdvi-lib/dviopcodes.h diff --git a/dvi/mdvi-lib/dviread.c b/backend/dvi/mdvi-lib/dviread.c index 8398c27..8398c27 100644 --- a/dvi/mdvi-lib/dviread.c +++ b/backend/dvi/mdvi-lib/dviread.c diff --git a/dvi/mdvi-lib/files.c b/backend/dvi/mdvi-lib/files.c index 0ed893b..0ed893b 100644 --- a/dvi/mdvi-lib/files.c +++ b/backend/dvi/mdvi-lib/files.c diff --git a/dvi/mdvi-lib/font.c b/backend/dvi/mdvi-lib/font.c index fedb7e7..fedb7e7 100644 --- a/dvi/mdvi-lib/font.c +++ b/backend/dvi/mdvi-lib/font.c diff --git a/dvi/mdvi-lib/fontmap.c b/backend/dvi/mdvi-lib/fontmap.c index cc61064..cc61064 100644 --- a/dvi/mdvi-lib/fontmap.c +++ b/backend/dvi/mdvi-lib/fontmap.c diff --git a/dvi/mdvi-lib/fontmap.h b/backend/dvi/mdvi-lib/fontmap.h index 0a901ec..0a901ec 100644 --- a/dvi/mdvi-lib/fontmap.h +++ b/backend/dvi/mdvi-lib/fontmap.h diff --git a/dvi/mdvi-lib/fontsrch.c b/backend/dvi/mdvi-lib/fontsrch.c index 415ed91..415ed91 100644 --- a/dvi/mdvi-lib/fontsrch.c +++ b/backend/dvi/mdvi-lib/fontsrch.c diff --git a/dvi/mdvi-lib/gf.c b/backend/dvi/mdvi-lib/gf.c index 2c147ec..2c147ec 100644 --- a/dvi/mdvi-lib/gf.c +++ b/backend/dvi/mdvi-lib/gf.c diff --git a/dvi/mdvi-lib/hash.c b/backend/dvi/mdvi-lib/hash.c index d030650..d030650 100644 --- a/dvi/mdvi-lib/hash.c +++ b/backend/dvi/mdvi-lib/hash.c diff --git a/dvi/mdvi-lib/hash.h b/backend/dvi/mdvi-lib/hash.h index b10afd6..b10afd6 100644 --- a/dvi/mdvi-lib/hash.h +++ b/backend/dvi/mdvi-lib/hash.h diff --git a/dvi/mdvi-lib/list.c b/backend/dvi/mdvi-lib/list.c index c434e2b..c434e2b 100644 --- a/dvi/mdvi-lib/list.c +++ b/backend/dvi/mdvi-lib/list.c diff --git a/dvi/mdvi-lib/mdvi.h b/backend/dvi/mdvi-lib/mdvi.h index 961689a..961689a 100644 --- a/dvi/mdvi-lib/mdvi.h +++ b/backend/dvi/mdvi-lib/mdvi.h diff --git a/dvi/mdvi-lib/pagesel.c b/backend/dvi/mdvi-lib/pagesel.c index b24157c..b24157c 100644 --- a/dvi/mdvi-lib/pagesel.c +++ b/backend/dvi/mdvi-lib/pagesel.c diff --git a/dvi/mdvi-lib/paper.c b/backend/dvi/mdvi-lib/paper.c index 7a7412d..7a7412d 100644 --- a/dvi/mdvi-lib/paper.c +++ b/backend/dvi/mdvi-lib/paper.c diff --git a/dvi/mdvi-lib/paper.h b/backend/dvi/mdvi-lib/paper.h index d42ee07..d42ee07 100644 --- a/dvi/mdvi-lib/paper.h +++ b/backend/dvi/mdvi-lib/paper.h diff --git a/dvi/mdvi-lib/pk.c b/backend/dvi/mdvi-lib/pk.c index 48da008..48da008 100644 --- a/dvi/mdvi-lib/pk.c +++ b/backend/dvi/mdvi-lib/pk.c diff --git a/dvi/mdvi-lib/private.h b/backend/dvi/mdvi-lib/private.h index c547cd2..c547cd2 100644 --- a/dvi/mdvi-lib/private.h +++ b/backend/dvi/mdvi-lib/private.h diff --git a/dvi/mdvi-lib/setup.c b/backend/dvi/mdvi-lib/setup.c index dea26e6..dea26e6 100644 --- a/dvi/mdvi-lib/setup.c +++ b/backend/dvi/mdvi-lib/setup.c diff --git a/dvi/mdvi-lib/sp-epsf.c b/backend/dvi/mdvi-lib/sp-epsf.c index ca13c86..ca13c86 100644 --- a/dvi/mdvi-lib/sp-epsf.c +++ b/backend/dvi/mdvi-lib/sp-epsf.c diff --git a/dvi/mdvi-lib/special.c b/backend/dvi/mdvi-lib/special.c index 23c070e..23c070e 100644 --- a/dvi/mdvi-lib/special.c +++ b/backend/dvi/mdvi-lib/special.c diff --git a/dvi/mdvi-lib/sysdeps.h b/backend/dvi/mdvi-lib/sysdeps.h index 8f89178..8f89178 100644 --- a/dvi/mdvi-lib/sysdeps.h +++ b/backend/dvi/mdvi-lib/sysdeps.h diff --git a/dvi/mdvi-lib/t1.c b/backend/dvi/mdvi-lib/t1.c index acbfa23..acbfa23 100644 --- a/dvi/mdvi-lib/t1.c +++ b/backend/dvi/mdvi-lib/t1.c diff --git a/dvi/mdvi-lib/tfm.c b/backend/dvi/mdvi-lib/tfm.c index 3779c6b..3779c6b 100644 --- a/dvi/mdvi-lib/tfm.c +++ b/backend/dvi/mdvi-lib/tfm.c diff --git a/dvi/mdvi-lib/tfmfile.c b/backend/dvi/mdvi-lib/tfmfile.c index 1ea1b13..1ea1b13 100644 --- a/dvi/mdvi-lib/tfmfile.c +++ b/backend/dvi/mdvi-lib/tfmfile.c diff --git a/dvi/mdvi-lib/tt.c b/backend/dvi/mdvi-lib/tt.c index 2e69940..2e69940 100644 --- a/dvi/mdvi-lib/tt.c +++ b/backend/dvi/mdvi-lib/tt.c diff --git a/dvi/mdvi-lib/util.c b/backend/dvi/mdvi-lib/util.c index c1cc649..c1cc649 100644 --- a/dvi/mdvi-lib/util.c +++ b/backend/dvi/mdvi-lib/util.c diff --git a/dvi/mdvi-lib/vf.c b/backend/dvi/mdvi-lib/vf.c index e1397fd..e1397fd 100644 --- a/dvi/mdvi-lib/vf.c +++ b/backend/dvi/mdvi-lib/vf.c diff --git a/dvi/pixbuf-device.c b/backend/dvi/pixbuf-device.c index 1ef4365..1ef4365 100644 --- a/dvi/pixbuf-device.c +++ b/backend/dvi/pixbuf-device.c diff --git a/dvi/pixbuf-device.h b/backend/dvi/pixbuf-device.h index bacae4b..bacae4b 100644 --- a/dvi/pixbuf-device.h +++ b/backend/dvi/pixbuf-device.h diff --git a/impress/Makefile.am b/backend/impress/Makefile.am index 3740855..526839b 100644 --- a/impress/Makefile.am +++ b/backend/impress/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ - -I$(top_srcdir)/backend \ + -I$(top_srcdir)/libdocument \ $(SHELL_CFLAGS) \ -DDATADIR=\""$(datadir)"\" diff --git a/impress/common.h b/backend/impress/common.h index 73e4ac1..73e4ac1 100644 --- a/impress/common.h +++ b/backend/impress/common.h diff --git a/impress/document.c b/backend/impress/document.c index 8ecbfae..8ecbfae 100644 --- a/impress/document.c +++ b/backend/impress/document.c diff --git a/impress/f_oasis.c b/backend/impress/f_oasis.c index 193cef8..193cef8 100644 --- a/impress/f_oasis.c +++ b/backend/impress/f_oasis.c diff --git a/impress/f_oo13.c b/backend/impress/f_oo13.c index ce84132..ce84132 100644 --- a/impress/f_oo13.c +++ b/backend/impress/f_oo13.c diff --git a/impress/iksemel.c b/backend/impress/iksemel.c index 6d24d43..6d24d43 100644 --- a/impress/iksemel.c +++ b/backend/impress/iksemel.c diff --git a/impress/iksemel.h b/backend/impress/iksemel.h index 66c87d6..66c87d6 100644 --- a/impress/iksemel.h +++ b/backend/impress/iksemel.h diff --git a/impress/imposter.h b/backend/impress/imposter.h index 50c87f2..50c87f2 100644 --- a/impress/imposter.h +++ b/backend/impress/imposter.h diff --git a/impress/impress-document.c b/backend/impress/impress-document.c index 3ea993d..3ea993d 100644 --- a/impress/impress-document.c +++ b/backend/impress/impress-document.c diff --git a/impress/impress-document.h b/backend/impress/impress-document.h index 7698e98..7698e98 100644 --- a/impress/impress-document.h +++ b/backend/impress/impress-document.h diff --git a/impress/internal.h b/backend/impress/internal.h index eb99c3e..eb99c3e 100644 --- a/impress/internal.h +++ b/backend/impress/internal.h diff --git a/impress/r_back.c b/backend/impress/r_back.c index 29a30bb..29a30bb 100644 --- a/impress/r_back.c +++ b/backend/impress/r_back.c diff --git a/impress/r_draw.c b/backend/impress/r_draw.c index 746afbd..746afbd 100644 --- a/impress/r_draw.c +++ b/backend/impress/r_draw.c diff --git a/impress/r_geometry.c b/backend/impress/r_geometry.c index 6662de6..6662de6 100644 --- a/impress/r_geometry.c +++ b/backend/impress/r_geometry.c diff --git a/impress/r_gradient.c b/backend/impress/r_gradient.c index f6b9af2..f6b9af2 100644 --- a/impress/r_gradient.c +++ b/backend/impress/r_gradient.c diff --git a/impress/r_style.c b/backend/impress/r_style.c index 570c000..570c000 100644 --- a/impress/r_style.c +++ b/backend/impress/r_style.c diff --git a/impress/r_text.c b/backend/impress/r_text.c index e08fd15..e08fd15 100644 --- a/impress/r_text.c +++ b/backend/impress/r_text.c diff --git a/impress/render.c b/backend/impress/render.c index 0338600..0338600 100644 --- a/impress/render.c +++ b/backend/impress/render.c diff --git a/impress/render.h b/backend/impress/render.h index 64c994c..64c994c 100644 --- a/impress/render.h +++ b/backend/impress/render.h diff --git a/impress/zip.c b/backend/impress/zip.c index 4b179b5..4b179b5 100644 --- a/impress/zip.c +++ b/backend/impress/zip.c diff --git a/impress/zip.h b/backend/impress/zip.h index 23ff363..23ff363 100644 --- a/impress/zip.h +++ b/backend/impress/zip.h diff --git a/pdf/Makefile.am b/backend/pdf/Makefile.am index bd3522f..38d0831 100644 --- a/pdf/Makefile.am +++ b/backend/pdf/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ - -I$(top_srcdir)/backend \ + -I$(top_srcdir)/libdocument \ $(BACKEND_CFLAGS) \ $(POPPLER_CFLAGS) \ $(WARN_CXXFLAGS) \ diff --git a/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc index 2068998..2068998 100644 --- a/pdf/ev-poppler.cc +++ b/backend/pdf/ev-poppler.cc diff --git a/pdf/ev-poppler.h b/backend/pdf/ev-poppler.h index 8cc65d1..8cc65d1 100644 --- a/pdf/ev-poppler.h +++ b/backend/pdf/ev-poppler.h diff --git a/pixbuf/Makefile.am b/backend/pixbuf/Makefile.am index 11cc42a..b81e1c8 100644 --- a/pixbuf/Makefile.am +++ b/backend/pixbuf/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ - -I$(top_srcdir)/backend \ + -I$(top_srcdir)/libdocument \ $(BACKEND_CFLAGS) noinst_LTLIBRARIES = libpixbufdocument.la diff --git a/pixbuf/pixbuf-document.c b/backend/pixbuf/pixbuf-document.c index e3d064d..e3d064d 100644 --- a/pixbuf/pixbuf-document.c +++ b/backend/pixbuf/pixbuf-document.c diff --git a/pixbuf/pixbuf-document.h b/backend/pixbuf/pixbuf-document.h index bddf94a..bddf94a 100644 --- a/pixbuf/pixbuf-document.h +++ b/backend/pixbuf/pixbuf-document.h diff --git a/ps/Makefile.am b/backend/ps/Makefile.am index a9f25f9..499eee3 100644 --- a/ps/Makefile.am +++ b/backend/ps/Makefile.am @@ -1,7 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ - -I$(top_srcdir)/backend \ - -I$(top_srcdir)/lib \ + -I$(top_srcdir)/libdocument \ $(BACKEND_CFLAGS) \ $(WARN_CFLAGS) diff --git a/ps/gsdefaults.c b/backend/ps/gsdefaults.c index 2263fca..2263fca 100644 --- a/ps/gsdefaults.c +++ b/backend/ps/gsdefaults.c diff --git a/ps/gsdefaults.h b/backend/ps/gsdefaults.h index 2f50f6f..2f50f6f 100644 --- a/ps/gsdefaults.h +++ b/backend/ps/gsdefaults.h diff --git a/ps/gsio.c b/backend/ps/gsio.c index 15c7f38..15c7f38 100644 --- a/ps/gsio.c +++ b/backend/ps/gsio.c diff --git a/ps/gsio.h b/backend/ps/gsio.h index 3f83cb0..3f83cb0 100644 --- a/ps/gsio.h +++ b/backend/ps/gsio.h diff --git a/ps/gstypes.h b/backend/ps/gstypes.h index f1f5cb2..f1f5cb2 100644 --- a/ps/gstypes.h +++ b/backend/ps/gstypes.h diff --git a/ps/ps-document.c b/backend/ps/ps-document.c index 1500b7b..ee5d449 100644 --- a/ps/ps-document.c +++ b/backend/ps/ps-document.c @@ -44,7 +44,6 @@ #include #include "ps-document.h" -#include "ev-debug.h" #include "gsdefaults.h" #include "ev-file-exporter.h" #include "ev-async-renderer.h" @@ -216,11 +215,9 @@ push_pixbuf (PSDocument *gs) cmap = gdk_window_get_colormap (gs->pstarget); gdk_drawable_get_size (gs->bpixmap, &width, &height); - LOG ("Get from drawable\n"); pixbuf = gdk_pixbuf_get_from_drawable (NULL, gs->bpixmap, cmap, 0, 0, 0, 0, width, height); - LOG ("Get from drawable done\n"); g_signal_emit_by_name (gs, "render_finished", pixbuf); g_object_unref (pixbuf); } @@ -228,8 +225,6 @@ push_pixbuf (PSDocument *gs) static void interpreter_failed (PSDocument *gs, char *msg) { - LOG ("Interpreter failed %s", msg); - push_pixbuf (gs); stop_interpreter (gs); @@ -246,11 +241,9 @@ ps_document_widget_event (GtkWidget *widget, GdkEvent *event, gpointer data) gs->message_window = event->client.data.l[0]; if (event->client.message_type == gs_class->page_atom) { - LOG ("GS rendered the document"); gs->busy = FALSE; push_pixbuf (gs); - LOG ("Pixbuf pushed"); } return TRUE; @@ -329,7 +322,6 @@ setup_pixmap (PSDocument *gs, int page, double scale, int rotation) } if (!gs->bpixmap) { - LOG ("Create pixmap"); fill = gdk_gc_new (gs->pstarget); colormap = gdk_drawable_get_colormap (gs->pstarget); @@ -438,8 +430,6 @@ setup_page (PSDocument *gs, int page, double scale, int rotation) char scaled_dpi[G_ASCII_DTOSTR_BUF_SIZE]; int urx, ury, llx, lly; - LOG ("Setup the page"); - get_page_box (gs, page, &urx, &ury, &llx, &lly); g_ascii_dtostr (scaled_dpi, G_ASCII_DTOSTR_BUF_SIZE, 72.0 * scale); @@ -447,7 +437,6 @@ setup_page (PSDocument *gs, int page, double scale, int rotation) 0L, rotation, llx, lly, urx, ury, scaled_dpi, scaled_dpi, 0, 0, 0, 0); - LOG ("GS property %s", buf); gdk_property_change (gs->pstarget, gs_class->gs_atom, gs_class->string_atom, 8, GDK_PROP_MODE_REPLACE, (guchar *)buf, strlen(buf)); @@ -532,8 +521,6 @@ input(gpointer data, gint source, GdkInputCondition condition) void (*oldsig) (int); oldsig = signal(SIGPIPE, catchPipe); - LOG ("Input"); - do { if (gs->buffer_bytes_left == 0) { /* Get a new section if required */ @@ -613,8 +600,6 @@ start_interpreter (PSDocument *gs) char **gv_env_vars = NULL; int argc = 0, i; - LOG ("Start the interpreter"); - if(!gs->gs_filename) return 0; @@ -670,7 +655,6 @@ start_interpreter (PSDocument *gs) gdk_x11_drawable_get_xid (gs->pstarget), gdk_x11_drawable_get_xid (gs->bpixmap), gdk_display_get_name (gdk_drawable_get_display (gs->pstarget))); - LOG ("Launching ghostview with env %s", gv_env); gs->interpreter_pid = fork (); switch (gs->interpreter_pid) { @@ -758,7 +742,6 @@ stop_interpreter(PSDocument * gs) { if (gs->interpreter_pid > 0) { int status = 0; - LOG ("Stop the interpreter"); kill (gs->interpreter_pid, SIGTERM); while ((wait(&status) == -1) && (errno == EINTR)); gs->interpreter_pid = -1; @@ -923,8 +906,6 @@ document_load (PSDocument *gs, const gchar *fname) { g_return_val_if_fail (PS_IS_DOCUMENT(gs), FALSE); - LOG ("Load the document"); - if (fname == NULL) { gs->gs_status = ""; return FALSE; @@ -987,8 +968,6 @@ ps_document_next_page (PSDocument *gs) GdkDisplay *display; Display *dpy; - LOG ("Make ghostscript render next page"); - g_return_val_if_fail (PS_IS_DOCUMENT(gs), FALSE); g_return_val_if_fail (gs->interpreter_pid != 0, FALSE); g_return_val_if_fail (gs->busy != TRUE, FALSE); @@ -1026,7 +1005,6 @@ render_page (PSDocument *gs, int page) } if (gs->structured_doc && gs->doc) { - LOG ("It's a structured document, let's send one page to gs"); if (is_interpreter_ready (gs)) { ps_document_next_page (gs); @@ -1049,8 +1027,6 @@ render_page (PSDocument *gs, int page) * case, ggv restarts GS again and the first page is displayed. */ - LOG ("It's an unstructured document, gs will just read the file"); - if (!is_interpreter_ready (gs)) { ps_document_enable_interpreter(gs); } diff --git a/ps/ps-document.h b/backend/ps/ps-document.h index c8d19db..c8d19db 100644 --- a/ps/ps-document.h +++ b/backend/ps/ps-document.h diff --git a/ps/ps.c b/backend/ps/ps.c index b4b54e0..b4b54e0 100644 --- a/ps/ps.c +++ b/backend/ps/ps.c diff --git a/ps/ps.h b/backend/ps/ps.h index 5e27618..5e27618 100644 --- a/ps/ps.h +++ b/backend/ps/ps.h diff --git a/tiff/Makefile.am b/backend/tiff/Makefile.am index d8652ad..f89e9d9 100644 --- a/tiff/Makefile.am +++ b/backend/tiff/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ - -I$(top_srcdir)/backend \ + -I$(top_srcdir)/libdocument \ $(BACKEND_CFLAGS) noinst_LTLIBRARIES = libtiffdocument.la diff --git a/tiff/tiff-document.c b/backend/tiff/tiff-document.c index 24af05f..24af05f 100644 --- a/tiff/tiff-document.c +++ b/backend/tiff/tiff-document.c diff --git a/tiff/tiff-document.h b/backend/tiff/tiff-document.h index bdf0e29..bdf0e29 100644 --- a/tiff/tiff-document.h +++ b/backend/tiff/tiff-document.h diff --git a/tiff/tiff2ps.c b/backend/tiff/tiff2ps.c index 632169b..632169b 100644 --- a/tiff/tiff2ps.c +++ b/backend/tiff/tiff2ps.c diff --git a/tiff/tiff2ps.h b/backend/tiff/tiff2ps.h index 1944aac..1944aac 100644 --- a/tiff/tiff2ps.h +++ b/backend/tiff/tiff2ps.h diff --git a/configure.ac b/configure.ac index aa7fd7d..8a21c50 100644 --- a/configure.ac +++ b/configure.ac @@ -409,7 +409,15 @@ AC_SUBST(EVINCE_MIME_TYPES) AC_CONFIG_FILES([ backend/Makefile -comics/Makefile +backend/comics/Makefile +backend/djvu/Makefile +backend/dvi/Makefile +backend/dvi/mdvi-lib/Makefile +backend/impress/Makefile +backend/pdf/Makefile +backend/pixbuf/Makefile +backend/ps/Makefile +backend/tiff/Makefile cut-n-paste/Makefile cut-n-paste/recent-files/Makefile cut-n-paste/toolbar-editor/Makefile @@ -423,22 +431,14 @@ data/icons/48x48/Makefile data/icons/Makefile data/icons/scalable/Makefile data/Makefile -djvu/Makefile -dvi/Makefile -dvi/mdvi-lib/Makefile help/Makefile -impress/Makefile -lib/Makefile +libdocument/Makefile Makefile -pdf/Makefile -pixbuf/Makefile po/Makefile.in properties/Makefile -ps/Makefile shell/Makefile test/Makefile thumbnailer/Makefile -tiff/Makefile ]) AC_OUTPUT diff --git a/cut-n-paste/zoom-control/ephy-zoom-control.c b/cut-n-paste/zoom-control/ephy-zoom-control.c index 79076ab..ada61f2 100644 --- a/cut-n-paste/zoom-control/ephy-zoom-control.c +++ b/cut-n-paste/zoom-control/ephy-zoom-control.c @@ -24,7 +24,6 @@ #include "ephy-zoom-control.h" #include "ephy-zoom.h" -#include "ev-debug.h" #include #include diff --git a/lib/Makefile.am b/lib/Makefile.am deleted file mode 100644 index ef5ac4b..0000000 --- a/lib/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDES = \ - $(LIB_CFLAGS) \ - $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED) - -noinst_LTLIBRARIES = libev.la - -libev_la_SOURCES = \ - ev-debug.c \ - ev-debug.h \ - ev-file-helpers.c \ - ev-file-helpers.h \ - ev-gui.c \ - ev-gui.h \ - ev-tooltip.c \ - ev-tooltip.h - -libev_la_LIBADD = \ - $(top_builddir)/backend/libevbackend.la diff --git a/lib/ev-debug.c b/lib/ev-debug.c deleted file mode 100644 index 0173a7d..0000000 --- a/lib/ev-debug.c +++ /dev/null @@ -1,245 +0,0 @@ -/* - * Copyright (C) 2003 Marco Pesenti Gritti - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - */ - -#include "config.h" - -#include "ev-debug.h" - -#ifndef DISABLE_PROFILING - -#include -#include -#include -#include -#include -#ifdef HAVE_EXECINFO_H -#include -#endif - -static GHashTable *ev_profilers_hash = NULL; -static const char *ev_profile_modules = NULL; -static const char *ev_debug_break = NULL; - -#endif - -#ifndef DISABLE_LOGGING - -static const char *ev_log_modules; - -static void -log_module (const gchar *log_domain, - GLogLevelFlags log_level, - const gchar *message, - gpointer user_data) -{ - gboolean should_log = FALSE; - - if (!ev_log_modules) return; - - if (strcmp (ev_log_modules, "all") != 0) - { - char **modules; - int i; - - modules = g_strsplit (ev_log_modules, ":", 100); - - for (i = 0; modules[i] != NULL; i++) - { - if (strstr (message, modules [i]) != NULL) - { - should_log = TRUE; - break; - } - } - - g_strfreev (modules); - } - else - { - should_log = TRUE; - } - - if (should_log) - { - g_print ("%s\n", message); - } -} - -#define MAX_DEPTH 200 - -static void -trap_handler (const char *log_domain, - GLogLevelFlags log_level, - const char *message, - gpointer user_data) -{ - g_log_default_handler (log_domain, log_level, message, user_data); - - if (ev_debug_break != NULL && - (log_level & (G_LOG_LEVEL_WARNING | - G_LOG_LEVEL_ERROR | - G_LOG_LEVEL_CRITICAL | - G_LOG_FLAG_FATAL))) - { - if (strcmp (ev_debug_break, "stack") == 0) - { -#ifdef HAVE_EXECINFO_H - void *array[MAX_DEPTH]; - size_t size; - - size = backtrace (array, MAX_DEPTH); - backtrace_symbols_fd (array, size, 2); -#else - g_on_error_stack_trace (g_get_prgname ()); -#endif - } - else if (strcmp (ev_debug_break, "trap") == 0) - { - G_BREAKPOINT (); - } - else if (strcmp (ev_debug_break, "suspend") == 0) - { - g_print ("Suspending program; attach with the debugger.\n"); - - raise (SIGSTOP); - } - } -} - -#endif - -void -ev_debug_init (void) -{ -#ifndef DISABLE_LOGGING - ev_log_modules = g_getenv ("EV_LOG_MODULES"); - ev_debug_break = g_getenv ("EV_DEBUG_BREAK"); - - g_log_set_default_handler (trap_handler, NULL); - - g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, log_module, NULL); - -#endif -#ifndef DISABLE_PROFILING - ev_profile_modules = g_getenv ("EV_PROFILE_MODULES"); -#endif -} - -#ifndef DISABLE_PROFILING - -static EvProfiler * -ev_profiler_new (const char *name, const char *module) -{ - EvProfiler *profiler; - - profiler = g_new0 (EvProfiler, 1); - profiler->timer = g_timer_new (); - profiler->name = g_strdup (name); - profiler->module = g_strdup (module); - - g_timer_start (profiler->timer); - - return profiler; -} - -static gboolean -ev_should_profile (const char *module) -{ - char **modules; - int i; - gboolean res = FALSE; - - if (!ev_profile_modules) return FALSE; - if (strcmp (ev_profile_modules, "all") == 0) return TRUE; - - modules = g_strsplit (ev_profile_modules, ":", 100); - - for (i = 0; modules[i] != NULL; i++) - { - if (strcmp (module, modules [i]) == 0) - { - res = TRUE; - break; - } - } - - g_strfreev (modules); - - return res; -} - -static void -ev_profiler_dump (EvProfiler *profiler) -{ - double seconds; - - g_return_if_fail (profiler != NULL); - - seconds = g_timer_elapsed (profiler->timer, NULL); - - g_print ("[ %s ] %s %f s elapsed\n", - profiler->module, profiler->name, - seconds); -} - -static void -ev_profiler_free (EvProfiler *profiler) -{ - g_return_if_fail (profiler != NULL); - - g_timer_destroy (profiler->timer); - g_free (profiler->name); - g_free (profiler->module); - g_free (profiler); -} - -void -ev_profiler_start (const char *name, const char *module) -{ - EvProfiler *profiler; - - if (ev_profilers_hash == NULL) - { - ev_profilers_hash = - g_hash_table_new_full (g_str_hash, g_str_equal, - g_free, NULL); - } - - if (!ev_should_profile (module)) return; - - profiler = ev_profiler_new (name, module); - - g_hash_table_insert (ev_profilers_hash, g_strdup (name), profiler); -} - -void -ev_profiler_stop (const char *name) -{ - EvProfiler *profiler; - - profiler = g_hash_table_lookup (ev_profilers_hash, name); - if (profiler == NULL) return; - g_hash_table_remove (ev_profilers_hash, name); - - ev_profiler_dump (profiler); - ev_profiler_free (profiler); -} - -#endif diff --git a/lib/ev-debug.h b/lib/ev-debug.h deleted file mode 100644 index 53c1e61..0000000 --- a/lib/ev-debug.h +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (C) 2003 Marco Pesenti Gritti - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - */ - -#ifndef EV_DEBUG_H -#define EV_DEBUG_H - -#include "config.h" - -#include - -G_BEGIN_DECLS - -#ifndef GNOME_ENABLE_DEBUG -#define DISABLE_LOGGING -#define DISABLE_PROFILING -#endif - -#if defined(G_HAVE_GNUC_VARARGS) - -#ifdef DISABLE_LOGGING -#define LOG(msg, args...) G_STMT_START { } G_STMT_END -#else -#define LOG(msg, args...) \ -g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \ - "[ %s ] " msg, \ - __FILE__ , ## args) -#endif - -#elif defined(G_HAVE_ISO_VARARGS) - -#define LOG(...) G_STMT_START { } G_STMT_END - -#else /* no varargs macros */ - -static void LOG(const char *format, ...) {} - -#endif - -#ifdef DISABLE_PROFILING -#define START_PROFILER(name) -#define STOP_PROFILER(name) -#else -#define START_PROFILER(name) \ -ev_profiler_start (name, __FILE__); -#define STOP_PROFILER(name) \ -ev_profiler_stop (name); -#endif - -typedef struct -{ - GTimer *timer; - char *name; - char *module; -} EvProfiler; - -void ev_debug_init (void); - -#ifndef DISABLE_PROFILING - -void ev_profiler_start (const char *name, - const char *module); - -void ev_profiler_stop (const char *name); - -#endif - -G_END_DECLS - -#endif diff --git a/lib/ev-gui.c b/lib/ev-gui.c deleted file mode 100644 index 595be67..0000000 --- a/lib/ev-gui.c +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (C) 2002 Marco Pesenti Gritti - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -#include "ev-gui.h" - -static void -ev_gui_sanitise_popup_position (GtkMenu *menu, - GtkWidget *widget, - gint *x, - gint *y) -{ - GdkScreen *screen = gtk_widget_get_screen (widget); - gint monitor_num; - GdkRectangle monitor; - GtkRequisition req; - - g_return_if_fail (widget != NULL); - - gtk_widget_size_request (GTK_WIDGET (menu), &req); - - monitor_num = gdk_screen_get_monitor_at_point (screen, *x, *y); - gtk_menu_set_monitor (menu, monitor_num); - gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); - - *x = CLAMP (*x, monitor.x, monitor.x + MAX (0, monitor.width - req.width)); - *y = CLAMP (*y, monitor.y, monitor.y + MAX (0, monitor.height - req.height)); -} - -void -ev_gui_menu_position_tree_selection (GtkMenu *menu, - gint *x, - gint *y, - gboolean *push_in, - gpointer user_data) -{ - GtkTreeSelection *selection; - GList *selected_rows; - GtkTreeModel *model; - GtkTreeView *tree_view = GTK_TREE_VIEW (user_data); - GtkWidget *widget = GTK_WIDGET (user_data); - GtkRequisition req; - GdkRectangle visible; - - gtk_widget_size_request (GTK_WIDGET (menu), &req); - gdk_window_get_origin (widget->window, x, y); - - *x += (widget->allocation.width - req.width) / 2; - - /* Add on height for the treeview title */ - gtk_tree_view_get_visible_rect (tree_view, &visible); - *y += widget->allocation.height - visible.height; - - selection = gtk_tree_view_get_selection (tree_view); - selected_rows = gtk_tree_selection_get_selected_rows (selection, &model); - if (selected_rows) - { - GdkRectangle cell_rect; - - gtk_tree_view_get_cell_area (tree_view, selected_rows->data, - NULL, &cell_rect); - - *y += CLAMP (cell_rect.y + cell_rect.height, 0, visible.height); - - g_list_foreach (selected_rows, (GFunc)gtk_tree_path_free, NULL); - g_list_free (selected_rows); - } - - ev_gui_sanitise_popup_position (menu, widget, x, y); -} diff --git a/lib/ev-gui.h b/lib/ev-gui.h deleted file mode 100644 index 79323e6..0000000 --- a/lib/ev-gui.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2002 Marco Pesenti Gritti - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - */ - -#ifndef EPHY_GUI_H -#define EPHY_GUI_H - -#include - -G_BEGIN_DECLS - -void ev_gui_menu_position_tree_selection (GtkMenu *menu, - gint *x, - gint *y, - gboolean *push_in, - gpointer user_data); -G_END_DECLS - -#endif diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am new file mode 100644 index 0000000..73340ff --- /dev/null +++ b/libdocument/Makefile.am @@ -0,0 +1,122 @@ +INCLUDES= \ + -DEVINCE_UIDIR=\"$(pkgdatadir)\" \ + -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ + -I$(top_srcdir)/backend/pdf \ + -I$(top_srcdir)/backend/pixbuf \ + -I$(top_srcdir)/backend/tiff \ + -I$(top_srcdir)/backend/ps \ + -I$(top_srcdir)/backend/djvu \ + -I$(top_srcdir)/backend/dvi \ + -I$(top_srcdir)/backend/impress \ + -I$(top_srcdir)/backend/comics \ + $(BACKEND_CFLAGS) \ + $(WARN_CFLAGS) \ + $(DISABLE_DEPRECATED) + +noinst_LTLIBRARIES = libevbackend.la + +libevbackend_la_SOURCES= \ + ev-async-renderer.c \ + ev-async-renderer.h \ + ev-attachment.c \ + ev-attachment.h \ + ev-backend-marshal.c \ + ev-link.c \ + ev-link.h \ + ev-link-action.c \ + ev-link-action.h \ + ev-link-dest.c \ + ev-link-dest.h \ + ev-image.c \ + ev-image.h \ + ev-document.c \ + ev-document.h \ + ev-document-factory.c \ + ev-document-factory.h \ + ev-document-thumbnails.c \ + ev-document-thumbnails.h \ + ev-document-fonts.c \ + ev-document-fonts.h \ + ev-document-links.c \ + ev-document-links.h \ + ev-document-images.c \ + ev-document-images.h \ + ev-document-security.c \ + ev-document-security.h \ + ev-document-find.c \ + ev-document-find.h \ + ev-document-info.h \ + ev-document-transition.h \ + ev-document-transition.c \ + ev-file-exporter.c \ + ev-file-exporter.h \ + ev-file-helpers.c \ + ev-file-helpers.h \ + ev-render-context.h \ + ev-render-context.c \ + ev-selection.h \ + ev-selection.c \ + ev-document-misc.h \ + ev-document-misc.c + +libevbackend_la_LIBADD = + +if ENABLE_PDF +libevbackend_la_LIBADD += \ + $(top_builddir)/backend/pdf/libpdfdocument.la +endif + +if ENABLE_PS +libevbackend_la_LIBADD += \ + $(top_builddir)/backend/ps/libpsdocument.la +endif + +if ENABLE_PIXBUF +libevbackend_la_LIBADD += \ + $(top_builddir)/backend/pixbuf/libpixbufdocument.la +endif + +if ENABLE_DJVU +libevbackend_la_LIBADD += \ + $(top_builddir)/backend/djvu/libgtkdjvu.la +endif + +if ENABLE_TIFF +libevbackend_la_LIBADD += \ + $(top_builddir)/backend/tiff/libtiffdocument.la +endif + +if ENABLE_DVI +libevbackend_la_LIBADD += \ + $(top_builddir)/backend/dvi/libgtkdvi.la +endif + +if ENABLE_COMICS +libevbackend_la_LIBADD += \ + $(top_builddir)/backend/comics/libcomicsdocument.la +endif + +if ENABLE_IMPRESS +libevbackend_la_LIBADD += \ + $(top_builddir)/backend/impress/libimpressdocument.la +endif + +BUILT_SOURCES= \ + ev-backend-marshalers.h \ + ev-backend-marshalers.c + +CLEANFILES = $(BUILT_SOURCES) + +ev-backend-marshalers.h: ev-backend-marshalers.list + $(GLIB_GENMARSHAL) --prefix=_ev_backend_marshal $(srcdir)/ev-backend-marshalers.list --header > $@ + +ev-backend-marshalers.c: ev-backend-marshalers.list + $(GLIB_GENMARSHAL) --prefix=_ev_backend_marshal $(srcdir)/ev-backend-marshalers.list --body > $@ + +ev-backend-marshal.c: ev-backend-marshalers.h ev-backend-marshalers.c + +noinst_HEADERS = \ + ev-backend-marshalers.h + +EXTRA_DIST= \ + ev-backend-marshalers.list diff --git a/backend/ev-async-renderer.c b/libdocument/ev-async-renderer.c index f0ffce4..f0ffce4 100644 --- a/backend/ev-async-renderer.c +++ b/libdocument/ev-async-renderer.c diff --git a/backend/ev-async-renderer.h b/libdocument/ev-async-renderer.h index 9aa9657..9aa9657 100644 --- a/backend/ev-async-renderer.h +++ b/libdocument/ev-async-renderer.h diff --git a/backend/ev-attachment.c b/libdocument/ev-attachment.c index 7e7ca12..7e7ca12 100644 --- a/backend/ev-attachment.c +++ b/libdocument/ev-attachment.c diff --git a/backend/ev-attachment.h b/libdocument/ev-attachment.h index 994b654..994b654 100644 --- a/backend/ev-attachment.h +++ b/libdocument/ev-attachment.h diff --git a/backend/ev-backend-marshal.c b/libdocument/ev-backend-marshal.c index 2bc7b6a..2bc7b6a 100644 --- a/backend/ev-backend-marshal.c +++ b/libdocument/ev-backend-marshal.c diff --git a/backend/ev-backend-marshalers.list b/libdocument/ev-backend-marshalers.list index e69de29..e69de29 100644 --- a/backend/ev-backend-marshalers.list +++ b/libdocument/ev-backend-marshalers.list diff --git a/backend/ev-document-factory.c b/libdocument/ev-document-factory.c index 348cb80..348cb80 100644 --- a/backend/ev-document-factory.c +++ b/libdocument/ev-document-factory.c diff --git a/backend/ev-document-factory.h b/libdocument/ev-document-factory.h index 886be69..886be69 100644 --- a/backend/ev-document-factory.h +++ b/libdocument/ev-document-factory.h diff --git a/backend/ev-document-find.c b/libdocument/ev-document-find.c index 02fbae2..02fbae2 100644 --- a/backend/ev-document-find.c +++ b/libdocument/ev-document-find.c diff --git a/backend/ev-document-find.h b/libdocument/ev-document-find.h index f365df1..f365df1 100644 --- a/backend/ev-document-find.h +++ b/libdocument/ev-document-find.h diff --git a/backend/ev-document-fonts.c b/libdocument/ev-document-fonts.c index 929c21d..929c21d 100644 --- a/backend/ev-document-fonts.c +++ b/libdocument/ev-document-fonts.c diff --git a/backend/ev-document-fonts.h b/libdocument/ev-document-fonts.h index c9f58f5..c9f58f5 100644 --- a/backend/ev-document-fonts.h +++ b/libdocument/ev-document-fonts.h diff --git a/backend/ev-document-images.c b/libdocument/ev-document-images.c index 117b104..117b104 100644 --- a/backend/ev-document-images.c +++ b/libdocument/ev-document-images.c diff --git a/backend/ev-document-images.h b/libdocument/ev-document-images.h index 28eee46..28eee46 100644 --- a/backend/ev-document-images.h +++ b/libdocument/ev-document-images.h diff --git a/backend/ev-document-info.h b/libdocument/ev-document-info.h index 0cd1ef8..0cd1ef8 100644 --- a/backend/ev-document-info.h +++ b/libdocument/ev-document-info.h diff --git a/backend/ev-document-links.c b/libdocument/ev-document-links.c index c717096..c717096 100644 --- a/backend/ev-document-links.c +++ b/libdocument/ev-document-links.c diff --git a/backend/ev-document-links.h b/libdocument/ev-document-links.h index 8e8f20a..8e8f20a 100644 --- a/backend/ev-document-links.h +++ b/libdocument/ev-document-links.h diff --git a/backend/ev-document-misc.c b/libdocument/ev-document-misc.c index fd6f449..fd6f449 100644 --- a/backend/ev-document-misc.c +++ b/libdocument/ev-document-misc.c diff --git a/backend/ev-document-misc.h b/libdocument/ev-document-misc.h index 41f1cae..41f1cae 100644 --- a/backend/ev-document-misc.h +++ b/libdocument/ev-document-misc.h diff --git a/backend/ev-document-security.c b/libdocument/ev-document-security.c index 49ded87..49ded87 100644 --- a/backend/ev-document-security.c +++ b/libdocument/ev-document-security.c diff --git a/backend/ev-document-security.h b/libdocument/ev-document-security.h index 154a3b1..154a3b1 100644 --- a/backend/ev-document-security.h +++ b/libdocument/ev-document-security.h diff --git a/backend/ev-document-thumbnails.c b/libdocument/ev-document-thumbnails.c index c560cec..c560cec 100644 --- a/backend/ev-document-thumbnails.c +++ b/libdocument/ev-document-thumbnails.c diff --git a/backend/ev-document-thumbnails.h b/libdocument/ev-document-thumbnails.h index 6e15a32..6e15a32 100644 --- a/backend/ev-document-thumbnails.h +++ b/libdocument/ev-document-thumbnails.h diff --git a/backend/ev-document-transition.c b/libdocument/ev-document-transition.c index 274da7c..274da7c 100644 --- a/backend/ev-document-transition.c +++ b/libdocument/ev-document-transition.c diff --git a/backend/ev-document-transition.h b/libdocument/ev-document-transition.h index 3ca55ab..3ca55ab 100644 --- a/backend/ev-document-transition.h +++ b/libdocument/ev-document-transition.h diff --git a/backend/ev-document.c b/libdocument/ev-document.c index a951bfa..a951bfa 100644 --- a/backend/ev-document.c +++ b/libdocument/ev-document.c diff --git a/backend/ev-document.h b/libdocument/ev-document.h index 828ca25..828ca25 100644 --- a/backend/ev-document.h +++ b/libdocument/ev-document.h diff --git a/backend/ev-file-exporter.c b/libdocument/ev-file-exporter.c index 7a4e902..7a4e902 100644 --- a/backend/ev-file-exporter.c +++ b/libdocument/ev-file-exporter.c diff --git a/backend/ev-file-exporter.h b/libdocument/ev-file-exporter.h index f0e517c..f0e517c 100644 --- a/backend/ev-file-exporter.h +++ b/libdocument/ev-file-exporter.h diff --git a/lib/ev-file-helpers.c b/libdocument/ev-file-helpers.c index 044aeae..b6a50b6 100644 --- a/lib/ev-file-helpers.c +++ b/libdocument/ev-file-helpers.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/ev-file-helpers.h b/libdocument/ev-file-helpers.h index 4e75a14..4e75a14 100644 --- a/lib/ev-file-helpers.h +++ b/libdocument/ev-file-helpers.h diff --git a/backend/ev-image.c b/libdocument/ev-image.c index f906b00..f906b00 100644 --- a/backend/ev-image.c +++ b/libdocument/ev-image.c diff --git a/backend/ev-image.h b/libdocument/ev-image.h index 6688e7a..6688e7a 100644 --- a/backend/ev-image.h +++ b/libdocument/ev-image.h diff --git a/backend/ev-link-action.c b/libdocument/ev-link-action.c index bc0a8fc..bc0a8fc 100644 --- a/backend/ev-link-action.c +++ b/libdocument/ev-link-action.c diff --git a/backend/ev-link-action.h b/libdocument/ev-link-action.h index 32211fe..32211fe 100644 --- a/backend/ev-link-action.h +++ b/libdocument/ev-link-action.h diff --git a/backend/ev-link-dest.c b/libdocument/ev-link-dest.c index 09f840a..09f840a 100644 --- a/backend/ev-link-dest.c +++ b/libdocument/ev-link-dest.c diff --git a/backend/ev-link-dest.h b/libdocument/ev-link-dest.h index a0c96f5..a0c96f5 100644 --- a/backend/ev-link-dest.h +++ b/libdocument/ev-link-dest.h diff --git a/backend/ev-link.c b/libdocument/ev-link.c index 8561914..8561914 100644 --- a/backend/ev-link.c +++ b/libdocument/ev-link.c diff --git a/backend/ev-link.h b/libdocument/ev-link.h index b7304de..b7304de 100644 --- a/backend/ev-link.h +++ b/libdocument/ev-link.h diff --git a/backend/ev-render-context.c b/libdocument/ev-render-context.c index a3969ad..a3969ad 100644 --- a/backend/ev-render-context.c +++ b/libdocument/ev-render-context.c diff --git a/backend/ev-render-context.h b/libdocument/ev-render-context.h index 636f02f..636f02f 100644 --- a/backend/ev-render-context.h +++ b/libdocument/ev-render-context.h diff --git a/backend/ev-selection.c b/libdocument/ev-selection.c index 2aa45a7..2aa45a7 100644 --- a/backend/ev-selection.c +++ b/libdocument/ev-selection.c diff --git a/backend/ev-selection.h b/libdocument/ev-selection.h index d081604..d081604 100644 --- a/backend/ev-selection.h +++ b/libdocument/ev-selection.h diff --git a/po/ChangeLog b/po/ChangeLog index 96b81ac..4846c8b 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2007-01-08 Nickolay V. Shmyrev + + * POTFILES.in: + 2007-01-08 David Lodge * en_GB.po: Updated English (British) translation diff --git a/po/POTFILES.in b/po/POTFILES.in index 7965b14..06528e0 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,9 +1,14 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. [encoding: UTF-8] -backend/ev-attachment.c -backend/ev-document-factory.c -comics/comics-document.c +backend/comics/comics-document.c +backend/dvi/dvi-document.c +backend/pdf/ev-poppler.c +backend/impress/zip.c +backend/ps/gsdefaults.c +backend/ps/ps-document.c +libdocument/ev-attachment.c +libdocument/ev-document-factory.c cut-n-paste/recent-files/egg-recent-view-uimanager.c cut-n-paste/toolbar-editor/egg-editable-toolbar.c cut-n-paste/toolbar-editor/egg-toolbar-editor.c @@ -13,13 +18,8 @@ data/evince.desktop.in.in data/evince-password.glade data/evince-properties.glade data/evince.schemas.in -dvi/dvi-document.c -pdf/ev-poppler.cc -impress/zip.c properties/ev-properties-main.c properties/ev-properties-view.c -ps/gsdefaults.c -ps/ps-document.c shell/eggfindbar.c shell/ev-application.c shell/ev-history.c diff --git a/properties/Makefile.am b/properties/Makefile.am index b4ef6f0..f25ef6f 100644 --- a/properties/Makefile.am +++ b/properties/Makefile.am @@ -1,7 +1,7 @@ INCLUDES= \ -DDATADIR=\"$(pkgdatadir)\" \ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ - -I$(top_srcdir)/backend \ + -I$(top_srcdir)/libdocument \ $(FRONTEND_CFLAGS) \ $(NAUTILUS_CFLAGS) \ $(DISABLE_DEPRECATED) \ @@ -27,8 +27,8 @@ libevince_properties_page_la_SOURCES = \ ev-properties-main.c libevince_properties_page_la_LIBADD = \ - $(top_builddir)/lib/libev.la \ libevproperties.la \ + $(top_builddir)/libdocument/libevbackend.la \ $(FRONTEND_LIBS) \ $(NAUTILUS_LIBS) diff --git a/shell/Makefile.am b/shell/Makefile.am index 3033504..3bdfee8 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -1,11 +1,10 @@ INCLUDES= \ -DDATADIR=\"$(pkgdatadir)\" \ -DGNOMEDATADIR=\"$(datadir)\" \ - -I$(top_srcdir)/lib \ -I$(top_srcdir)/cut-n-paste/zoom-control/ \ -I$(top_srcdir)/cut-n-paste/toolbar-editor/ \ -I$(top_srcdir)/cut-n-paste/totem-screensaver/ \ - -I$(top_srcdir)/backend \ + -I$(top_srcdir)/libdocument \ -I$(top_srcdir)/properties \ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ -DGNOMEICONDIR=\""$(datadir)/pixmaps"\" \ @@ -81,6 +80,8 @@ evince_SOURCES= \ ev-sidebar-thumbnails.h \ ev-stock-icons.c \ ev-stock-icons.h \ + ev-tooltip.c \ + ev-tooltip.h \ main.c @@ -96,7 +97,7 @@ evince_LDADD= \ $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la \ $(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la \ $(top_builddir)/properties/libevproperties.la \ - $(top_builddir)/lib/libev.la \ + $(top_builddir)/libdocument/libevbackend.la \ $(SHELL_LIBS) \ $(GNOME_PRINT_LIBS) diff --git a/shell/ev-application.h b/shell/ev-application.h index 53e97c2..e0d068a 100644 --- a/shell/ev-application.h +++ b/shell/ev-application.h @@ -23,6 +23,10 @@ #ifndef EV_APPLICATION_H #define EV_APPLICATION_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include diff --git a/shell/ev-sidebar-links.c b/shell/ev-sidebar-links.c index 4639401..fbf1b73 100644 --- a/shell/ev-sidebar-links.c +++ b/shell/ev-sidebar-links.c @@ -33,7 +33,6 @@ #include "ev-job-queue.h" #include "ev-document-links.h" #include "ev-window.h" -#include "ev-gui.h" struct _EvSidebarLinksPrivate { GtkWidget *tree_view; diff --git a/shell/ev-sidebar-links.h b/shell/ev-sidebar-links.h index 71b408d..36fb1da 100644 --- a/shell/ev-sidebar-links.h +++ b/shell/ev-sidebar-links.h @@ -26,6 +26,7 @@ #include #include "ev-document.h" +#include "ev-utils.h" G_BEGIN_DECLS diff --git a/lib/ev-tooltip.c b/shell/ev-tooltip.c index f66f22f..f66f22f 100644 --- a/lib/ev-tooltip.c +++ b/shell/ev-tooltip.c diff --git a/lib/ev-tooltip.h b/shell/ev-tooltip.h index 89d064c..89d064c 100644 --- a/lib/ev-tooltip.h +++ b/shell/ev-tooltip.h diff --git a/shell/ev-utils.c b/shell/ev-utils.c index 38281f6..9021726 100644 --- a/shell/ev-utils.c +++ b/shell/ev-utils.c @@ -304,3 +304,68 @@ save_print_config_to_file (GnomePrintConfig *config) } #endif /* WITH_GNOME_PRINT */ +static void +ev_gui_sanitise_popup_position (GtkMenu *menu, + GtkWidget *widget, + gint *x, + gint *y) +{ + GdkScreen *screen = gtk_widget_get_screen (widget); + gint monitor_num; + GdkRectangle monitor; + GtkRequisition req; + + g_return_if_fail (widget != NULL); + + gtk_widget_size_request (GTK_WIDGET (menu), &req); + + monitor_num = gdk_screen_get_monitor_at_point (screen, *x, *y); + gtk_menu_set_monitor (menu, monitor_num); + gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); + + *x = CLAMP (*x, monitor.x, monitor.x + MAX (0, monitor.width - req.width)); + *y = CLAMP (*y, monitor.y, monitor.y + MAX (0, monitor.height - req.height)); +} + +void +ev_gui_menu_position_tree_selection (GtkMenu *menu, + gint *x, + gint *y, + gboolean *push_in, + gpointer user_data) +{ + GtkTreeSelection *selection; + GList *selected_rows; + GtkTreeModel *model; + GtkTreeView *tree_view = GTK_TREE_VIEW (user_data); + GtkWidget *widget = GTK_WIDGET (user_data); + GtkRequisition req; + GdkRectangle visible; + + gtk_widget_size_request (GTK_WIDGET (menu), &req); + gdk_window_get_origin (widget->window, x, y); + + *x += (widget->allocation.width - req.width) / 2; + + /* Add on height for the treeview title */ + gtk_tree_view_get_visible_rect (tree_view, &visible); + *y += widget->allocation.height - visible.height; + + selection = gtk_tree_view_get_selection (tree_view); + selected_rows = gtk_tree_selection_get_selected_rows (selection, &model); + if (selected_rows) + { + GdkRectangle cell_rect; + + gtk_tree_view_get_cell_area (tree_view, selected_rows->data, + NULL, &cell_rect); + + *y += CLAMP (cell_rect.y + cell_rect.height, 0, visible.height); + + g_list_foreach (selected_rows, (GFunc)gtk_tree_path_free, NULL); + g_list_free (selected_rows); + } + + ev_gui_sanitise_popup_position (menu, widget, x, y); +} + diff --git a/shell/ev-utils.h b/shell/ev-utils.h index 1d7e882..5afb5a6 100644 --- a/shell/ev-utils.h +++ b/shell/ev-utils.h @@ -34,6 +34,12 @@ GdkPixbuf* ev_pixbuf_add_shadow (GdkPixbuf *src, int size, void ev_print_region_contents (GdkRegion *region); +void ev_gui_menu_position_tree_selection (GtkMenu *menu, + gint *x, + gint *y, + gboolean *push_in, + gpointer user_data); + #ifdef WITH_GNOME_PRINT GnomePrintConfig* load_print_config_from_file (void); void save_print_config_to_file (GnomePrintConfig *config); diff --git a/shell/ev-view.c b/shell/ev-view.c index 1e156d5..549c256 100644 --- a/shell/ev-view.c +++ b/shell/ev-view.c @@ -39,7 +39,6 @@ #include "ev-document-find.h" #include "ev-document-transition.h" #include "ev-document-misc.h" -#include "ev-debug.h" #include "ev-job-queue.h" #include "ev-page-cache.h" #include "ev-pixbuf-cache.h" @@ -2947,8 +2946,6 @@ ev_view_finalize (GObject *object) { EvView *view = EV_VIEW (object); - LOG ("Finalize"); - g_free (view->status); g_free (view->find_status); diff --git a/shell/ev-window.c b/shell/ev-window.c index c0adf8e..0bba71d 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -68,7 +68,6 @@ #include "ev-metadata-manager.h" #include "ev-file-helpers.h" #include "ev-utils.h" -#include "ev-debug.h" #include "ev-history.h" #include "ev-image.h" diff --git a/shell/main.c b/shell/main.c index fba38a7..3c5a83d 100644 --- a/shell/main.c +++ b/shell/main.c @@ -38,7 +38,6 @@ #endif #include "ev-stock-icons.h" -#include "ev-debug.h" #include "ev-job-queue.h" #include "ev-file-helpers.h" @@ -367,7 +366,6 @@ main (int argc, char *argv[]) g_set_application_name (_("Evince Document Viewer")); ev_file_helpers_init (); - ev_debug_init (); ev_stock_icons_init (); gtk_window_set_default_icon_name ("evince"); diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am index dfb4c08..dc03911 100644 --- a/thumbnailer/Makefile.am +++ b/thumbnailer/Makefile.am @@ -2,8 +2,7 @@ INCLUDES= \ -DDATADIR=\"$(pkgdatadir)\" \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/backend \ + -I$(top_srcdir)/libdocument \ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ -DGNOMEICONDIR=\""$(datadir)/pixmaps"\" \ $(FRONTEND_CFLAGS) \ @@ -16,7 +15,7 @@ evince_thumbnailer_SOURCES= \ evince-thumbnailer.c evince_thumbnailer_LDADD= \ - $(top_builddir)/lib/libev.la \ + $(top_builddir)/libdocument/libevbackend.la \ $(FRONTEND_LIBS) \ $(DJVU_LIBS) -- cgit v0.9.1