diff -Nru caja-1.12.7/debian/changelog caja-1.12.7/debian/changelog
--- caja-1.12.7/debian/changelog	2016-03-31 14:50:27.000000000 +0300
+++ caja-1.12.7/debian/changelog	2017-10-30 16:04:22.000000000 +0300
@@ -1,3 +1,10 @@
+caja (1.12.7-1ubuntu1) UNRELEASED; urgency=medium
+
+  * fix-hidden-files-crash.patch: new patch. Fixes crash on toggling
+    "Show hidden and backup files" in prefs dialog (LP: #1619654)
+
+ -- Vlad Orlov <monsta@inbox.ru>  Mon, 30 Oct 2017 16:02:30 +0300
+
 caja (1.12.7-1) unstable; urgency=medium
 
   [ Martin Wimpress ]
diff -Nru caja-1.12.7/debian/patches/fix-hidden-files-crash.patch caja-1.12.7/debian/patches/fix-hidden-files-crash.patch
--- caja-1.12.7/debian/patches/fix-hidden-files-crash.patch	1970-01-01 03:00:00.000000000 +0300
+++ caja-1.12.7/debian/patches/fix-hidden-files-crash.patch	2017-10-30 16:02:27.000000000 +0300
@@ -0,0 +1,82 @@
+From 9a86c2cbc0b1e75f9073461ead8bc2d917694921 Mon Sep 17 00:00:00 2001
+From: monsta <monsta@inbox.ru>
+Date: Thu, 21 Apr 2016 17:15:34 +0300
+Subject: [PATCH] prefs dialog: don't crash on toggling "Show hidden and backup
+ files"
+
+adapted from:
+https://git.gnome.org/browse/nautilus/commit/?id=7428762ea6601abba086fcc5e57f443b2e2b40b5
+
+fixes https://github.com/mate-desktop/caja/issues/326
+---
+ src/caja-window-menus.c   | 25 ++++++++++++++-----------
+ src/caja-window-private.h |  2 +-
+ src/caja-window.c         |  2 +-
+ 3 files changed, 16 insertions(+), 13 deletions(-)
+
+Index: caja-1.12.7/src/caja-window-menus.c
+===================================================================
+--- caja-1.12.7.orig/src/caja-window-menus.c
++++ caja-1.12.7/src/caja-window-menus.c
+@@ -987,6 +987,20 @@ caja_window_initialize_menus (CajaWindow
+     caja_window_initialize_trash_icon_monitor (window);
+ }
+ 
++void
++caja_window_finalize_menus (CajaWindow *window)
++{
++    CajaTrashMonitor *monitor;
++
++    monitor = caja_trash_monitor_get ();
++
++    g_signal_handlers_disconnect_by_func (monitor,
++                                          trash_state_changed_cb, window);
++
++    g_signal_handlers_disconnect_by_func (caja_preferences,
++                                          show_hidden_files_preference_callback, window);
++}
++
+ static GList *
+ get_extension_menus (CajaWindow *window)
+ {
+@@ -1124,14 +1138,3 @@ caja_window_load_extension_menus (CajaWi
+     }
+ }
+ 
+-void
+-caja_window_remove_trash_monitor_callback (CajaWindow *window)
+-{
+-    CajaTrashMonitor *monitor;
+-
+-    monitor = caja_trash_monitor_get ();
+-
+-    g_signal_handlers_disconnect_by_func (monitor,
+-                                          trash_state_changed_cb, window);
+-}
+-
+Index: caja-1.12.7/src/caja-window-private.h
+===================================================================
+--- caja-1.12.7.orig/src/caja-window-private.h
++++ caja-1.12.7/src/caja-window-private.h
+@@ -168,7 +168,7 @@ void               caja_window_set_statu
+ void               caja_window_load_view_as_menus                    (CajaWindow    *window);
+ void               caja_window_load_extension_menus                  (CajaWindow    *window);
+ void               caja_window_initialize_menus                      (CajaWindow    *window);
+-void               caja_window_remove_trash_monitor_callback         (CajaWindow    *window);
++void               caja_window_finalize_menus                        (CajaWindow    *window);
+ CajaWindowPane *caja_window_get_next_pane                        (CajaWindow *window);
+ void               caja_menus_append_bookmark_to_menu                (CajaWindow    *window,
+         CajaBookmark  *bookmark,
+Index: caja-1.12.7/src/caja-window.c
+===================================================================
+--- caja-1.12.7.orig/src/caja-window.c
++++ caja-1.12.7/src/caja-window.c
+@@ -654,7 +654,7 @@ caja_window_finalize (GObject *object)
+ 
+     window = CAJA_WINDOW (object);
+ 
+-    caja_window_remove_trash_monitor_callback (window);
++    caja_window_finalize_menus (window);
+     free_stored_viewers (window);
+ 
+     if (window->details->bookmark_list != NULL)
diff -Nru caja-1.12.7/debian/patches/series caja-1.12.7/debian/patches/series
--- caja-1.12.7/debian/patches/series	1970-01-01 03:00:00.000000000 +0300
+++ caja-1.12.7/debian/patches/series	2017-10-30 16:02:21.000000000 +0300
@@ -0,0 +1 @@
+fix-hidden-files-crash.patch