[caja] 01/01: debian/patches: Add 0006_dont-crash-in-show-hidden-files.patch. don't crash on toggling "Show hidden and backup files" (Closes: #797723)

[Pablo Barciela]

This is an automated email from the git hooks/post-receive script.

zenwalker-guest pushed a commit to branch debian/jessie/updates
in repository caja.

commit bf83b93ae2d37dc66065ecacc2734b71cf8bf8fa
Author: Pablo Barciela <scow at riseup.net>
Date:   Sun Apr 23 02:46:45 2017 +0200

    debian/patches: Add 0006_dont-crash-in-show-hidden-files.patch. don't crash on toggling "Show hidden and backup files" (Closes: #797723)
---
 .../0006_dont-crash-in-show-hidden-files.patch     | 82 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 83 insertions(+)

diff --git a/debian/patches/0006_dont-crash-in-show-hidden-files.patch b/debian/patches/0006_dont-crash-in-show-hidden-files.patch
new file mode 100644
index 0000000..5d73d71
--- /dev/null
+++ b/debian/patches/0006_dont-crash-in-show-hidden-files.patch
@@ -0,0 +1,82 @@
+From 9a86c2cbc0b1e75f9073461ead8bc2d917694921 Mon Sep 17 00:00:00 2001
+From: monsta <monsta at 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(-)
+
+diff --git a/src/caja-window-menus.c b/src/caja-window-menus.c
+index da442f5..4f1f067 100644
+--- a/src/caja-window-menus.c
++++ b/src/caja-window-menus.c
+@@ -986,6 +986,20 @@ caja_window_initialize_menus (CajaWindow *window)
+     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)
+ {
+@@ -1123,14 +1137,3 @@ caja_window_load_extension_menus (CajaWindow *window)
+     }
+ }
+ 
+-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);
+-}
+-
+diff --git a/src/caja-window-private.h b/src/caja-window-private.h
+index 73a9c29..1147163 100644
+--- a/src/caja-window-private.h
++++ b/src/caja-window-private.h
+@@ -168,7 +168,7 @@ void               caja_window_set_status                            (CajaWindow
+ 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,
+diff --git a/src/caja-window.c b/src/caja-window.c
+index 03a0103..1eca597 100644
+--- a/src/caja-window.c
++++ b/src/caja-window.c
+@@ -682,7 +682,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 --git a/debian/patches/series b/debian/patches/series
index 6263b61..cd1b18b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003_fix-crash-in-places-sidebar.patch
 0004_avoid-automounts-while-screen-is-locked.patch
 0005_fix-tree-view-open-in-new-window.patch
+0006_dont-crash-in-show-hidden-files.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/caja.git