22 files changed, 144 insertions, 203 deletions

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index e69de29..0000000
--- a/ChangeLog
+++ /dev/null
diff --git a/Makefile.am b/Makefile.am
index 82d04be..40554c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
+ACLOCAL_AMFLAGS = -I m4
+
 if ENABLE_CAJA_ACTIONS
 CAJA = caja
 else
@@ -36,7 +38,8 @@ DISTCLEANFILES =                        \
 	intltool-merge                  \
 	intltool-update
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
+DISTCHECK_CONFIGURE_FLAGS = --with-cajadir='$${libdir}/caja/extensions-2.0-distcheck'
+
 
 MAINTAINERCLEANFILES = \
 	$(srcdir)/INSTALL \
diff --git a/autogen.sh b/autogen.sh
index 7f350db..d489707 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="mate-file-archiver"
+PKG_NAME="engrampa"
 
 (test -f $srcdir/configure.ac) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
diff --git a/configure.ac b/configure.ac
index 7b13aa7..22e7a89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,11 +3,12 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.61)
 
 AC_INIT([engrampa], [1.6.0], [http://www.mate-desktop.org/])
-AM_INIT_AUTOMAKE([1.9 foreign])
+AM_INIT_AUTOMAKE([1.9 foreign dist-xz no-dist-gzip])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
 MATE_COMMON_INIT
 
@@ -169,8 +170,17 @@ AC_SUBST(DISABLE_DEPRECATED)
 dnl ******************************
 
 
-CAJA_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libcaja-extension`
-AC_SUBST(CAJA_EXTENSION_DIR)
+AC_ARG_WITH(cajadir,
+        AS_HELP_STRING([--with-cajadir=DIR],[Installation path for Caja extension @<:@auto@:>@]),
+        [ac_with_cajadir=$withval],
+        [ac_with_cajadir=""])
+if test "${ac_with_cajadir}" = ""; then
+        ac_with_cajadir=`pkg-config --variable=extensiondir libcaja-extension`
+fi
+
+AC_MSG_NOTICE([installing caja plugin in ${ac_with_cajadir}])
+AC_SUBST([CAJA_EXTENSION_DIR],[${ac_with_cajadir}])
+
 
 dnl ******************************
 
@@ -207,7 +217,7 @@ Configuration:
 	Source code location:   ${srcdir}
 	Compiler:               ${CC}
 	Internal mkdtemp:       ${mkdtemp_missing}
-	Caja support:       ${build_caja_actions}
+	Caja support:           ${build_caja_actions}
 	PackageKit support:     ${enable_packagekit}
 	Run in place            ${enable_run_in_place}
 	JSON support:           ${enable_json_glib}
diff --git a/copy-n-paste/Makefile.am b/copy-n-paste/Makefile.am
index f5a2bcb..2b7d18e 100644
--- a/copy-n-paste/Makefile.am
+++ b/copy-n-paste/Makefile.am
@@ -1,7 +1,6 @@
-AM_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \
-	   -DGDK_DISABLE_DEPRECATED \
-	   -DG_DISABLE_DEPRECATED \
-	   -UGETTEXT_PACKAGE
+AM_CPPFLAGS = \
+	$(DISABLE_DEPRECATED) \
+	-UGETTEXT_PACKAGE
 
 noinst_LTLIBRARIES = libeggsmclient.la
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 41375d6..2c7fc8e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -53,6 +53,7 @@ CLEANFILES = \
        $(gsettings_SCHEMAS) \
        $(NULL)
 
-dist-hook: cd $(distdir); rm -f $(CLEANFILES)
+dist-hook: 
+	cd $(distdir); rm -f $(CLEANFILES)
 
 -include $(top_srcdir)/git.mk
diff --git a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD
deleted file mode 100644
index 6b357c9..0000000
--- a/distro/archlinux/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Maintainer: Spyros Stathopoulos <[email protected]>
-# Contributor: Alessio Sergi <asergi at archlinux dot us>
-pkgname=mate-extract
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="Archive manipulator for MATE"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('desktop-file-utils' 'mate-conf' 'hicolor-icon-theme')
-makedepends=('mate-doc-utils' 'intltool')
-conflicts=('engrampa' 'engrampa2')
-optdepends=('unrar: for RAR uncompression'
-'zip: for ZIP archives' 'unzip: for ZIP archives'
-'p7zip: 7zip compression utility' 'arj: for ARJ archives'
-'unace: extraction tool for the proprietary ace archive format')
-options=('!libtool' '!emptydirs')
-install=mate-extract.install
-url="http://matsusoft.com.ar/projects"
-groups=('mate-extras')
-source=(http://sourceforge.net/projects/matede/files/${pkgver}/${pkgname}.tar.gz/download)
-md5sums=('4f26837dca3752cc9d17cdbcb16c4ed5')
-
-build() {
-	cd "$srcdir/$pkgname"
-
-	mate-doc-prepare --force
-	autoreconf -i
-	aclocal
-
-	./configure --prefix=/usr \
-		--disable-static \
-		--localstatedir=/var \
-		--libexecdir=/usr/lib/${pkgname} \
-		--disable-scrollkeeper \
-		--disable-schemas-install \
-		--sysconfdir=/etc \
-		--disable-packagekit
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname"
-	make MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir/" install
-	install -d -m755 "${pkgdir}/usr/share/mateconf/schemas"
-	mateconf-merge-schema "${pkgdir}/usr/share/mateconf/schemas/${pkgname}.schemas" --domain ${pkgname} "${pkgdir}/etc/mateconf/schemas/*.schemas"
-	rm -f "${pkgdir}/etc/mateconf/schemas/*.schemas"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/distro/archlinux/mate-file-archiver.install b/distro/archlinux/mate-file-archiver.install
deleted file mode 100644
index fbbe087..0000000
--- a/distro/archlinux/mate-file-archiver.install
+++ /dev/null
@@ -1,25 +0,0 @@
-pkgname=engrampa
-
-post_install() {
-	usr/sbin/mateconfpkg --install ${pkgname}
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-	update-desktop-database -q
-}
-
-pre_upgrade() {
-	pre_remove $1
-}
-
-post_upgrade() {
-	post_install $1
-}
-
-pre_remove() {
-	usr/sbin/mateconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-	update-desktop-database -q
-}
-
diff --git a/help/bg/bg.po b/help/bg/bg.po
index 4a2ca2e..1422c8a 100644
--- a/help/bg/bg.po
+++ b/help/bg/bg.po
@@ -1201,8 +1201,8 @@ msgstr ""
 msgid ""
 "<application>Engrampa</application> also provides ways of extracting "
 "files from an archive in a file manager window, without opening a "
-"<application>Engrampa</application> window. See <xref linkend=\"file-"
-"roller-fmgr\"/> for more information."
+"<application>Engrampa</application> window. See <xref linkend=\""
+"engrampa-fmgr\"/> for more information."
 msgstr ""
 "<application>Engrampa</application> също предоставя начин за "
 "разархивиране на файлове от архив чрез прозореца на файловия мениджър, без "
@@ -1222,8 +1222,8 @@ msgstr ""
 #: engrampa.xml:594(para)
 msgid ""
 "The Extract operation does not change the contents of the archive. For "
-"information on how to delete files from an archive, see <xref linkend=\"file-"
-"roller-delete-files\"/>. For information on how to delete an archive, see "
+"information on how to delete files from an archive, see <xref linkend=\""
+"engrampa-delete-files\"/>. For information on how to delete an archive, see "
 "<xref linkend=\"engrampa-delete-archive\"/>."
 msgstr ""
 "Операцията по разархивирането не променя съдържанието на архива. За повече "
@@ -1323,8 +1323,8 @@ msgid ""
 "Add files to the new archive as described in <xref linkend=\"engrampa-add-"
 "files\"/>. <note><placeholder-1/></note>"
 msgstr ""
-"Добавете файлове към новия архив както е описано в <xref linkend=\"file-"
-"roller-add-files\"/>. <note><placeholder-1/></note>"
+"Добавете файлове към новия архив както е описано в <xref linkend=\""
+"engrampa-add-files\"/>. <note><placeholder-1/></note>"
 
 #: engrampa.xml:617(para)
 msgid "To create an archive, perform the following steps: <placeholder-1/>"
@@ -1832,11 +1832,11 @@ msgstr ""
 
 #: engrampa.xml:935(para)
 msgid ""
-"You can restore an archive from Trash, as described in <xref linkend=\"file-"
-"roller-restore-archive\"/>."
+"You can restore an archive from Trash, as described in <xref linkend=\""
+"engrampa-restore-archive\"/>."
 msgstr ""
-"Може да възвърнете архив от Кошчето, както е описано в <xref linkend=\"file-"
-"roller-restore-archive\"/>."
+"Може да възвърнете архив от Кошчето, както е описано в <xref linkend=\""
+"engrampa-restore-archive\"/>."
 
 #: engrampa.xml:943(title)
 msgid "To Restore an Archive"
diff --git a/help/ca/ca.po b/help/ca/ca.po
index 7ec7b18..0cfe0a6 100644
--- a/help/ca/ca.po
+++ b/help/ca/ca.po
@@ -844,8 +844,8 @@ msgid ""
 msgstr ""
 "La barra de carpetes us permet navegar a través de les carpetes d'un arxiu. "
 "El <application>gestor d'arxius</application> només mostra la barra de "
-"carpetes en la visualització per carpeta. Vegeu la <xref linkend=\"file-"
-"roller-view-type-folder\"/> per a obtenir més informació."
+"carpetes en la visualització per carpeta. Vegeu la <xref linkend=\""
+"engrampa-view-type-folder\"/> per a obtenir més informació."
 
 #: C/engrampa.xml:445(term)
 msgid "Display area"
@@ -1317,8 +1317,8 @@ msgstr ""
 msgid ""
 "<application>Archive Manager</application> also provides ways of extracting "
 "files from an archive in a file manager window, without opening a "
-"<application>Archive Manager</application> window. See <xref linkend=\"file-"
-"roller-fmgr\"/> for more information."
+"<application>Archive Manager</application> window. See <xref linkend=\""
+"engrampa-fmgr\"/> for more information."
 msgstr ""
 "El <application>gestor d'arxius</application> també proporciona maneres "
 "d'extreure fitxers d'un arxiu des de la finestra del gestor de fitxers sense "
@@ -1338,8 +1338,8 @@ msgstr ""
 #: C/engrampa.xml:653(para)
 msgid ""
 "The Extract operation does not change the contents of the archive. For "
-"information on how to delete files from an archive, see <xref linkend=\"file-"
-"roller-delete-files\"/>."
+"information on how to delete files from an archive, see <xref linkend=\""
+"engrampa-delete-files\"/>."
 msgstr ""
 "L'operació d'extreure no canvia els continguts de l'arxiu. Per a obtenir més "
 "informació sobre com suprimir fitxers d'un arxiu, vegeu la <xref linkend="
@@ -1463,8 +1463,8 @@ msgid ""
 "Add files to the new archive as described in <xref linkend=\"engrampa-add-"
 "files\"/>. <placeholder-1/>"
 msgstr ""
-"Afegiu fitxers a l'arxiu nou com es descriu en la <xref linkend=\"file-"
-"roller-add-files\"/>. <placeholder-1/>"
+"Afegiu fitxers a l'arxiu nou com es descriu en la <xref linkend=\""
+"engrampa-add-files\"/>. <placeholder-1/>"
 
 #: C/engrampa.xml:678(para)
 msgid "To create an archive, perform the following steps: <placeholder-1/>"
@@ -1545,8 +1545,8 @@ msgid ""
 msgstr ""
 "També podeu afegir fitxers a un arxiu des d'una finestra del gestor de "
 "fitxers, sense obrir una finestra del <application>gestor d'arxius</"
-"application>. Per a obtenir més informació vegeu la <xref linkend=\"file-"
-"roller-fmgr\"/>."
+"application>. Per a obtenir més informació vegeu la <xref linkend=\""
+"engrampa-fmgr\"/>."
 
 #: C/engrampa.xml:736(para)
 msgid ""
@@ -2162,8 +2162,8 @@ msgstr ""
 "finestra està en visualització per fitxer, quan esteu en visualització per "
 "carpeta la ubicació dels fitxers es mostrarà en el quadre de text "
 "<guilabel>Ubicació</guilabel> a la barra de carpetes. Per a obtenir més "
-"informació sobre els tipus de visualització, vegeu la <xref linkend=\"file-"
-"roller-view-type-folder\"/>."
+"informació sobre els tipus de visualització, vegeu la <xref linkend=\""
+"engrampa-view-type-folder\"/>."
 
 #: C/engrampa.xml:1035(para)
 msgid ""
diff --git a/help/de/de.po b/help/de/de.po
index 18b3cd1..48f948c 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -1318,8 +1318,8 @@ msgid ""
 "For more information about passwords, see <xref linkend=\"engrampa-encrypt-"
 "files\"/>."
 msgstr ""
-"Weitere Informationen zu Passwörtern finden Sie in <xref linkend=\"file-"
-"roller-encrypt-files\"/>."
+"Weitere Informationen zu Passwörtern finden Sie in <xref linkend=\""
+"engrampa-encrypt-files\"/>."
 
 #: C/engrampa.xml:618(para)
 msgid ""
@@ -1333,8 +1333,8 @@ msgstr ""
 msgid ""
 "<application>Archive Manager</application> also provides ways of extracting "
 "files from an archive in a file manager window, without opening a "
-"<application>Archive Manager</application> window. See <xref linkend=\"file-"
-"roller-fmgr\"/> for more information."
+"<application>Archive Manager</application> window. See <xref linkend=\""
+"engrampa-fmgr\"/> for more information."
 msgstr ""
 "Der <application>Archivmanager</application> bietet auch die Möglichkeit, "
 "Dateien aus einem Archiv in einem Dateimanager-Fenster zu entpacken, ohne "
@@ -1356,8 +1356,8 @@ msgstr ""
 #: C/engrampa.xml:653(para)
 msgid ""
 "The Extract operation does not change the contents of the archive. For "
-"information on how to delete files from an archive, see <xref linkend=\"file-"
-"roller-delete-files\"/>."
+"information on how to delete files from an archive, see <xref linkend=\""
+"engrampa-delete-files\"/>."
 msgstr ""
 "Der Archivinhalt wird beim Entpacken nicht geändert. Wie Sie Dateien aus "
 "einem Archiv löschen, erfahren Sie in <xref linkend=\"engrampa-delete-files"
@@ -2218,12 +2218,12 @@ msgstr ""
 #: C/engrampa.xml:1066(para)
 msgid ""
 "For information on how to customize the way that <application>Archive "
-"Manager</application> displays the archive contents, see <xref linkend=\"file-"
-"roller-archive-custom\"/>."
+"Manager</application> displays the archive contents, see <xref linkend=\""
+"engrampa-archive-custom\"/>."
 msgstr ""
 "Informationen über die Anpassung der Anzeige des Archivinhalts durch den "
-"<application>Archivmanager</application> finden Sie in <xref linkend=\"file-"
-"roller-archive-custom\"/>."
+"<application>Archivmanager</application> finden Sie in <xref linkend=\""
+"engrampa-archive-custom\"/>."
 
 #: C/engrampa.xml:1068(para)
 msgid ""
@@ -2799,8 +2799,8 @@ msgid ""
 "encryption, see <xref linkend=\"engrampa-encrypt-files\"/>."
 msgstr ""
 "Nicht alle Archivtypen unterstützen Verschlüsselungen. Weitere Informationen "
-"über die Verschlüsselung von Dateien finden Sie in <xref linkend=\"file-"
-"roller-encrypt-files\"/>."
+"über die Verschlüsselung von Dateien finden Sie in <xref linkend=\""
+"engrampa-encrypt-files\"/>."
 
 #: C/engrampa.xml:1373(guilabel)
 msgid "Encrypt the file list too"
diff --git a/help/el/el.po b/help/el/el.po
index ae1b9ae..491afc4 100644
--- a/help/el/el.po
+++ b/help/el/el.po
@@ -1355,8 +1355,8 @@ msgstr ""
 msgid ""
 "<application>Archive Manager</application> also provides ways of extracting "
 "files from an archive in a file manager window, without opening a "
-"<application>Archive Manager</application> window. See <xref linkend=\"file-"
-"roller-fmgr\"/> for more information."
+"<application>Archive Manager</application> window. See <xref linkend=\""
+"engrampa-fmgr\"/> for more information."
 msgstr ""
 "Ο <application>Διαχειριστής συμπιεσμένων αρχείων</application> επίσης "
 "παρέχει τρόπους αποσυμπίεσης αρχείων από ένα συμπιεσμένο αρχείο στον "
@@ -1378,8 +1378,8 @@ msgstr ""
 #: C/engrampa.xml:653(para)
 msgid ""
 "The Extract operation does not change the contents of the archive. For "
-"information on how to delete files from an archive, see <xref linkend=\"file-"
-"roller-delete-files\"/>."
+"information on how to delete files from an archive, see <xref linkend=\""
+"engrampa-delete-files\"/>."
 msgstr ""
 "Η λειτουργία Αποσυμπίεσης δεν αλλάζει τα περιεχόμενα του συμπιεσμένου "
 "αρχείου. Για πληροφορίες σχετικά με τη διαγραφή αρχείων από ένα συμπιεσμένο "
@@ -2240,8 +2240,8 @@ msgstr ""
 "ορατή μόνο όταν το παράθυρο βρίσκεται σε προβολή αρχείων, όταν βρίσκεται σε "
 "προβολή φακέλων η τοποθεσία των αρχείων εμφανίζεται στο πεδίο "
 "<guilabel>Τοποθεσία</guilabel> της μπάρας φακέλων. Για περισσότερες "
-"πληροφορίες σχετικά με τους τύπους προβολής δείτε <xref linkend=\"file-"
-"roller-view-type-folder\"/>."
+"πληροφορίες σχετικά με τους τύπους προβολής δείτε <xref linkend=\""
+"engrampa-view-type-folder\"/>."
 
 #: C/engrampa.xml:1035(para)
 msgid ""
@@ -2444,8 +2444,8 @@ msgid ""
 msgstr ""
 "Αν το συμπιεσμένο αρχείο περιέχει φακέλους, μπορείτε να προβάλετε τα "
 "περιεχόμενα του συμπιεσμένου αρχείου είτε σε <link linkend=\"engrampa-"
-"view-type-folder\">προβολή φακέλων</link> είτε σε <link linkend=\"file-"
-"roller-view-type-file\">προβολή αρχείων</link>."
+"view-type-folder\">προβολή φακέλων</link> είτε σε <link linkend=\""
+"engrampa-view-type-file\">προβολή αρχείων</link>."
 
 #: C/engrampa.xml:1139(title)
 msgid "Folder View"
@@ -2882,8 +2882,8 @@ msgid ""
 "encryption, see <xref linkend=\"engrampa-encrypt-files\"/>."
 msgstr ""
 "Δεν υποστηρίζουν όλοι οι τύποι αρχείων κωδικοποίηση. Για περισσότερες "
-"πληροφορίες για την κωδικοποίηση αρχείων, δείτε το <xref linkend=\"file-"
-"roller-encrypt-files\"/>."
+"πληροφορίες για την κωδικοποίηση αρχείων, δείτε το <xref linkend=\""
+"engrampa-encrypt-files\"/>."
 
 #: C/engrampa.xml:1373(guilabel)
 msgid "Encrypt the file list too"
diff --git a/help/en_GB/en_GB.po b/help/en_GB/en_GB.po
index eca5ddc..092ef65 100644
--- a/help/en_GB/en_GB.po
+++ b/help/en_GB/en_GB.po
@@ -1298,13 +1298,13 @@ msgstr ""
 msgid ""
 "<application>Archive Manager</application> also provides ways of extracting "
 "files from an archive in a file manager window, without opening a "
-"<application>Archive Manager</application> window. See <xref linkend=\"file-"
-"roller-fmgr\"/> for more information."
+"<application>Archive Manager</application> window. See <xref linkend=\""
+"engrampa-fmgr\"/> for more information."
 msgstr ""
 "<application>Archive Manager</application> also provides ways of extracting "
 "files from an archive in a file manager window, without opening a "
-"<application>Archive Manager</application> window. See <xref linkend=\"file-"
-"roller-fmgr\"/> for more information."
+"<application>Archive Manager</application> window. See <xref linkend=\""
+"engrampa-fmgr\"/> for more information."
 
 #: C/engrampa.xml:646(para)
 msgid ""
@@ -1319,12 +1319,12 @@ msgstr ""
 #: C/engrampa.xml:649(para)
 msgid ""
 "The Extract operation does not change the contents of the archive. For "
-"information on how to delete files from an archive, see <xref linkend=\"file-"
-"roller-delete-files\"/>."
+"information on how to delete files from an archive, see <xref linkend=\""
+"engrampa-delete-files\"/>."
 msgstr ""
 "The Extract operation does not change the contents of the archive. For "
-"information on how to delete files from an archive, see <xref linkend=\"file-"
-"roller-delete-files\"/>."
+"information on how to delete files from an archive, see <xref linkend=\""
+"engrampa-delete-files\"/>."
 
 #: C/engrampa.xml:656(title)
 msgid "To Close an Archive"
diff --git a/help/es/es.po b/help/es/es.po
index bb76145..01d24ab 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -1329,8 +1329,8 @@ msgid ""
 "For more information about passwords, see <xref linkend=\"engrampa-"
 "encrypt-files\"/>."
 msgstr ""
-"Para más información sobre de las contraseñas, vea la <xref linkend=\"file-"
-"roller-encrypt-files\"/>."
+"Para más información sobre de las contraseñas, vea la <xref linkend=\""
+"engrampa-encrypt-files\"/>."
 
 #: C/engrampa.xml:618(para)
 msgid ""
@@ -1344,8 +1344,8 @@ msgstr ""
 msgid ""
 "<application>Archive Manager</application> also provides ways of extracting "
 "files from an archive in a file manager window, without opening a "
-"<application>Archive Manager</application> window. See <xref linkend=\"file-"
-"roller-fmgr\"/> for more information."
+"<application>Archive Manager</application> window. See <xref linkend=\""
+"engrampa-fmgr\"/> for more information."
 msgstr ""
 "El <application>Gestor de archivadores</application> ofrece también formas "
 "de extraer archivos de un archivador dentro de una ventana del administrador "
@@ -1367,8 +1367,8 @@ msgstr ""
 #: C/engrampa.xml:653(para)
 msgid ""
 "The Extract operation does not change the contents of the archive. For "
-"information on how to delete files from an archive, see <xref linkend=\"file-"
-"roller-delete-files\"/>."
+"information on how to delete files from an archive, see <xref linkend=\""
+"engrampa-delete-files\"/>."
 msgstr ""
 "La operación de extracción no cambia el contenido del archivador. Para más "
 "información sobre cómo borrar archivos desde dentro de un archivador, vea la "
@@ -1565,8 +1565,8 @@ msgid ""
 "more information on this option."
 msgstr ""
 "El diálogo <guilabel>Añadir archivos</guilabel> proporciona la opción "
-"<guilabel>Añadir sólo si es más nuevo</guilabel>, vea <xref linkend=\"file-"
-"roller-add-options\"/> para más información acerca de esta opción."
+"<guilabel>Añadir sólo si es más nuevo</guilabel>, vea <xref linkend=\""
+"engrampa-add-options\"/> para más información acerca de esta opción."
 
 #: C/engrampa.xml:735(para)
 msgid ""
@@ -2831,8 +2831,8 @@ msgid ""
 "encryption, see <xref linkend=\"engrampa-encrypt-files\"/>."
 msgstr ""
 "No todos los tipos de archivador soportan cifrado. Para obtener más "
-"información acerca del cifrado de archivos consulte la <xref linkend=\"file-"
-"roller-encrypt-files\"/>."
+"información acerca del cifrado de archivos consulte la <xref linkend=\""
+"engrampa-encrypt-files\"/>."
 
 #: C/engrampa.xml:1373(guilabel)
 msgid "Encrypt the file list too"
diff --git a/help/fr/fr.po b/help/fr/fr.po
index f501dc7..7ca4df1 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -849,8 +849,8 @@ msgid ""
 msgstr ""
 "La barre des dossiers permet de naviguer dans l'arborescence d'une archive. "
 "Le <application>gestionnaire d'archives</application> n'affiche la barre des "
-"dossiers qu'en mode d'affichage dossier. Consultez <xref linkend=\"file-"
-"roller-view-type-folder\"/> pour plus d'informations."
+"dossiers qu'en mode d'affichage dossier. Consultez <xref linkend=\""
+"engrampa-view-type-folder\"/> pour plus d'informations."
 
 #: C/engrampa.xml:445(term)
 msgid "Display area"
@@ -1218,8 +1218,8 @@ msgid ""
 msgstr ""
 "Si vous essayez d'ouvrir une archive créée dans un format que le "
 "<application>gestionnaire d'archives</application> ne connaît pas, "
-"l'application affiche un message d'erreur. Consultez <xref linkend=\"file-"
-"roller-intro\"/> pour trouver une liste des formats pris en charge."
+"l'application affiche un message d'erreur. Consultez <xref linkend=\""
+"engrampa-intro\"/> pour trouver une liste des formats pris en charge."
 
 #: C/engrampa.xml:607(title)
 msgid "To Select Files in an Archive"
@@ -1336,8 +1336,8 @@ msgstr ""
 msgid ""
 "<application>Archive Manager</application> also provides ways of extracting "
 "files from an archive in a file manager window, without opening a "
-"<application>Archive Manager</application> window. See <xref linkend=\"file-"
-"roller-fmgr\"/> for more information."
+"<application>Archive Manager</application> window. See <xref linkend=\""
+"engrampa-fmgr\"/> for more information."
 msgstr ""
 "Le <application>gestionnaire d'archives</application> permet également "
 "d'extraire les fichiers d'une archive depuis le gestionnaire de fichiers, "
@@ -1358,12 +1358,12 @@ msgstr ""
 #: C/engrampa.xml:653(para)
 msgid ""
 "The Extract operation does not change the contents of the archive. For "
-"information on how to delete files from an archive, see <xref linkend=\"file-"
-"roller-delete-files\"/>."
+"information on how to delete files from an archive, see <xref linkend=\""
+"engrampa-delete-files\"/>."
 msgstr ""
 "L'opération d'extraction ne change pas le contenu de l'archive. Pour savoir "
-"comment supprimer des fichiers d'une archive, consultez <xref linkend=\"file-"
-"roller-delete-files\"/>."
+"comment supprimer des fichiers d'une archive, consultez <xref linkend=\""
+"engrampa-delete-files\"/>."
 
 #: C/engrampa.xml:660(title)
 msgid "To Close an Archive"
@@ -2173,8 +2173,8 @@ msgid ""
 msgstr ""
 "La taille du fichier lorque celui-ci est extrait de l'archive. Pour un "
 "dossier, le champ <guilabel>Taille</guilabel> est vide. Pour savoir comment "
-"afficher la taille du fichier compressé, consultez <xref linkend=\"file-"
-"roller-extra-info\"/>."
+"afficher la taille du fichier compressé, consultez <xref linkend=\""
+"engrampa-extra-info\"/>."
 
 #: C/engrampa.xml:1048(guilabel)
 msgid "Type"
@@ -2992,8 +2992,8 @@ msgid ""
 "more information about filename patterns."
 msgstr ""
 "Saisissez un motif de nom de fichier dans cette zone de texte afin d'inclure "
-"tous les fichiers correspondant à ce motif. Consultez <xref linkend=\"file-"
-"roller-pattern\"/> pour en savoir plus sur les motifs de nom de fichier."
+"tous les fichiers correspondant à ce motif. Consultez <xref linkend=\""
+"engrampa-pattern\"/> pour en savoir plus sur les motifs de nom de fichier."
 
 #: C/engrampa.xml:1455(guilabel)
 msgid "Exclude files"
@@ -3006,8 +3006,8 @@ msgid ""
 "more information about filename patterns."
 msgstr ""
 "Saisissez un motif de nom de fichier dans cette zone de texte afin d'exclure "
-"tous les fichiers correspondant à ce motif. Consultez <xref linkend=\"file-"
-"roller-pattern\"/> pour en savoir plus sur les motifs de nom de fichier."
+"tous les fichiers correspondant à ce motif. Consultez <xref linkend=\""
+"engrampa-pattern\"/> pour en savoir plus sur les motifs de nom de fichier."
 
 #: C/engrampa.xml:1463(guilabel)
 msgid "Exclude folders"
@@ -3020,8 +3020,8 @@ msgid ""
 "more information about filename patterns."
 msgstr ""
 "Saisissez un motif de nom de fichier dans cette zone de texte afin d'exclure "
-"tous les dossiers correspondant à ce motif. Consultez <xref linkend=\"file-"
-"roller-pattern\"/> pour en savoir plus sur les motifs de nom de fichier."
+"tous les dossiers correspondant à ce motif. Consultez <xref linkend=\""
+"engrampa-pattern\"/> pour en savoir plus sur les motifs de nom de fichier."
 
 #: C/engrampa.xml:1471(guilabel)
 msgid "Include subfolders"
diff --git a/help/it/it.po b/help/it/it.po
index b89278f..fc9c882 100644
--- a/help/it/it.po
+++ b/help/it/it.po
@@ -1341,8 +1341,8 @@ msgstr ""
 msgid ""
 "<application>Archive Manager</application> also provides ways of extracting "
 "files from an archive in a file manager window, without opening a "
-"<application>Archive Manager</application> window. See <xref linkend=\"file-"
-"roller-fmgr\"/> for more information."
+"<application>Archive Manager</application> window. See <xref linkend=\""
+"engrampa-fmgr\"/> for more information."
 msgstr ""
 "Con <application>Gestore di archivi</application> viene anche fornito un "
 "metodo per estrarre i file in un archivio anche da una finestra del file "
@@ -1364,8 +1364,8 @@ msgstr ""
 #: C/engrampa.xml:653(para)
 msgid ""
 "The Extract operation does not change the contents of the archive. For "
-"information on how to delete files from an archive, see <xref linkend=\"file-"
-"roller-delete-files\"/>."
+"information on how to delete files from an archive, see <xref linkend=\""
+"engrampa-delete-files\"/>."
 msgstr ""
 "L'operazione di estrazione non cambia il contenuto dell'archivio. Per "
 "maggiori informazioni su come eliminare i file da un archivio, consultare "
@@ -1491,8 +1491,8 @@ msgid ""
 "Add files to the new archive as described in <xref linkend=\"engrampa-add-"
 "files\"/>. <placeholder-1/>"
 msgstr ""
-"Aggiungere file nel nuovo archivio come descritto in <xref linkend=\"file-"
-"roller-add-files\"/>. <placeholder-1/>"
+"Aggiungere file nel nuovo archivio come descritto in <xref linkend=\""
+"engrampa-add-files\"/>. <placeholder-1/>"
 
 #: C/engrampa.xml:678(para)
 msgid "To create an archive, perform the following steps: <placeholder-1/>"
diff --git a/help/ja/ja.po b/help/ja/ja.po
index 0dec4b9..7b70bdd 100644
--- a/help/ja/ja.po
+++ b/help/ja/ja.po
@@ -1310,8 +1310,8 @@ msgstr ""
 msgid ""
 "<application>Archive Manager</application> also provides ways of extracting "
 "files from an archive in a file manager window, without opening a "
-"<application>Archive Manager</application> window. See <xref linkend=\"file-"
-"roller-fmgr\"/> for more information."
+"<application>Archive Manager</application> window. See <xref linkend=\""
+"engrampa-fmgr\"/> for more information."
 msgstr ""
 "<application>書庫マネージャ</application>は、<application>書庫マネージャ</"
 "application>ウィンドウを開かずにファイルマネージャで書庫からファイルを展開す"
@@ -1331,8 +1331,8 @@ msgstr ""
 #: C/engrampa.xml:653(para)
 msgid ""
 "The Extract operation does not change the contents of the archive. For "
-"information on how to delete files from an archive, see <xref linkend=\"file-"
-"roller-delete-files\"/>."
+"information on how to delete files from an archive, see <xref linkend=\""
+"engrampa-delete-files\"/>."
 msgstr ""
 "展開操作は、書庫の内容を変更しません。書庫からファイルを削除する方法について"
 "は、<xref linkend=\"engrampa-delete-files\"/>を参照してください。"
@@ -1425,8 +1425,8 @@ msgid ""
 "\"engrampa-create-options\"/>."
 msgstr ""
 "<guilabel>その他のオプション</guilabel>をクリックして、必要な作成オプションを"
-"選択してください。作成オプションについての詳しい情報は、<xref linkend=\"file-"
-"roller-create-options\"/>を参照してください。"
+"選択してください。作成オプションについての詳しい情報は、<xref linkend=\""
+"engrampa-create-options\"/>を参照してください。"
 
 #: C/engrampa.xml:697(para)
 msgid ""
@@ -2297,8 +2297,8 @@ msgid ""
 "Specify the order in which to display files in the list. For more "
 "information, see <xref linkend=\"engrampa-view-sort\"/>."
 msgstr ""
-"一覧でファイルを表示する順番を指定してください。詳細は、<xref linkend=\"file-"
-"roller-view-sort\"/>を参照してください。"
+"一覧でファイルを表示する順番を指定してください。詳細は、<xref linkend=\""
+"engrampa-view-sort\"/>を参照してください。"
 
 #: C/engrampa.xml:1126(para)
 msgid ""
diff --git a/help/oc/oc.po b/help/oc/oc.po
index 5ed2524..ef4283f 100644
--- a/help/oc/oc.po
+++ b/help/oc/oc.po
@@ -1019,8 +1019,8 @@ msgstr ""
 msgid ""
 "<application>Archive Manager</application> also provides ways of extracting "
 "files from an archive in a file manager window, without opening a "
-"<application>Archive Manager</application> window. See <xref linkend=\"file-"
-"roller-fmgr\"/> for more information."
+"<application>Archive Manager</application> window. See <xref linkend=\""
+"engrampa-fmgr\"/> for more information."
 msgstr ""
 
 #: ../C/engrampa.xml:605(para)
@@ -1033,8 +1033,8 @@ msgstr ""
 #: ../C/engrampa.xml:608(para)
 msgid ""
 "The Extract operation does not change the contents of the archive. For "
-"information on how to delete files from an archive, see <xref linkend=\"file-"
-"roller-delete-files\"/>."
+"information on how to delete files from an archive, see <xref linkend=\""
+"engrampa-delete-files\"/>."
 msgstr ""
 
 #: ../C/engrampa.xml:615(title)
diff --git a/help/ru/ru.po b/help/ru/ru.po
index 4c0a9ee..567187a 100644
--- a/help/ru/ru.po
+++ b/help/ru/ru.po
@@ -1200,8 +1200,8 @@ msgid ""
 "For more information about passwords, see <xref linkend=\"engrampa-"
 "encrypt-files\"/>."
 msgstr ""
-"Для более подробной информации о паролях, смотрите <xref linkend=\"file-"
-"roller-encrypt-files\"/>."
+"Для более подробной информации о паролях, смотрите <xref linkend=\""
+"engrampa-encrypt-files\"/>."
 
 #: C/engrampa.xml:573(para)
 msgid ""
@@ -1215,8 +1215,8 @@ msgstr ""
 msgid ""
 "<application>Archive Manager</application> also provides ways of extracting "
 "files from an archive in a file manager window, without opening a "
-"<application>Archive Manager</application> window. See <xref linkend=\"file-"
-"roller-fmgr\"/> for more information."
+"<application>Archive Manager</application> window. See <xref linkend=\""
+"engrampa-fmgr\"/> for more information."
 msgstr ""
 "<application>Менеджер Архивов</application> также предоставляет возможность "
 "распаковывать файлы из архивов, не открывая окно <application>Менеджера "
@@ -1236,8 +1236,8 @@ msgstr ""
 #: C/engrampa.xml:608(para)
 msgid ""
 "The Extract operation does not change the contents of the archive. For "
-"information on how to delete files from an archive, see <xref linkend=\"file-"
-"roller-delete-files\"/>."
+"information on how to delete files from an archive, see <xref linkend=\""
+"engrampa-delete-files\"/>."
 msgstr ""
 "Операция извлечения не изменяет содержимого архива. Для информации о том, "
 "как удалять файлы из архива, смотрите <xref linkend=\"engrampa-delete-"
@@ -1929,8 +1929,8 @@ msgid ""
 "\"engrampa-archive-custom\"/>."
 msgstr ""
 "Чтобы узнать, как изменить характер отображения <application>Менеджером "
-"Архивов</application> содержимого архива, смотрите <xref linkend=\"file-"
-"roller-archive-custom\"/>."
+"Архивов</application> содержимого архива, смотрите <xref linkend=\""
+"engrampa-archive-custom\"/>."
 
 #: C/engrampa.xml:984(para)
 msgid ""
diff --git a/help/uk/uk.po b/help/uk/uk.po
index 84c284d..99bb3b8 100644
--- a/help/uk/uk.po
+++ b/help/uk/uk.po
@@ -691,8 +691,8 @@ msgid ""
 msgstr ""
 "Панель тек дозволяє переміщуватись у архіві між теками. "
 "<application>Менеджер архівів</application> відображає панель тек лише у "
-"режимі перегляду тек. Докладнішу інформацію дивіться у <xref linkend=\"file-"
-"roller-view-type-folder\"/>."
+"режимі перегляду тек. Докладнішу інформацію дивіться у <xref linkend=\""
+"engrampa-view-type-folder\"/>."
 
 #: ../C/engrampa.xml:357(term)
 msgid "Display area"
@@ -1213,8 +1213,8 @@ msgstr ""
 msgid ""
 "<application>Archive Manager</application> also provides ways of extracting "
 "files from an archive in a file manager window, without opening a "
-"<application>Archive Manager</application> window. See <xref linkend=\"file-"
-"roller-fmgr\"/> for more information."
+"<application>Archive Manager</application> window. See <xref linkend=\""
+"engrampa-fmgr\"/> for more information."
 msgstr ""
 "<application>Менеджер архівів</application> забезпечує спосіб розпаковування "
 "файлів з архіву у вікні менеджера файлів, без відкривання вікна програм "
@@ -1234,8 +1234,8 @@ msgstr ""
 #: ../C/engrampa.xml:608(para)
 msgid ""
 "The Extract operation does not change the contents of the archive. For "
-"information on how to delete files from an archive, see <xref linkend=\"file-"
-"roller-delete-files\"/>."
+"information on how to delete files from an archive, see <xref linkend=\""
+"engrampa-delete-files\"/>."
 msgstr ""
 "Операція розпаковування не змінює вміст архіву. Інформацію про видалення "
 "файлів з архіву дивіться у <xref linkend=\"engrampa-delete-files\"/>."
diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po
index 4727a6d..65b4ccb 100644
--- a/help/zh_CN/zh_CN.po
+++ b/help/zh_CN/zh_CN.po
@@ -1209,8 +1209,8 @@ msgid ""
 "Select the required extract options. For more information about the extract "
 "options, see <xref linkend=\"engrampa-extract-options\"/>."
 msgstr ""
-"选择所需的解压选项。更多关于解压缩选项的信息，参见<xref linkend=\"file-"
-"roller-extract-options\"/>。"
+"选择所需的解压选项。更多关于解压缩选项的信息，参见<xref linkend=\""
+"engrampa-extract-options\"/>。"
 
 #: C/engrampa.xml:633(para)
 msgid "Click <guibutton>Extract</guibutton>."
@@ -1253,8 +1253,8 @@ msgstr "从一个打开的归档文件中释放文件，请按以下步骤操作
 msgid ""
 "<application>Archive Manager</application> also provides ways of extracting "
 "files from an archive in a file manager window, without opening a "
-"<application>Archive Manager</application> window. See <xref linkend=\"file-"
-"roller-fmgr\"/> for more information."
+"<application>Archive Manager</application> window. See <xref linkend=\""
+"engrampa-fmgr\"/> for more information."
 msgstr ""
 "<application>归档管理器</application> 也提供了在文件管理器窗口中从归档文件释"
 "放文件的方式，不用打开<application>归档管理器</application>。参见<xref "
@@ -1272,8 +1272,8 @@ msgstr ""
 #: C/engrampa.xml:653(para)
 msgid ""
 "The Extract operation does not change the contents of the archive. For "
-"information on how to delete files from an archive, see <xref linkend=\"file-"
-"roller-delete-files\"/>."
+"information on how to delete files from an archive, see <xref linkend=\""
+"engrampa-delete-files\"/>."
 msgstr ""
 "解压文件不改变压缩文档的内容，关于在文档中删除文件的介绍，请参阅：<xref "
 "linkend=\"engrampa-delete-files\"/>。"
diff --git a/src/fr-window.c b/src/fr-window.c
index 0b36aea..d986b9c 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -8005,6 +8005,8 @@ fr_window_open_files_with_application (FrWindow *window,
 	if (window->priv->activity_ref > 0)
 		return;
 
+	g_assert (file_list != NULL);
+
 	for (scan = file_list; scan; scan = scan->next)
 		uris = g_list_prepend (uris, g_filename_to_uri (scan->data, NULL, NULL));