prevent segfaults when no document loaded

See the issue report for a description of the bug. The root cause is
dereferencing of NULL pointers, specifically the priv->document member of
EvWindow structures when no document is loaded. This commit adds checks
for a NULL value of priv->document at all the points in the file
shell/ev-window.c where this pointer was previously dereferenced without
being checked.

Fixes 357 (https://github.com/mate-desktop/atril/issues/357)

.travis.yml

@@ -0,0 +1,141 @@
+# vim: set ts=2 sts=2 sw=2 expandtab :
+dist: xenial
+sudo: required
+language: bash
+services:
+  - docker
+
+before_install:
+  - curl -Ls -o docker-build https://github.com/mate-desktop/mate-dev-scripts/raw/master/travis/docker-build
+  - chmod +x docker-build
+
+install:
+  - sudo apt-get install -y python3-pip python3-setuptools
+  - sudo pip3 install --upgrade pip
+  - sudo pip install PyGithub
+  - ./docker-build --name ${DISTRO} --config .travis.yml --install
+
+script:
+  - ./docker-build --name ${DISTRO} --verbose --config .travis.yml --build autotools
+
+env:
+#  - DISTRO="archlinux/base"
+  - DISTRO="debian:buster"
+  - DISTRO="fedora:28"
+  - DISTRO="ubuntu:18.10"
+
+##########################################################
+# THE FOLLOWING LINES IS USED BY docker-build
+##########################################################
+requires:
+  archlinux:
+    # Useful URL: https://git.archlinux.org/svntogit/community.git/tree/atril
+    - caja
+    - djvulibre
+    - gcc
+    - git
+    - gobject-introspection
+    - intltool
+    - itstool
+    - libgxps
+    - make
+    - mate-common
+    - poppler-glib
+    - texlive-bin
+    - webkit2gtk
+    - which
+    - yelp-tools
+
+  debian:
+    # Useful URL: https://github.com/mate-desktop/debian-packages
+    # Useful URL: https://salsa.debian.org/debian-mate-team/atril
+    - git
+    - gobject-introspection
+    - intltool
+    - libcaja-extension-dev
+    - libdjvulibre-dev
+    - libgail-3-dev
+    - libgirepository1.0-dev
+    - libglib2.0-dev
+    - libgtk-3-dev
+    - libgxps-dev
+    - libkpathsea-dev
+    - libpoppler-glib-dev
+    - libsecret-1-dev
+    - libsm-dev
+    - libspectre-dev
+    - libtiff-dev
+    - libwebkit2gtk-4.0-dev
+    - libx11-dev
+    - libxml2-dev
+    - lsb-release
+    - make
+    - mate-common
+    - xsltproc
+    - yelp-tools
+    - zlib1g-dev
+
+  fedora:
+    # Useful URL: https://src.fedoraproject.org/cgit/rpms/atril.git
+    - cairo-gobject-devel
+    - caja-devel
+    - desktop-file-utils
+    - djvulibre-devel
+    - gcc
+    - gcc-c++
+    - git
+    - gobject-introspection-devel
+    - gtk3-devel
+    - libXt-devel
+    - libglade2-devel
+    - libgxps-devel
+    - libjpeg-turbo-devel
+    - libsecret-devel
+    - libspectre-devel
+    - libtiff-devel
+    - make
+    - mate-common
+    - poppler-glib-devel
+    - redhat-rpm-config
+    - texlive-lib-devel
+    - webkitgtk4-devel
+    - yelp-tools
+
+  ubuntu:
+    - git
+    - gobject-introspection
+    - intltool
+    - libcaja-extension-dev
+    - libdjvulibre-dev
+    - libgail-3-dev
+    - libgirepository1.0-dev
+    - libglib2.0-dev
+    - libgtk-3-dev
+    - libgxps-dev
+    - libkpathsea-dev
+    - libpoppler-glib-dev
+    - libsecret-1-dev
+    - libsm-dev
+    - libspectre-dev
+    - libtiff-dev
+    - libwebkit2gtk-4.0-dev
+    - libx11-dev
+    - libxml2-dev
+    - lsb-release
+    - make
+    - mate-common
+    - xsltproc
+    - yelp-tools
+    - zlib1g-dev
+
+variables:
+  - CFLAGS="-Wall -Werror=format-security"
+
+before_scripts:
+  - if [ ${DISTRO_NAME} == "debian" ];then
+  -     curl -Ls -o debian.sh https://github.com/mate-desktop/mate-dev-scripts/raw/master/travis/debian.sh
+  -     bash ./debian.sh
+  - fi
+
+after_scripts:
+  - make distcheck

.tx/config

@@ -1,7 +1,16 @@
 [main]
 host = https://www.transifex.com
  
-[MATE.atril]
+[MATE.1-20--atril]
 file_filter = po/<lang>.po
-source_file = po/atril.pot
+source_file = atril.pot
 source_lang = en
+type = PO
+minimum_perc = 2
+
+[MATE.1-20--atril-user-guide]
+file_filter = help/<lang>/<lang>.po
+source_file = help/atril.pot
+source_lang = en
+type = PO
+minimum_perc = 2

Makefile.am

@@ -82,7 +82,8 @@ DISTCHECK_CONFIGURE_FLAGS =   \
     --enable-gtk-doc          \
     --disable-caja            \
     --disable-tests           \
-    --disable-silent-rules
+    --disable-silent-rules    \
+    CFLAGS='-Wno-deprecated-declarations'
 
 distuninstallcheck_listfiles = find . -type f -print | grep -v /share/mate/help/ | grep -v \.omf
 

NEWS

@@ -1,3 +1,72 @@
+### atril 1.20.3
+
+  * Translations update
+  * Use make functions for HELP_LINGUAS
+  * comics: support application/vnd.rar MIME type
+  * shell: Save document to the same path it was opened from
+  * Reduce the chattiness of atril daemon
+  * EvView: Fix cursor movement when logical and visual line order differs
+  * Update atril_start_window.png
+  * moveable (older spelling) -> movable
+  * tx: add atril-user-guide to transifex config
+  * Update Catalan screenshot
+
+### atril 1.20.2
+
+  * Translations update
+  * disable StartPresentation action in fullscreen if document has no pages
+  * disable ViewPresentation action if document has no pages
+  * libdocument: Use gdk_pixbuf_get_from_surface()
+  * thumbnailer: Remove unused code
+  * view: Fix page background rendering while loading
+  * libdocument: Deprecate misc_get_page_border_size()
+  * view: Use a rendered frame instead of custom border
+  * a11y: Return correct start and end offsets
+  * a11y: Fix crash with Orca screen reader
+  * libview: drop deprecated unneeded code
+  * ev-loading-message: Remove unused variables
+  * libview: fix text selection with mouse in annotation window
+  * libview: fix build without epub
+
+### atril 1.20.1
+
+  * Disable view presentation if there is no document.
+  * Allow changing the page of a presentation
+  * libview: Fix goto window in presentation mode
+  * libview: avoid deprecated gdk_screen_get_monitor
+  * EvPresentationView: Render correctly on hi-dpi displays
+  * libview: Fix g_return condition in set_device_scale_on_surface()
+  * EvView: render correctly on hi-dpi displays
+  * libview: use css to draw the background of presentations
+  * Move custom css to a file compiled as a gresource
+  * shell: Use GResource for data files
+  * toolbar-editor: Add methods to load from GResource
+  * previewer: Use GResource for data files
+  * build: Add configure check for glib-compile-resources
+  * update resource for translations
+  * libview: Check number of pages when processing button events
+  * libview: Add check for pageless documents to ev_view_accessible_focus_changed
+  * libview: Check number of pages on ev_view_document_changed_cb
+  * Use GtkOverlay to show the loading message
+  * shell: Remove unused marshalers
+  * thumbnailer: Send error messages to stderr
+  * shell: Use GtkApplication to inhibit the screensaver
+  * shell: Port to GtkApplication
+  * shell: Use g_printerr instead of g_warning
+  * daemon: Port to GApplication
+  * daemon: Use gdbus-codegen for the org.mate.atril.Daemon interface
+  * shell: Use gdbus-codegen for the org.mate.atril.Window interface
+  * shell: Use gdbus-codegen for the org.mate.atril.Application interface
+  * libview: save inverted colors in a document
+  * Save/restore context when getting colors for a different state
+  * epub: allow to save epub documents
+  * epub:  fix loading epub thumbnails
+  * shell: fix menu-accel for inverted colors
+  * shell: add keypad accels for zoom_reset
+  * Add zoom reset
+  * avoid deprecated GtkStock
+  * Check legal boundaries of accessible pages
+
 ### atril 1.20.0
 
   * Translations update

backend/comics/comicsdocument.atril-backend.in

@@ -1,4 +1,4 @@
 [Atril Backend]
 Module=comicsdocument
 _TypeDescription=Comic Books
-MimeType=application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;application/vnd.comicbook+zip;
+MimeType=application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;application/vnd.comicbook+zip;application/vnd.comicbook-rar;

backend/epub/epub-document.c

@@ -124,9 +124,10 @@ epub_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document,
 	cairo_surface_t *webpage;
 	GdkPixbuf *thumbnailpix = NULL ;
 	gint width,height;
-	epub_document_thumbnails_get_dimensions(document,rc,&width,&height);
-	webpage = ev_document_misc_surface_rotate_and_scale(rc->page->backend_page,width,height,0);
-	thumbnailpix = ev_document_misc_pixbuf_from_surface(webpage);
+	epub_document_thumbnails_get_dimensions (document, rc, &width, &height);
+	webpage = ev_document_misc_surface_rotate_and_scale (rc->page->backend_page,
+	                                                     width, height, 0);
+	thumbnailpix = ev_document_misc_pixbuf_from_surface (webpage);
 	return thumbnailpix;
 }
 
@@ -351,7 +352,11 @@ epub_document_save (EvDocument *document,
 {
 	EpubDocument *epub_document = EPUB_DOCUMENT (document);
 
-	return ev_xfer_uri_simple (epub_document->archivename, uri, error);
+	gchar *source_uri = g_filename_to_uri (epub_document->archivename, NULL, error);
+	if (source_uri == NULL)
+	    return FALSE;
+
+	return ev_xfer_uri_simple (source_uri, uri, error);
 }
 
 static int

configure.ac

@@ -4,7 +4,7 @@
 
 m4_define([ev_major_version], [1])
 m4_define([ev_minor_version], [20])
-m4_define([ev_micro_version], [0])
+m4_define([ev_micro_version], [3])
 m4_define([ev_extra_version], [])
 m4_define([ev_version], [ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version])
 
@@ -59,8 +59,6 @@ AC_PROG_CXX
 AC_STDC_HEADERS
 AM_PROG_LIBTOOL
 AC_PROG_SED
-AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
-AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums])
 
 MATE_MAINTAINER_MODE_DEFINES
 MATE_COMPILE_WARNINGS
@@ -113,6 +111,34 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
 
 PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 x11])
 
+# ***************
+# Build utilities
+# ***************
+
+AC_ARG_VAR([GLIB_GENMARSHAL],[the glib-genmarschal programme])
+AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal],[])
+if test -z "$GLIB_GENMARSHAL"; then
+  AC_MSG_ERROR([glib-genmarshal not found])
+fi
+
+AC_ARG_VAR([GLIB_MKENUMS],[the glib-mkenums programme])
+AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums],[])
+if test -z "$GLIB_MKENUMS"; then
+  AC_MSG_ERROR([glib-mkenums not found])
+fi
+
+AC_ARG_VAR([GLIB_COMPILE_RESOURCES],[the glib-compile-resources programme])
+AC_PATH_PROG([GLIB_COMPILE_RESOURCES],[glib-compile-resources],[])
+if test -z "$GLIB_COMPILE_RESOURCES"; then
+  AC_MSG_ERROR([glib-compile-resources not found])
+fi
+
+AC_ARG_VAR([XMLLINT],[the xmllint programme])
+AC_PATH_PROG([XMLLINT],[xmllint],[])
+if test -z "$XMLLINT"; then
+  AC_MSG_ERROR([xmllint not found])
+fi
+
 # Although GTK+ 3.10 includes hi-dpi functionality, it does not require a cairo with
 # cairo_surface_set_device_scale(), which we also need if we're to support hi-dpi,
 # so we need check for that explicity.
@@ -144,9 +170,15 @@ AS_IF([test "x$found_zlib" = "xno"], [
   AC_SUBST(ZLIB_LIBS)
 ])
 
-dnl
-dnl SM client
-dnl
+AC_ARG_VAR([GDBUS_CODEGEN],[the gdbus-codegen programme])
+AC_PATH_PROG([GDBUS_CODEGEN],[gdbus-codegen],[])
+if test -z "$GDBUS_CODEGEN"; then
+  AC_MSG_ERROR([gdbus-codegen not found])
+fi
+
+ # *********
+ # SM client
+ # *********
 
 PKG_CHECK_MODULES([SMCLIENT],[gtk+-3.0 gthread-2.0 sm >= 1.0.0])
 AC_SUBST([SMCLIENT_CFLAGS])
@@ -607,7 +639,7 @@ if test "x$enable_tiff" = "xyes"; then
     ATRIL_MIME_TYPES="${ATRIL_MIME_TYPES}image/tiff;"
 fi
 if test "x$enable_comics" = "xyes"; then
-    ATRIL_MIME_TYPES="${ATRIL_MIME_TYPES}application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;application/vnd.comicbook+zip;"
+    ATRIL_MIME_TYPES="${ATRIL_MIME_TYPES}application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;application/vnd.comicbook+zip;application/vnd-comicbook.rar;"
 fi
 if test "x$enable_pixbuf" = "xyes"; then
     ATRIL_MIME_TYPES="${ATRIL_MIME_TYPES}image/*;"
@@ -682,7 +714,6 @@ cut-n-paste/Makefile
 cut-n-paste/smclient/Makefile
 cut-n-paste/toolbar-editor/Makefile
 cut-n-paste/zoom-control/Makefile
-cut-n-paste/totem-screensaver/Makefile
 cut-n-paste/synctex/Makefile
 data/atril.desktop.in
 data/Makefile

cut-n-paste/Makefile.am

@@ -1,3 +1,3 @@
-SUBDIRS = zoom-control toolbar-editor totem-screensaver smclient synctex
+SUBDIRS = zoom-control toolbar-editor smclient synctex
 
 -include $(top_srcdir)/git.mk

cut-n-paste/toolbar-editor/egg-editable-toolbar.c

@@ -1464,9 +1464,9 @@ egg_editable_toolbar_set_ui_manager (EggEditableToolbar *etoolbar,
   static const GtkActionEntry actions[] = {
     { "MoveToolItem", STOCK_DRAG_MODE, N_("_Move on Toolbar"), NULL,
       N_("Move the selected item on the toolbar"), G_CALLBACK (move_item_cb) },
-    { "RemoveToolItem", GTK_STOCK_REMOVE, N_("_Remove from Toolbar"), NULL,
+    { "RemoveToolItem", "list-remove", N_("_Remove from Toolbar"), NULL,
       N_("Remove the selected item from the toolbar"), G_CALLBACK (remove_item_cb) },
-    { "RemoveToolbar", GTK_STOCK_DELETE, N_("_Delete Toolbar"), NULL,
+    { "RemoveToolbar", "edit-delete", N_("_Delete Toolbar"), NULL,
       N_("Remove the selected toolbar"), G_CALLBACK (remove_toolbar_cb) },
   };
 

cut-n-paste/toolbar-editor/egg-toolbar-editor.c

@@ -509,8 +509,8 @@ editor_create_item_from_name (EggToolbarEditor *editor,
         icon = gtk_image_new_from_icon_name (icon_name,
 	                                     GTK_ICON_SIZE_LARGE_TOOLBAR);
       else
-        icon = gtk_image_new_from_stock (stock_id ? stock_id : GTK_STOCK_DND,
-                                         GTK_ICON_SIZE_LARGE_TOOLBAR);
+        icon = gtk_image_new_from_icon_name (stock_id ? stock_id : "gtk-dnd",
+                                             GTK_ICON_SIZE_LARGE_TOOLBAR);
 
       item_name = g_strdup (name);
       collate_key = g_utf8_collate_key (short_label, -1);

cut-n-paste/toolbar-editor/egg-toolbars-model.c

@@ -607,6 +607,36 @@ egg_toolbars_model_load_toolbars (EggToolbarsModel *model,
   return TRUE;
 }
 
+gboolean
+egg_toolbars_model_load_toolbars_from_resource (EggToolbarsModel *model,
+                                                const char *path)
+{
+  xmlDocPtr doc;
+  xmlNodePtr root;
+  GBytes *bytes;
+  GError *error = NULL;
+  const guint8 *data;
+  gsize data_len;
+
+  g_return_val_if_fail (EGG_IS_TOOLBARS_MODEL (model), FALSE);
+
+  bytes = g_resources_lookup_data (path, G_RESOURCE_LOOKUP_FLAGS_NONE, &error);
+  g_assert_no_error (error);
+
+  data = g_bytes_get_data (bytes, &data_len);
+  doc = xmlParseMemory ((const char *) data, data_len);
+  if (doc == NULL)
+    g_error ("Failed to load XML data from resource %s", path);
+
+  root = xmlDocGetRootElement (doc);
+  parse_toolbars (model, root->children);
+
+  xmlFreeDoc (doc);
+  g_bytes_unref (bytes);
+
+  return TRUE;
+}
+
 static void
 parse_available_list (EggToolbarsModel *model,
 		      xmlNodePtr        child)
@@ -671,6 +701,36 @@ egg_toolbars_model_load_names (EggToolbarsModel *model,
   return TRUE;
 }
 
+gboolean
+egg_toolbars_model_load_names_from_resource (EggToolbarsModel *model,
+                                             const char *path)
+{
+  xmlDocPtr doc;
+  xmlNodePtr root;
+  GBytes *bytes;
+  GError *error = NULL;
+  const guint8 *data;
+  gsize data_len;
+
+  g_return_val_if_fail (EGG_IS_TOOLBARS_MODEL (model), FALSE);
+
+  bytes = g_resources_lookup_data (path, G_RESOURCE_LOOKUP_FLAGS_NONE, &error);
+  g_assert_no_error (error);
+
+  data = g_bytes_get_data (bytes, &data_len);
+  doc = xmlParseMemory ((const char *) data, data_len);
+  if (doc == NULL)
+    g_error ("Failed to load XML data from resource %s", path);
+
+  root = xmlDocGetRootElement (doc);
+  parse_names (model, root->children);
+
+  xmlFreeDoc (doc);
+  g_bytes_unref (bytes);
+
+  return TRUE;
+}
+
 static void
 egg_toolbars_model_class_init (EggToolbarsModelClass *klass)
 {

cut-n-paste/toolbar-editor/egg-toolbars-model.h

@@ -23,6 +23,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
+#include <gio/gio.h>
 #include <gdk/gdk.h>
 
 G_BEGIN_DECLS
@@ -114,12 +115,16 @@ GType		  egg_tb_model_flags_get_type       (void);
 GType		  egg_toolbars_model_get_type       (void);
 EggToolbarsModel *egg_toolbars_model_new	    (void);
 gboolean          egg_toolbars_model_load_names     (EggToolbarsModel *model,
-						     const char *xml_file);
+                                                     const char *xml_file);
 gboolean          egg_toolbars_model_load_toolbars  (EggToolbarsModel *model,
-						     const char *xml_file);
+                                                     const char *xml_file);
 void              egg_toolbars_model_save_toolbars  (EggToolbarsModel *model,
-						     const char *xml_file,
-						     const char *version);
+                                                     const char *xml_file,
+                                                     const char *version);
+gboolean          egg_toolbars_model_load_names_from_resource    (EggToolbarsModel *model,
+                                                                  const char *path);
+gboolean          egg_toolbars_model_load_toolbars_from_resource (EggToolbarsModel *model,
+                                                                  const char *path);
 
 /* Functions for manipulating the types of portable data this toolbar understands. */
 GList *           egg_toolbars_model_get_types      (EggToolbarsModel *model);

cut-n-paste/totem-screensaver/Makefile.am

@@ -1,16 +0,0 @@
-noinst_LTLIBRARIES = libtotemscrsaver.la
-libtotemscrsaver_la_SOURCES = \
-	totem-scrsaver.h \
-	totem-scrsaver.c
-
-libtotemscrsaver_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)
-
-libtotemscrsaver_la_CFLAGS = 	\
-	$(SHELL_CORE_CFLAGS)	\
-	$(DBUS_CFLAGS)		\
-	$(WARNING_CFLAGS)	\
-	$(DISABLE_DEPRECATED)	\
-	$(AM_CFLAGS)
-
--include $(top_srcdir)/git.mk

cut-n-paste/totem-screensaver/README

@@ -1,3 +0,0 @@
-The sources for the screensaver enabling/disabling code are copied from Totem.
-A simple replacement (s/WITH_DBUS/ENABLE_DBUS/g) was needed. The hardcoded
-"reason for inhibiting" string was also modified.

cut-n-paste/totem-screensaver/totem-scrsaver.c

@@ -1,544 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-
-   Copyright (C) 2004-2006 Bastien Nocera <hadess@hadess.net>
-   Copyright © 2010 Christian Persch
-   Copyright © 2010 Carlos Garcia Campos
-
-   The Mate Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Mate Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Mate Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301  USA.
-
-   Authors: Bastien Nocera <hadess@hadess.net>
-            Christian Persch
-            Carlos Garcia Campos
- */
-
-#include "config.h"
-
-#include <glib/gi18n.h>
-
-#include <gdk/gdk.h>
-
-#ifdef GDK_WINDOWING_X11
-#include <gdk/gdkx.h>
-#include <X11/keysym.h>
-
-#ifdef HAVE_XTEST
-#include <X11/extensions/XTest.h>
-#endif /* HAVE_XTEST */
-#endif /* GDK_WINDOWING_X11 */
-
-#include "totem-scrsaver.h"
-
-#define GS_SERVICE   "org.gnome.SessionManager"
-#define GS_PATH      "/org/gnome/SessionManager"
-#define GS_INTERFACE "org.gnome.SessionManager"
-
-#define GSM_INHIBITOR_FLAG_IDLE 1 << 3
-#define XSCREENSAVER_MIN_TIMEOUT 60
-
-enum {
-	PROP_0,
-	PROP_REASON
-};
-
-static void totem_scrsaver_finalize   (GObject *object);
-
-struct TotemScrsaverPrivate {
-	/* Whether the screensaver is disabled */
-	gboolean disabled;
-	/* The reason for the inhibition */
-	char *reason;
-
-	GDBusProxy *gs_proxy;
-	gboolean have_session_dbus;
-	guint32 cookie;
-
-	/* To save the screensaver info */
-	int timeout;
-	int interval;
-	int prefer_blanking;
-	int allow_exposures;
-
-	/* For use with XTest */
-	int keycode1, keycode2;
-	int *keycode;
-	gboolean have_xtest;
-};
-
-G_DEFINE_TYPE(TotemScrsaver, totem_scrsaver, G_TYPE_OBJECT)
-
-static gboolean
-screensaver_is_running_dbus (TotemScrsaver *scr)
-{
-	return scr->priv->have_session_dbus;
-}
-
-static void
-on_inhibit_cb (GObject      *source_object,
-	       GAsyncResult *res,
-	       gpointer      user_data)
-{
-	GDBusProxy    *proxy = G_DBUS_PROXY (source_object);
-	TotemScrsaver *scr = TOTEM_SCRSAVER (user_data);
-	GVariant      *value;
-	GError        *error = NULL;
-
-	value = g_dbus_proxy_call_finish (proxy, res, &error);
-	if (!value) {
-		g_warning ("Problem inhibiting the screensaver: %s", error->message);
-		g_object_unref (scr);
-		g_error_free (error);
-
-		return;
-	}
-
-	/* save the cookie */
-	if (g_variant_is_of_type (value, G_VARIANT_TYPE ("(u)")))
-		g_variant_get (value, "(u)", &scr->priv->cookie);
-	else
-		scr->priv->cookie = 0;
-	g_variant_unref (value);
-	g_object_unref (scr);
-}
-
-static void
-on_uninhibit_cb (GObject      *source_object,
-		 GAsyncResult *res,
-		 gpointer      user_data)
-{
-	GDBusProxy    *proxy = G_DBUS_PROXY (source_object);
-	TotemScrsaver *scr = TOTEM_SCRSAVER (user_data);
-	GVariant      *value;
-	GError        *error = NULL;
-
-	value = g_dbus_proxy_call_finish (proxy, res, &error);
-	if (!value) {
-		g_warning ("Problem uninhibiting the screensaver: %s", error->message);
-		g_object_unref (scr);
-		g_error_free (error);
-
-		return;
-	}
-
-	/* clear the cookie */
-	scr->priv->cookie = 0;
-	g_variant_unref (value);
-
-	g_object_unref (scr);
-}
-
-static void
-screensaver_inhibit_dbus (TotemScrsaver *scr,
-			  gboolean	 inhibit)
-{
-	TotemScrsaverPrivate *priv = scr->priv;
-
-	if (!priv->have_session_dbus)
-		return;
-
-	g_object_ref (scr);
-
-	if (inhibit) {
-		g_return_if_fail (scr->priv->reason != NULL);
-		g_dbus_proxy_call (priv->gs_proxy,
-				   "Inhibit",
-				   g_variant_new ("(susu)",
-						  g_get_application_name (),
-						  0,
-						  scr->priv->reason,
-						  GSM_INHIBITOR_FLAG_IDLE),
-				   G_DBUS_CALL_FLAGS_NO_AUTO_START,
-				   -1,
-				   NULL,
-				   on_inhibit_cb,
-				   scr);
-	} else {
-		g_dbus_proxy_call (priv->gs_proxy,
-				   "Uninhibit",
-				   g_variant_new ("(u)", priv->cookie),
-				   G_DBUS_CALL_FLAGS_NO_AUTO_START,
-				   -1,
-				   NULL,
-				   on_uninhibit_cb,
-				   scr);
-	}
-}
-
-static void
-screensaver_enable_dbus (TotemScrsaver *scr)
-{
-	screensaver_inhibit_dbus (scr, FALSE);
-}
-
-static void
-screensaver_disable_dbus (TotemScrsaver *scr)
-{
-	screensaver_inhibit_dbus (scr, TRUE);
-}
-
-static void
-screensaver_update_dbus_presence (TotemScrsaver *scr)
-{
-	TotemScrsaverPrivate *priv = scr->priv;
-	gchar *name_owner;
-
-	name_owner = g_dbus_proxy_get_name_owner (priv->gs_proxy);
-	if (name_owner) {
-		priv->have_session_dbus = TRUE;
-		g_free (name_owner);
-	} else {
-		priv->have_session_dbus = FALSE;
-	}
-}
-
-static void
-screensaver_dbus_owner_changed_cb (GObject    *object,
-                                   GParamSpec *pspec,
-                                   gpointer    user_data)
-{
-	TotemScrsaver *scr = TOTEM_SCRSAVER (user_data);
-
-	screensaver_update_dbus_presence (scr);
-}
-
-static void
-screensaver_dbus_proxy_new_cb (GObject      *source,
-                               GAsyncResult *result,
-                               gpointer      user_data)
-{
-	TotemScrsaver *scr = TOTEM_SCRSAVER (user_data);
-	TotemScrsaverPrivate *priv = scr->priv;
-
-	priv->gs_proxy = g_dbus_proxy_new_for_bus_finish (result, NULL);
-	if (!priv->gs_proxy)
-		return;
-
-	screensaver_update_dbus_presence (scr);
-
-	g_signal_connect (priv->gs_proxy, "notify::g-name-owner",
-	                  G_CALLBACK (screensaver_dbus_owner_changed_cb),
-	                  scr);
-}
-
-static void
-screensaver_init_dbus (TotemScrsaver *scr)
-{
-	g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
-	                          G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-	                          NULL,
-	                          GS_SERVICE,
-	                          GS_PATH,
-	                          GS_INTERFACE,
-	                          NULL,
-	                          screensaver_dbus_proxy_new_cb,
-	                          scr);
-}
-
-static void
-screensaver_finalize_dbus (TotemScrsaver *scr)
-{
-	if (scr->priv->gs_proxy) {
-		g_object_unref (scr->priv->gs_proxy);
-	}
-}
-
-#ifdef GDK_WINDOWING_X11
-static void
-screensaver_enable_x11 (TotemScrsaver *scr)
-{
-	Display *display;
-
-#ifdef HAVE_XTEST
-	if (scr->priv->have_xtest != FALSE)
-	{
-		g_source_remove_by_user_data (scr);
-		return;
-	}
-#endif /* HAVE_XTEST */
-
-	display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-	XLockDisplay (display);
-	XSetScreenSaver (display,
-			scr->priv->timeout,
-			scr->priv->interval,
-			scr->priv->prefer_blanking,
-			scr->priv->allow_exposures);
-	XUnlockDisplay (display);
-}
-
-#ifdef HAVE_XTEST
-static gboolean
-fake_event (TotemScrsaver *scr)
-{
-	if (scr->priv->disabled)
-	{
-		Display *display;
-
-		display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-		XLockDisplay (display);
-		XTestFakeKeyEvent (display, *scr->priv->keycode,
-				True, CurrentTime);
-		XTestFakeKeyEvent (display, *scr->priv->keycode,
-				False, CurrentTime);
-		XUnlockDisplay (display);
-		/* Swap the keycode */
-		if (scr->priv->keycode == &scr->priv->keycode1)
-			scr->priv->keycode = &scr->priv->keycode2;
-		else
-			scr->priv->keycode = &scr->priv->keycode1;
-	}
-
-	return TRUE;
-}
-#endif /* HAVE_XTEST */
-
-static void
-screensaver_disable_x11 (TotemScrsaver *scr)
-{
-	Display *display;
-
-	display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-
-#ifdef HAVE_XTEST
-	if (scr->priv->have_xtest != FALSE)
-	{
-		XLockDisplay (display);
-		XGetScreenSaver(display, &scr->priv->timeout,
-				&scr->priv->interval,
-				&scr->priv->prefer_blanking,
-				&scr->priv->allow_exposures);
-		XUnlockDisplay (display);
-
-		if (scr->priv->timeout != 0) {
-			g_timeout_add_seconds (scr->priv->timeout / 2,
-					       (GSourceFunc) fake_event, scr);
-		} else {
-			g_timeout_add_seconds (XSCREENSAVER_MIN_TIMEOUT / 2,
-					       (GSourceFunc) fake_event, scr);
-		}
-
-		return;
-	}
-#endif /* HAVE_XTEST */
-
-	XLockDisplay (display);
-	XGetScreenSaver(display, &scr->priv->timeout,
-			&scr->priv->interval,
-			&scr->priv->prefer_blanking,
-			&scr->priv->allow_exposures);
-	XSetScreenSaver(display, 0, 0,
-			DontPreferBlanking, DontAllowExposures);
-	XUnlockDisplay (display);
-}
-
-static void
-screensaver_init_x11 (TotemScrsaver *scr)
-{
-#ifdef HAVE_XTEST
-	int a, b, c, d;
-	Display *display;
-
-	display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-
-	XLockDisplay (display);
-	scr->priv->have_xtest = (XTestQueryExtension (display, &a, &b, &c, &d) == True);
-	if (scr->priv->have_xtest != FALSE)
-	{
-		scr->priv->keycode1 = XKeysymToKeycode (display, XK_Alt_L);
-		if (scr->priv->keycode1 == 0) {
-			g_warning ("scr->priv->keycode1 not existent");
-		}
-		scr->priv->keycode2 = XKeysymToKeycode (display, XK_Alt_R);
-		if (scr->priv->keycode2 == 0) {
-			scr->priv->keycode2 = XKeysymToKeycode (display, XK_Alt_L);
-			if (scr->priv->keycode2 == 0) {
-				g_warning ("scr->priv->keycode2 not existent");
-			}
-		}
-		scr->priv->keycode = &scr->priv->keycode1;
-	}
-	XUnlockDisplay (display);
-#endif /* HAVE_XTEST */
-}
-
-static void
-screensaver_finalize_x11 (TotemScrsaver *scr)
-{
-	g_source_remove_by_user_data (scr);
-}
-#endif
-
-static void
-totem_scrsaver_get_property (GObject *object,
-			     guint property_id,
-			     GValue *value,
-			     GParamSpec *pspec)
-{
-	TotemScrsaver *scr;
-
-	scr = TOTEM_SCRSAVER (object);
-
-	switch (property_id)
-	{
-	case PROP_REASON:
-		g_value_set_string (value, scr->priv->reason);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-	}
-}
-
-static void
-totem_scrsaver_set_property (GObject *object,
-			     guint property_id,
-			     const GValue *value,
-			     GParamSpec *pspec)
-{
-	TotemScrsaver *scr;
-
-	scr = TOTEM_SCRSAVER (object);
-
-	switch (property_id)
-	{
-	case PROP_REASON:
-		g_free (scr->priv->reason);
-		scr->priv->reason = g_value_dup_string (value);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-	}
-}
-
-static void
-totem_scrsaver_class_init (TotemScrsaverClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	g_type_class_add_private (klass, sizeof (TotemScrsaverPrivate));
-
-	object_class->set_property = totem_scrsaver_set_property;
-	object_class->get_property = totem_scrsaver_get_property;
-	object_class->finalize = totem_scrsaver_finalize;
-
-	g_object_class_install_property (object_class, PROP_REASON,
-					 g_param_spec_string ("reason", NULL, NULL,
-							      NULL, G_PARAM_READWRITE));
-
-}
-
-/**
- * totem_scrsaver_new:
- *
- * Creates a #TotemScrsaver object.
- * If the MATE screen saver is running, it uses its DBUS interface to
- * inhibit the screensaver; otherwise it falls back to using the X
- * screensaver functionality for this.
- *
- * Returns: a newly created #TotemScrsaver
- */
-TotemScrsaver *
-totem_scrsaver_new (void)
-{
-	return TOTEM_SCRSAVER (g_object_new (TOTEM_TYPE_SCRSAVER, NULL));
-}
-
-static void
-totem_scrsaver_init (TotemScrsaver *scr)
-{
-	scr->priv = G_TYPE_INSTANCE_GET_PRIVATE (scr,
-						 TOTEM_TYPE_SCRSAVER,
-						 TotemScrsaverPrivate);
-
-	screensaver_init_dbus (scr);
-#ifdef GDK_WINDOWING_X11
-	screensaver_init_x11 (scr);
-#else
-#warning Unimplemented
-#endif
-}
-
-void
-totem_scrsaver_disable (TotemScrsaver *scr)
-{
-	g_return_if_fail (TOTEM_IS_SCRSAVER (scr));
-
-	if (scr->priv->disabled != FALSE)
-		return;
-
-	scr->priv->disabled = TRUE;
-
-	if (screensaver_is_running_dbus (scr) != FALSE)
-		screensaver_disable_dbus (scr);
-	else 
-#ifdef GDK_WINDOWING_X11
-		screensaver_disable_x11 (scr);
-#else
-#warning Unimplemented
-	{}
-#endif
-}
-
-void
-totem_scrsaver_enable (TotemScrsaver *scr)
-{
-	g_return_if_fail (TOTEM_IS_SCRSAVER (scr));
-
-	if (scr->priv->disabled == FALSE)
-		return;
-
-	scr->priv->disabled = FALSE;
-
-	if (screensaver_is_running_dbus (scr) != FALSE)
-		screensaver_enable_dbus (scr);
-	else
-#ifdef GDK_WINDOWING_X11
-		screensaver_enable_x11 (scr);
-#else
-#warning Unimplemented
-	{}
-#endif
-}
-
-void
-totem_scrsaver_set_state (TotemScrsaver *scr, gboolean enable)
-{
-	g_return_if_fail (TOTEM_IS_SCRSAVER (scr));
-
-	if (scr->priv->disabled == !enable)
-		return;
-
-	if (enable == FALSE)
-		totem_scrsaver_disable (scr);
-	else
-		totem_scrsaver_enable (scr);
-}
-
-static void
-totem_scrsaver_finalize (GObject *object)
-{
-	TotemScrsaver *scr = TOTEM_SCRSAVER (object);
-
-	g_free (scr->priv->reason);
-
-	screensaver_finalize_dbus (scr);
-#ifdef GDK_WINDOWING_X11
-	screensaver_finalize_x11 (scr);
-#else
-#warning Unimplemented
-	{}
-#endif
-
-	G_OBJECT_CLASS (totem_scrsaver_parent_class)->finalize (object);
-}

cut-n-paste/totem-screensaver/totem-scrsaver.h

@@ -1,57 +0,0 @@
-/* 
-   Copyright (C) 2004, Bastien Nocera <hadess@hadess.net>
-
-   The Mate Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Mate Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Mate Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301  USA.
-
-   Author: Bastien Nocera <hadess@hadess.net>
- */
-
-#ifndef TOTEM_SCRSAVER_H
-#define TOTEM_SCRSAVER_H
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define TOTEM_TYPE_SCRSAVER		(totem_scrsaver_get_type ())
-#define TOTEM_SCRSAVER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TOTEM_TYPE_SCRSAVER, TotemScrsaver))
-#define TOTEM_SCRSAVER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TOTEM_TYPE_SCRSAVER, TotemScrsaverClass))
-#define TOTEM_IS_SCRSAVER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TOTEM_TYPE_SCRSAVER))
-#define TOTEM_IS_SCRSAVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TOTEM_TYPE_SCRSAVER))
-
-typedef struct TotemScrsaver TotemScrsaver;
-typedef struct TotemScrsaverClass TotemScrsaverClass;
-typedef struct TotemScrsaverPrivate TotemScrsaverPrivate;
-
-struct TotemScrsaver {
-	GObject parent;
-	TotemScrsaverPrivate *priv;
-};
-
-struct TotemScrsaverClass {
-	GObjectClass parent_class;
-};
-
-GType totem_scrsaver_get_type		(void) G_GNUC_CONST;
-TotemScrsaver *totem_scrsaver_new       (void);
-void totem_scrsaver_enable		(TotemScrsaver *scr);
-void totem_scrsaver_disable		(TotemScrsaver *scr);
-void totem_scrsaver_set_state		(TotemScrsaver *scr,
-					 gboolean enable);
-
-G_END_DECLS
-
-#endif /* !TOTEM_SCRSAVER_H */

data/Makefile.am

@@ -15,14 +15,8 @@ man_MANS=atril.1
 
 uidir = $(pkgdatadir)
 ui_DATA =				\
-	atril-ui.xml			\
-	atril-toolbar.xml		\
 	hand-open.png
 
-if ENABLE_PREVIEWER
-ui_DATA += atril-previewer-ui.xml
-endif
-
 #
 # Desktop file
 #
@@ -51,7 +45,7 @@ endif
 # App data file
 #
 @INTLTOOL_XML_NOMERGE_RULE@
-appdatadir = $(datadir)/appdata
+appdatadir = $(datadir)/metainfo
 appdata_in_files = atril.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 

data/atril-toolbar.xml

@@ -14,6 +14,7 @@
     <toolitem name="ViewZoom"/>
     <toolitem name="ViewZoomIn"/>
     <toolitem name="ViewZoomOut"/>
+    <toolitem name="ViewZoomReset"/>
     <toolitem name="ViewFitPage"/>
     <toolitem name="ViewFitWidth"/>
     <toolitem name="ViewFullscreen"/>

data/atril-ui.xml

@@ -49,6 +49,7 @@
       <separator/>
       <menuitem name="ViewZoomInMenu" action="ViewZoomIn"/>
       <menuitem name="ViewZoomOutMenu" action="ViewZoomOut"/>
+      <menuitem name="ViewZoomResetMenu" action="ViewZoomReset"/>
       <menuitem name="ViewFitPageMenu" action="ViewFitPage"/>
       <menuitem name="ViewFitWidthMenu" action="ViewFitWidth"/>
       <menuitem name="ViewExpandWindowMenu" action="ViewExpandWindow"/>
@@ -128,6 +129,7 @@
   <accelerator name="KpMinusAccel" action="KpMinus"/>
   <accelerator name="CtrlKpPlusAccel" action="CtrlKpPlus"/>
   <accelerator name="CtrlKpMinusAccel" action="CtrlKpMinus"/>
+  <accelerator name="CtrlKpZeroAccel" action="CtrlKpZero"/>
   <accelerator name="CtrlInsertAccel" action="CtrlInsert" />
   <accelerator name="FitPageAccel" action ="FitPage" />
   <accelerator name="FitWidthAccel" action ="FitWidth" />

help/C/atril.html

@@ -1,493 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <meta http-equiv="Content-Style-Type" content="text/css" />
-  <meta name="generator" content="pandoc" />
-  <meta name="author" content="Oz Nahum (2012)" />
-  <meta name="author" content="Nickolay V. Shmyrev" />
-  <meta name="author" content="Niels Giesen" />
-  <meta name="author" content="Claude Paroz (2004)" />
-  <meta name="date" content="2012-09-18" />
-  <title>Atril</title>
-
-
-<style type="text/css">
-
-/*
-:Author: Enrico Troeger
-:Contact: enrico(dot)troeger(at)uvena(dot)de
-:Copyright: This stylesheet has been placed in the public domain.
-
-Stylesheet Atril is based on Geany's documentation based on a version of John Gabriele.
-see www.geany.org
-*/
-
-@media screen {
-
-	body {
-		background-color: #f2f2f2;
-		color: #404040;
-		margin-left: 0.4em;
-		max-width: 60em;
-		font-size: 90%;
-	}
-
-	a {
-		color: #990000;
-	}
-
-	a:visited {
-		color: #7E558E;
-	}
-
-	a:hover {
-		text-decoration: none;
-	}
-
-	h1 {
-		border-top: 1px dotted;
-		margin-top: 2em;
-	}
-
-	h1, h2, h3 {
-		font-family: sans-serif;
-		color: #5D0606;
-	}
-
-	h1.title {
-	  text-align: left }
-
-	h2 {
-		margin-top: 30px;
-	}
-
-	h2.subtitle {
-	  text-align: left }
-
-	h3 {
-		padding-left: 3px;
-	}
-
-	blockquote, pre {
-		border: 1px solid;
-		padding: 0.4em;
-	}
-
-	blockquote {
-		font-family: sans-serif;
-		background-color: #DBEDD5;
-		border: 1px dotted;
-		border-left: 4px solid;
-		border-color: #9FD98C;
-	}
-
-	pre {
-		background-color: #ECDFCE;
-		border: 1px dotted;
-		border-left: 4px solid;
-		border-color: #D9BE9A;
-	}
-
-	tt, pre, code {
-		color: #6D4212;
-	}
-
-	table {
-		border: 1px solid #D9BE9A;
-	}
-
-	th {
-		background-color: #ECDFCE;
-		border: 1px dotted #D9BE9A;
-	}
-
-	td {
-		border: 1px dotted #D9BE9A;
-	}
-
-	.docinfo-name {
-		color: #5D0606;
-	}
-
-	p.admonition-title {
-		color: #990000;
-		font-weight: bold;
-	}
-
-	div.note {
-		margin: 1em 3em;
-		padding: 0em;
-	}
-
-	dt {
-		font-style: italic;
-	}
-
-}
-
-@media print {
-
-}
-
-</style>
-</head>
-<body>
-
-<div class="document" id="Atril">
-<h1 class="title">Atril</h1>
-<h2 class="subtitle" id="Mate Document Viewer">A simple document viewer</h2>
-<table class="docinfo" frame="void" rules="none">
-<col class="docinfo-name" />
-<col class="docinfo-content" />
-<tbody valign="top">
-<tr><th class="docinfo-name">Authors:</th>
-<td>Oz Nahum (2012)
-<br /> Nickolay V. Shmyrev (2005)
-<br />Niels Giesen (2004)
-<br /> Claude Paroz (2004) </td></tr>
-<tr><th class="docinfo-name">Date:</th>
-<td>2012-09-18</td></tr>
-<tr><th class="docinfo-name">Version:</th>
-<td>1.22</td></tr>
-</tbody>
-</table>
-<p>Copyright © 2004-2012</p>
-<p>This document is distributed under the terms of the GNU General Public
-License as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version. A copy of this
-license can be found in the file COPYING included with the source code
-of this program, and also in the chapter 
-<a class="reference internal" href="#gnu-general-public-license">GNU General Public License</a>.</p>
-<div class="contents topic" id="contents">
-
-
-
-<h1 id="introduction">Introduction</h1>
-<p>Atril enables you to view documents of various formats like Portable Document Format (PDF) files and PostScript files. Atril follows Freedesktop.org and MATE standards to provide integration with Desktop Environment.</p>
-<h1 id="getting-started">Getting Started</h1>
-<h2 id="to-start-atril">To Start atril</h2>
-<p>atril starts when you open a document such as a PDF or PostScript file.</p>
-<p>Alternatively, you can start atril from the command line, with the command: <code>atril</code>.</p>
-<h2 id="when-you-start-atril">When You Start atril</h2>
-<p>When you start atril, the following window is displayed.</p>
-<div class="figure">
-<img src="figures/atril_start_window.png" alt="Shows atril main window. Contains titlebar, menubar, toolbar and display area. Menubar contains File, Edit, View, Go and Help menus." /><p class="caption">Shows atril main window. Contains titlebar, menubar, toolbar and display area. Menubar contains File, Edit, View, Go and Help menus.</p>
-</div>
-<p>Atril window contains the following elements:</p>
-<dl>
-<dt>Menubar</dt>
-<dd><p>The menus on the menubar contain all of the commands that you need to work with documents in APP.</p>
-</dd>
-<dt>Toolbar</dt>
-<dd><p>The toolbar contains a subset of the commands that you can access from the menubar.</p>
-</dd>
-<dt>Display area</dt>
-<dd><p>The display area displays the document.</p>
-</dd>
-</dl>
-<p>In atril, you can perform the same action in several ways. For example, you can open a document in the following ways:</p>
-<table>
-<col width="48%" />
-<col width="48%" />
-<thead>
-<tr class="header">
-<th align="left">UI Component</th>
-<th align="left">Action</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td align="left">Window</td>
-<td align="left">- Drag a file into the APP window from another application such as a file manager.</td>
-</tr>
-<tr class="even">
-<td align="left"></td>
-<td align="left">- Double-click on the file name in the file manager</td>
-</tr>
-<tr class="odd">
-<td align="left">Menubar</td>
-<td align="left">Choose FileOpen.</td>
-</tr>
-<tr class="even">
-<td align="left">Shortcut keys</td>
-<td align="left">Press CtrlO.</td>
-</tr>
-</tbody>
-</table>
-<p>This manual documents functionality from the menubar.</p>
-<h1 id="usage">Usage</h1>
-<h2 id="to-open-a-document">To Open A Document</h2>
-<p>To open a document, perform the following steps:</p>
-<ol style="list-style-type: decimal">
-<li><p>Choose FileOpen.</p></li>
-<li><p>In the Open Document dialog, select the file you want to open.</p></li>
-<li><p>Click Open. atril displays the name of the document in the titlebar of the window.</p></li>
-</ol>
-<p>To open another document, choose FileOpen again. atril opens each file in a new window.</p>
-<p>If you try to open a document with format that atril does not recognize, the application displays an error message.</p>
-<h2 id="to-navigate-through-a-document">To Navigate Through a Document</h2>
-<p>You can navigate through a file as follows:</p>
-<ul>
-<li><p>To view the next page, choose Go Next Page.</p></li>
-<li><p>To view the previous page, choose Go Previous Page.</p></li>
-<li><p>To view the first page in the document, choose Go First Page.</p></li>
-<li><p>To view the last page in the document, choose Go Last Page.</p></li>
-<li><p>To view a particular page, enter the page number or page label in the text box on the toolbar, then press Return.</p></li>
-</ul>
-<h2 id="to-scroll-a-page">To Scroll a Page</h2>
-<p>To display the page contents that are not currently displayed in the display area, use the following methods:</p>
-<ul>
-<li><p>Use the arrow keys or space key on the keyboard.</p></li>
-<li><p>Drag the display area by clicking with the middle mouse button somewhere in the document and then moving the mouse. For example, to scroll down the page, drag the display area upwards in the window.</p></li>
-<li><p>Use the scrollbars on the window.</p></li>
-</ul>
-<h2 id="to-change-the-page-size">To Change the Page Size</h2>
-<p>You can use the following methods to resize a page in the atril display area:</p>
-<ul>
-<li><p>To increase the page size, choose View Zoom In.</p></li>
-<li><p>To decrease the page size, choose View Zoom Out.</p></li>
-<li><p>To resize a page to have the same width as the atril display area, choose View Fit page width.</p></li>
-<li><p>To resize a page to fit within the atril display area, choose View Best Fit.</p></li>
-<li><p>To resize the atril window to have the same width and height as the screen, choose View Full Screen. To resize the atril window to the original size, click on the Exit Full Screen button.</p></li>
-</ul>
-<h2 id="to-view-pages-or-document-structure">To View Pages or Document Structure</h2>
-<p>To view bookmarks or pages, perform the following steps:</p>
-<ol style="list-style-type: decimal">
-<li><p>Choose View Sidebar or press F9.</p></li>
-<li><p>Use the drop-down list in the side-pane header to select whether to display document structure or pages in the side pane.</p></li>
-<li><p>Use the side-pane scrollbars to display the required item or page in the side pane.</p></li>
-<li><p>Click on an entry to navigate to that location in the document. Click on a page to navigate to that page in the document.</p></li>
-</ol>
-<h2 id="to-view-the-properties-of-a-document">To View the Properties of a Document</h2>
-<p>To view the properties of a document, choose File Properties.</p>
-<p>The Properties dialog displays all information available</p>
-<h2 id="to-print-a-document">To Print a Document</h2>
-<p>To print a Document, choose File Print.</p>
-<blockquote>
-<p><strong>Note</strong></p>
-<p>If you cannot choose the Print menu item, the author of the document has disabled the print option for this document. To enable the print option, you must enter the master password when you open the document.</p>
-</blockquote>
-<p>The Print dialog has the following tabbed sections:</p>
-<ul>
-<li><p><a href="#print-dialog-job">Job</a></p></li>
-<li><p><a href="#print-dialog-printer">Printer</a></p></li>
-<li><p><a href="#print-dialog-paper">Paper</a></p></li>
-</ul>
-<h3 id="job">Job</h3>
-<dl>
-<dt>Print range</dt>
-<dd><p>Select one of the following options to determine how many pages to print:</p>
-<ul>
-<li><p>All</p>
-<p>Select this option to print all of the pages in the document.</p></li>
-<li><p>Pages From</p>
-<p>Select this option to print the selected range of pages in the document. Use the spin boxes to specify the first page and last page of the range.</p></li>
-</ul>
-</dd>
-</dl>
-<h3 id="printer">Printer</h3>
-<dl>
-<dt>Printer</dt>
-<dd><p>Use this drop-down list to select the printer to which you want to print the document.</p>
-<blockquote>
-<p><strong>Note</strong></p>
-<p>The Create a PDF document option is not supported in this version of APP.</p>
-</blockquote>
-</dd>
-<dt>Settings</dt>
-<dd><p>Use this drop-down list to select the printer settings.</p>
-<p>To configure the printer, click Configure. For example, you can enable or disable duplex printing, or schedule delayed printing, if this functionality is supported by the printer.</p>
-</dd>
-<dt>Location</dt>
-<dd><p>Use this drop-down list to select one of the following print destinations:</p>
-<dl>
-<dt>CUPS</dt>
-<dd><p>Print the document to a CUPS printer.</p>
-<blockquote>
-<p><strong>Note</strong></p>
-<p>If the selected printer is a CUPS printer, CUPS is the only entry in this drop-down list.</p>
-</blockquote>
-</dd>
-<dt>lpr</dt>
-<dd><p>Print the document to a printer.</p>
-</dd>
-<dt>File</dt>
-<dd><p>Print the document to a PostScript file.</p>
-<p>Click Save As to display a dialog where you specify the name and location of the PostScript file.</p>
-</dd>
-<dt>Custom</dt>
-<dd><p>Use the specified command to print the document.</p>
-<p>Type the name of the command in the text box. Include all command-line arguments.</p>
-</dd>
-</dl>
-</dd>
-<dt>State</dt>
-<dd><p>This functionality is not supported in this version of atril.</p>
-</dd>
-<dt>Type</dt>
-<dd><p>This functionality is not supported in this version of atril.</p>
-</dd>
-<dt>Comment</dt>
-<dd><p>This functionality is not supported in this version of atril.</p>
-</dd>
-</dl>
-<h3 id="paper">Paper</h3>
-<dl>
-<dt>Paper size</dt>
-<dd><p>Use this drop-down list to select the size of the paper to which you want to print the document.</p>
-</dd>
-<dt>Width</dt>
-<dd><p>Use this spin box to specify the width of the paper. Use the adjacent drop-down list to change the measurement unit.</p>
-</dd>
-<dt>Height</dt>
-<dd><p>Use this spin box to specify the height of the paper.</p>
-</dd>
-<dt>Feed orientation</dt>
-<dd><p>Use this drop-down list to select the orientation of the paper in the printer.</p>
-</dd>
-<dt>Page orientation</dt>
-<dd><p>Use this drop-down list to select the page orientation.</p>
-</dd>
-<dt>Layout</dt>
-<dd><p>Use this drop-down list to select the page layout. A preview of each layout that you select is displayed in the Preview area.</p>
-</dd>
-<dt>Paper Tray</dt>
-<dd><p>Use this drop-down list to select the paper tray.</p>
-</dd>
-</dl>
-<h2 id="to-copy-a-document">To Copy a Document</h2>
-<p>To copy a file, perform the following steps:</p>
-<ol style="list-style-type: decimal">
-<li><p>Choose File Save a Copy.</p></li>
-<li><p>Type the new filename in the Filename text box in the Save a Copy dialog.</p>
-<p>If necessary, specify the location of the copied document. By default, copies are saved in your home directory.</p></li>
-<li><p>Click Save.</p></li>
-</ol>
-<h2 id="to-work-with-password-protected-documents">To Work With Password-Protected Documents</h2>
-<p>An author can use the following password levels to protect a document:</p>
-<ul>
-<li><p>User password that allows others only to read the document.</p></li>
-<li><p>Master password that allows others to perform additional actions, such as print the document.</p></li>
-</ul>
-<p>When you try to open a password-protected document, atril displays a security dialog. Type either the user password or the master password in the Enter document password text box, then click Open Document.</p>
-<h2 id="to-close-a-document">To Close a Document</h2>
-<p>To close a document, choose File Close.</p>
-<p>If the window is the last atril window open, the application exits.</p>
-<h1 id="list-of-keyboard-shortcuts">List of Keyboard Shortcuts</h1>
-<p>Below is a table of all shortcuts present in atril:</p>
-<table>
-<col width="33%" />
-<col width="38%" />
-<thead>
-<tr class="header">
-<th align="left">Shortcut</th>
-<th align="left">Action</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td align="left">Ctrl-O</td>
-<td align="left">Open an existing document</td>
-</tr>
-<tr class="even">
-<td align="left">Ctrl-S</td>
-<td align="left">Save a copy of the current document</td>
-</tr>
-<tr class="odd">
-<td align="left">Ctrl-P</td>
-<td align="left">Print document</td>
-</tr>
-<tr class="even">
-<td align="left">Ctrl-W</td>
-<td align="left">Close window</td>
-</tr>
-<tr class="odd">
-<td align="left">Ctrl-C</td>
-<td align="left">Copy selection</td>
-</tr>
-<tr class="even">
-<td align="left">Ctrl-A</td>
-<td align="left">Select All</td>
-</tr>
-<tr class="odd">
-<td align="left"><p>Ctrl-F ,</p>
-<p>/ (slash)</p></td>
-<td align="left">Find a word or phrase in the document</td>
-</tr>
-<tr class="even">
-<td align="left">Ctrl-G F3</td>
-<td align="left">Find next</td>
-</tr>
-<tr class="odd">
-<td align="left"><p>Ctrl + (plus sign)</p>
-<p>+</p>
-<p>=</p></td>
-<td align="left">Zoom in</td>
-</tr>
-<tr class="even">
-<td align="left">Ctrl -(minus sign),-</td>
-<td align="left">Zoom out</td>
-</tr>
-<tr class="odd">
-<td align="left">Ctrl-R</td>
-<td align="left">Reload the document</td>
-</tr>
-<tr class="even">
-<td align="left">Page Up</td>
-<td align="left">Go to the previous page</td>
-</tr>
-<tr class="odd">
-<td align="left">Page Down</td>
-<td align="left">Go to the next page</td>
-</tr>
-<tr class="even">
-<td align="left"><p>Space, j</p>
-<p>Shift Backspace</p>
-<p>Return</p></td>
-<td align="left">Scroll forward</td>
-</tr>
-<tr class="odd">
-<td align="left">Shift Space, k Backspace</td>
-<td align="left">Scroll backward</td>
-</tr>
-<tr class="even">
-<td align="left">Shift Return Shift Page Up</td>
-<td align="left">Go a bunch of pages up</td>
-</tr>
-<tr class="odd">
-<td align="left">Shift Page Down</td>
-<td align="left">Go a bunch of pages down</td>
-</tr>
-<tr class="even">
-<td align="left">Home</td>
-<td align="left">Go to the first page</td>
-</tr>
-<tr class="odd">
-<td align="left">End</td>
-<td align="left">Go to the last page</td>
-</tr>
-<tr class="even">
-<td align="left">Ctrl-L</td>
-<td align="left">Go to page by number or label</td>
-</tr>
-<tr class="odd">
-<td align="left">F1</td>
-<td align="left">Help</td>
-</tr>
-<tr class="even">
-<td align="left">F5</td>
-<td align="left">Run document as presentation</td>
-</tr>
-<tr class="odd">
-<td align="left">F9</td>
-<td align="left">Show or hide the side pane</td>
-</tr>
-<tr class="even">
-<td align="left">F11</td>
-<td align="left">Toggle fullscreen mode</td>
-</tr>
-</tbody>
-</table>
-</body>
-</html>

help/C/atril.md

@@ -1,388 +0,0 @@
-% Atril
-% Oz Nahum (2012); Nickolay V. Shmyrev; Niels Giesen; Claude Paroz (2004)
-% 18 September 2012
-
-
-Introduction
-============
-
-Atril enables you to view documents of various formats
-like Portable Document Format (PDF) files and PostScript files. Atril 
-follows Freedesktop.org and MATE standards to provide integration with
-Desktop Environment.
-
-Getting Started
-===============
-
-To Start atril
-----------------
-
-atril starts when you open a document such as a PDF or PostScript file.
-
-Alternatively, you can start atril from the command line, with the
-command: `atril`.
-
-When You Start atril
-----------------------
-
-When you start atril, the following window is displayed.
-
-![ Shows atril main window. Contains titlebar, menubar, toolbar and
-display area. Menubar contains File, Edit, View, Go and Help menus.
-](figures/atril_start_window.png)
-
-Atril window contains the following elements:
-
-Menubar
-:   The menus on the menubar contain all of the commands that you need
-    to work with documents in APP.
-
-Toolbar
-:   The toolbar contains a subset of the commands that you can access
-    from the menubar.
-
-Display area
-:   The display area displays the document.
-
-In atril, you can perform the same action in several ways. For example,
-you can open a document in the following ways:
-
-  -------------------------------------------------------------------------
-  UI Component                         Action
-  ------------------------------------ ------------------------------------
-  Window                               -   Drag a file into the APP window
-                                           from another application such as
-                                           a file manager.
-                                       
-                                       -   Double-click on the file name in
-                                           the file manager
-                                       
-                                       
-
-  Menubar                              Choose FileOpen.
-
-  Shortcut keys                        Press CtrlO.
-  -------------------------------------------------------------------------
-
-This manual documents functionality from the menubar.
-
-Usage
-=====
-
-To Open A Document
-------------------
-
-To open a document, perform the following steps:
-
-1.  Choose FileOpen.
-
-2.  In the Open Document dialog, select the file you want to open.
-
-3.  Click Open. atril displays the name of the document in the titlebar of
-    the window.
-
-To open another document, choose FileOpen again. atril opens each file in
-a new window.
-
-If you try to open a document with format that atril does not recognize,
-the application displays an error message.
-
-To Navigate Through a Document
-------------------------------
-
-You can navigate through a file as follows:
-
--   To view the next page, choose Go Next Page.
-
--   To view the previous page, choose Go Previous Page.
-
--   To view the first page in the document, choose Go First Page.
-
--   To view the last page in the document, choose Go Last Page.
-
--   To view a particular page, enter the page number or page label in
-    the text box on the toolbar, then press Return.
-
-To Scroll a Page
-----------------
-
-To display the page contents that are not currently displayed in the
-display area, use the following methods:
-
--   Use the arrow keys or space key on the keyboard.
-
--   Drag the display area by clicking with the middle mouse button
-    somewhere in the document and then moving the mouse. For example, to
-    scroll down the page, drag the display area upwards in the window.
-
--   Use the scrollbars on the window.
-
-To Change the Page Size
------------------------
-
-You can use the following methods to resize a page in the atril display
-area:
-
--   To increase the page size, choose View Zoom In.
-
--   To decrease the page size, choose View Zoom Out.
-
--   To resize a page to have the same width as the atril display area,
-    choose View Fit page width.
-
--   To resize a page to fit within the atril display area, choose View
-    Best Fit.
-
--   To resize the atril window to have the same width and height as the
-    screen, choose View Full Screen. To resize the atril window to the
-    original size, click on the Exit Full Screen button.
-
-To View Pages or Document Structure
------------------------------------
-
-To view bookmarks or pages, perform the following steps:
-
-1.  Choose View Sidebar or press F9.
-
-2.  Use the drop-down list in the side-pane header to select whether to
-    display document structure or pages in the side pane.
-
-3.  Use the side-pane scrollbars to display the required item or page in
-    the side pane.
-
-4.  Click on an entry to navigate to that location in the document.
-    Click on a page to navigate to that page in the document.
-
-To View the Properties of a Document
-------------------------------------
-
-To view the properties of a document, choose File Properties.
-
-The Properties dialog displays all information available
-
-To Print a Document
--------------------
-
-To print a Document, choose File Print.
-
-> **Note**
->
-> If you cannot choose the Print menu item, the author of the document
-> has disabled the print option for this document. To enable the print
-> option, you must enter the master password when you open the document.
-
-The Print dialog has the following tabbed sections:
-
--   [Job](#print-dialog-job)
-
--   [Printer](#print-dialog-printer)
-
--   [Paper](#print-dialog-paper)
-
-### Job
-
-Print range
-:   Select one of the following options to determine how many pages to
-    print:
-
-    -   All
-
-        Select this option to print all of the pages in the document.
-
-    -   Pages From
-
-        Select this option to print the selected range of pages in the
-        document. Use the spin boxes to specify the first page and last
-        page of the range.
-
-### Printer
-
-Printer
-:   Use this drop-down list to select the printer to which you want to
-    print the document.
-
-    > **Note**
-    >
-    > The Create a PDF document option is not supported in this version
-    > of APP.
-
-Settings
-:   Use this drop-down list to select the printer settings.
-
-    To configure the printer, click Configure. For example, you can
-    enable or disable duplex printing, or schedule delayed printing, if
-    this functionality is supported by the printer.
-
-Location
-:   Use this drop-down list to select one of the following print
-    destinations:
-
-    CUPS
-    :   Print the document to a CUPS printer.
-
-        > **Note**
-        >
-        > If the selected printer is a CUPS printer, CUPS is the only
-        > entry in this drop-down list.
-
-    lpr
-    :   Print the document to a printer.
-
-    File
-    :   Print the document to a PostScript file.
-
-        Click Save As to display a dialog where you specify the name and
-        location of the PostScript file.
-
-    Custom
-    :   Use the specified command to print the document.
-
-        Type the name of the command in the text box. Include all
-        command-line arguments.
-
-State
-:   This functionality is not supported in this version of atril.
-
-Type
-:   This functionality is not supported in this version of atril.
-
-Comment
-:   This functionality is not supported in this version of atril.
-
-### Paper
-
-Paper size
-:   Use this drop-down list to select the size of the paper to which you
-    want to print the document.
-
-Width
-:   Use this spin box to specify the width of the paper. Use the
-    adjacent drop-down list to change the measurement unit.
-
-Height
-:   Use this spin box to specify the height of the paper.
-
-Feed orientation
-:   Use this drop-down list to select the orientation of the paper in
-    the printer.
-
-Page orientation
-:   Use this drop-down list to select the page orientation.
-
-Layout
-:   Use this drop-down list to select the page layout. A preview of each
-    layout that you select is displayed in the Preview area.
-
-Paper Tray
-:   Use this drop-down list to select the paper tray.
-
-To Copy a Document
-------------------
-
-To copy a file, perform the following steps:
-
-1.  Choose File Save a Copy.
-
-2.  Type the new filename in the Filename text box in the Save a Copy
-    dialog.
-
-    If necessary, specify the location of the copied document. By
-    default, copies are saved in your home directory.
-
-3.  Click Save.
-
-To Work With Password-Protected Documents
------------------------------------------
-
-An author can use the following password levels to protect a document:
-
--   User password that allows others only to read the document.
-
--   Master password that allows others to perform additional actions,
-    such as print the document.
-
-When you try to open a password-protected document, atril displays a
-security dialog. Type either the user password or the master password in
-the Enter document password text box, then click Open Document.
-
-To Close a Document
--------------------
-
-To close a document, choose File Close.
-
-If the window is the last atril window open, the application exits.
-
-List of Keyboard Shortcuts
-==========================
-
-Below is a table of all shortcuts present in atril:
-
-
-+-----------------------+---------------------------+
-|  Shortcut             |         Action            |
-+=======================+===========================+
-| Ctrl-O                | Open an existing document |
-+-----------------------+---------------------------+
-|  Ctrl-S               | Save a copy of the current| 
-|                       |  document                 |
-+-----------------------+---------------------------+
-|  Ctrl-P               | Print document            |
-+-----------------------+---------------------------+
-| Ctrl-W                | Close window                 |
-+-----------------------+------------------------------+
-|  Ctrl-C               |    Copy selection            |
-+-----------------------+------------------------------+
-|  Ctrl-A               |   Select All                 |
-+-----------------------+------------------------------+
-| Ctrl-F ,              | Find a word or phrase in the |
-|                       | document                     |
-|  / (slash)            |                              |    
-+-----------------------+------------------------------+
-|  Ctrl-G               |  Find next                   |
-|  F3                   |                              |
-+-----------------------+------------------------------+
-|  Ctrl + (plus sign)   |  Zoom in                  | 
-|                       |                           | 
-|   +                   |                           |
-|                       |                           | 
-|   =                   |                           |  
-+-----------------------+---------------------------+
-|  Ctrl -(minus sign),- |  Zoom out                 |
-+-----------------------+---------------------------+
-|  Ctrl-R               |  Reload the document      |
-+-----------------------+---------------------------+
-|  Page Up              |  Go to the previous page  |
-+-----------------------+---------------------------+
-|  Page Down            |  Go to the next page      |
-+-----------------------+---------------------------+
-|  Space, j             |  Scroll forward           |
-|                       |                           |
-|  Shift Backspace      |                           |
-|                       |                           |
-|  Return               |                           |
-+-----------------------+---------------------------+
-|  Shift Space, k       | Scroll backward           |
-|  Backspace            |                           |
-+-----------------------+---------------------------+
-|  Shift Return         |                           |
-|  Shift Page Up        | Go a bunch of pages up    |
-+-----------------------+---------------------------+
-|  Shift Page Down      | Go a bunch of pages down  |
-+-----------------------+---------------------------+
-|  Home                 | Go to the first page      |  
-+-----------------------+---------------------------+
-|  End                  | Go to the last page       | 
-+-----------------------+---------------------------+
-| Ctrl-L                | Go to page by number or label|
-+-----------------------+---------------------------+
-|  F1                   | Help                      |  
-+-----------------------+---------------------------+
-| F5                    | Run document as presentation|
-+-----------------------+---------------------------+
-| F9                    | Show or hide the side pane|
-+-----------------------+---------------------------+
-| F11                   | Toggle fullscreen mode    |
-+-----------------------+---------------------------+
-
-
-

help/C/readme.txt

@@ -1,4 +0,0 @@
-xml docs converted to markdown using pandoc.
-
-pandoc -S -f docbook -t markdown atril.xml -o atril.md
- 

help/Makefile.am

@@ -6,6 +6,10 @@ HELP_ID = atril
 HELP_FILES = index.docbook legal.xml
 HELP_MEDIA = figures/atril_start_window.png
 
-HELP_LINGUAS = bg ca cs de el en_GB es eu fi fr it ja nl oc pt_BR ru sl sr sv uk vi zh_CN
+# Add linguas to be ignored, e.g. IGNORE_HELP_LINGUAS = ca de es fr
+IGNORE_HELP_LINGUAS =
+HELP_LINGUAS = $(if $(IGNORE_HELP_LINGUAS), \
+	$(filter-out $(IGNORE_HELP_LINGUAS),$(subst /,,$(dir $(wildcard */*.po)))), \
+	$(subst /,,$(dir $(wildcard */*.po))) )
 
 -include $(top_srcdir)/git.mk