Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian....@packages.debian.org
Usertags: pu
Please, apply this update with this patches:
1) Fix: open new window with tree view in side panel (Closes: #851523).
2) Don't crash on toggling "Show hidden and backup files" (Closes:
#797723).
3) Allow the user to drag'n'drop files into the bookmark section.
(Closes: #786395).
4) Filename font color now gets picked up from theme correctly for all
themes. (Closes: #770760).
Best Regards
Pablo Barciela
Debian MATE team member
-- System Information:
Debian Release: 9.0
APT prefers testing
APT policy: (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8)
diff -Nru caja-1.8.2/debian/changelog caja-1.8.2/debian/changelog
--- caja-1.8.2/debian/changelog 2015-05-11 09:28:52.000000000 +0200
+++ caja-1.8.2/debian/changelog 2017-04-25 10:30:09.000000000 +0200
@@ -1,3 +1,17 @@
+caja (1.8.2-3+deb8u2) jessie-proposed-updates; urgency=medium
+
+ * debian/patches:
+ + Add 0005_fix-tree-view-open-in-new-window.patch. Fix: open new window
+ with tree view in side panel (Closes: #851523).
+ + Add 0006_dont-crash-in-show-hidden-files.patch. don't crash on toggling
+ "Show hidden and backup files" (Closes: #797723)
+ + Add 0007_drag-and-drop-to-bookmarks-in-side-pane.patch. Allow the user
+ to drag'n'drop files into the bookmark section. (Closes: #786395).
+ + Add 0008_fix-filename-font-color.patch. Filename font color now gets
+ picked up from theme correctly for all themes. (Closes: #770760).
+
+ -- Pablo Barciela <s...@riseup.net> Tue, 25 Apr 2017 10:30:09 +0200
+
caja (1.8.2-3+deb8u1) jessie-proposed-updates; urgency=medium
* debian/patches:
diff -Nru caja-1.8.2/debian/patches/0005_fix-tree-view-open-in-new-window.patch
caja-1.8.2/debian/patches/0005_fix-tree-view-open-in-new-window.patch
--- caja-1.8.2/debian/patches/0005_fix-tree-view-open-in-new-window.patch
1970-01-01 01:00:00.000000000 +0100
+++ caja-1.8.2/debian/patches/0005_fix-tree-view-open-in-new-window.patch
2017-04-25 10:27:41.000000000 +0200
@@ -0,0 +1,45 @@
+From 3d3d4a2fd72d0403b097fb4d0a38edb68d0d6c83 Mon Sep 17 00:00:00 2001
+From: bl0ckeduser <bl0ckedusers...@gmail.com>
+Date: Thu, 13 Aug 2015 13:49:57 -0400
+Subject: [PATCH] Fix for #383 - tree view open in new window
+
+diff --git a/src/file-manager/fm-tree-view.c b/src/file-manager/fm-tree-view.c
+index ab2f159..60a5b1b 100644
+--- a/src/file-manager/fm-tree-view.c
++++ b/src/file-manager/fm-tree-view.c
+@@ -54,6 +54,10 @@
+ #include <libcaja-private/caja-module.h>
+ #include <libcaja-private/caja-window-info.h>
+ #include <libcaja-private/caja-window-slot-info.h>
++#include <libcaja-private/caja-directory.h>
++#include <libcaja-private/caja-directory-private.h>
++#include <libcaja-private/caja-file.h>
++#include <libcaja-private/caja-file-private.h>
+
+ #include <src/glibcompat.h> /* for g_list_free_full */
+
+@@ -122,6 +126,7 @@ static void fm_tree_view_activate_file (FMTreeView
*view,
+ CajaFile *file,
+ CajaWindowOpenFlags flags);
+ static GType fm_tree_view_provider_get_type (void);
++static GtkWindow *fm_tree_view_get_containing_window (FMTreeView *view);
+
+ static void create_popup_menu (FMTreeView *view);
+
+@@ -928,7 +933,15 @@ static void
+ fm_tree_view_open_in_new_window_cb (GtkWidget *menu_item,
+ FMTreeView *view)
+ {
+- fm_tree_view_activate_file (view, view->details->popup_file,
CAJA_WINDOW_OPEN_FLAG_NEW_WINDOW);
++ /* fm_tree_view_activate_file (view, view->details->popup_file,
CAJA_WINDOW_OPEN_FLAG_NEW_WINDOW); */
++
++ caja_mime_activate_file (fm_tree_view_get_containing_window (view),
++ caja_window_info_get_active_slot
(view->details->window),
++ view->details->popup_file,
++ g_file_get_path
(view->details->popup_file->details->directory->details->location),
++ CAJA_WINDOW_OPEN_FLAG_NEW_WINDOW,
++ 0,
++ 0);
+ }
+
+ static void
diff -Nru caja-1.8.2/debian/patches/0006_dont-crash-in-show-hidden-files.patch
caja-1.8.2/debian/patches/0006_dont-crash-in-show-hidden-files.patch
--- caja-1.8.2/debian/patches/0006_dont-crash-in-show-hidden-files.patch
1970-01-01 01:00:00.000000000 +0100
+++ caja-1.8.2/debian/patches/0006_dont-crash-in-show-hidden-files.patch
2017-04-25 10:27:41.000000000 +0200
@@ -0,0 +1,82 @@
+From 9a86c2cbc0b1e75f9073461ead8bc2d917694921 Mon Sep 17 00:00:00 2001
+From: monsta <mon...@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 -Nru
caja-1.8.2/debian/patches/0007_drag-and-drop-to-bookmarks-in-side-pane.patch
caja-1.8.2/debian/patches/0007_drag-and-drop-to-bookmarks-in-side-pane.patch
---
caja-1.8.2/debian/patches/0007_drag-and-drop-to-bookmarks-in-side-pane.patch
1970-01-01 01:00:00.000000000 +0100
+++
caja-1.8.2/debian/patches/0007_drag-and-drop-to-bookmarks-in-side-pane.patch
2017-04-25 10:27:41.000000000 +0200
@@ -0,0 +1,119 @@
+From 679688892cb9ea63606c41998ba4ed22642f36a2 Mon Sep 17 00:00:00 2001
+From: Monsta <mon...@inbox.ru>
+Date: Thu, 18 Jun 2015 16:09:40 +0300
+Subject: [PATCH] places-sidebar: enable both creating bookmarks and dropping
+ files
+
+- drag a folder to the top or bottom of the bookmark list to add
+a new bookmark. a horizontal line will be shown and the mouse
+pointer will have a '+' at its right side.
+- if there are no bookmarks (and that section isn't shown), drag
+a folder over the computer section's heading. this will add a new
+bookmark and make the bookmarks list visible.
+- drag a file or a folder over some existing bookmark to move it
+into the bookmarked folder. the mouse pointer will have an arrow
+at its right side.
+- if you want to copy a file or a folder there instead, perform
+the same operation but hold ctrl during that. the mouse pointer
+will have a '+' at its right side. no horizontal line will be
+shown, so you will be able to distinguish this operation from
+adding a new bookmark. :)
+
+adapted from
https://github.com/mate-desktop/caja/commit/3fdb9a14077b14263e8acfc93addc8fbcf568ca1
+with adjustments for 1.8 (different order of sidebar sections)
+---
+ src/caja-places-sidebar.c | 38 ++++++++++++++++++++++++--------------
+ 1 file changed, 24 insertions(+), 14 deletions(-)
+
+diff --git a/src/caja-places-sidebar.c b/src/caja-places-sidebar.c
+index f797497..1b45bdf 100644
+--- a/src/caja-places-sidebar.c
++++ b/src/caja-places-sidebar.c
+@@ -1130,11 +1130,13 @@ compute_drop_position (GtkTreeView *tree_view,
+ PLACES_SIDEBAR_COLUMN_SECTION_TYPE, §ion_type,
+ -1);
+
+- if (place_type == PLACES_HEADING && section_type != SECTION_BOOKMARKS) {
+- /* never drop on headings, but special case the bookmarks heading,
+- * so we can drop bookmarks in between it and the first item.
++ if (place_type == PLACES_HEADING &&
++ section_type != SECTION_BOOKMARKS &&
++ section_type != SECTION_COMPUTER) {
++ /* never drop on headings, but the bookmarks or computer heading
++ * is a special case, so we can create new bookmarks by dragging
++ * at the beginning or end of the bookmark list.
+ */
+-
+ gtk_tree_path_free (*path);
+ *path = NULL;
+
+@@ -1145,17 +1147,19 @@ compute_drop_position (GtkTreeView *tree_view,
+ sidebar->drag_data_received &&
+ sidebar->drag_data_info == GTK_TREE_MODEL_ROW) {
+ /* don't allow dropping bookmarks into non-bookmark areas */
+-
+- gtk_tree_path_free (*path);
+- *path = NULL;
++ gtk_tree_path_free (*path);
++ *path = NULL;
+
+ return FALSE;
+ }
+
+- if (section_type == SECTION_BOOKMARKS) {
++ /* drag to top or bottom of bookmark list to add a bookmark */
++ if (place_type == PLACES_HEADING && section_type == SECTION_BOOKMARKS) {
+ *pos = GTK_TREE_VIEW_DROP_AFTER;
++ } else if (place_type == PLACES_HEADING && section_type ==
SECTION_COMPUTER) {
++ *pos = GTK_TREE_VIEW_DROP_BEFORE;
+ } else {
+- /* non-bookmark shortcuts can only be dragged into */
++ /* or else you want to drag items INTO the existing bookmarks */
+ *pos = GTK_TREE_VIEW_DROP_INTO_OR_BEFORE;
+ }
+
+@@ -1266,10 +1270,10 @@ drag_motion_callback (GtkTreeView *tree_view,
+ }
+
+ if (pos == GTK_TREE_VIEW_DROP_BEFORE ||
+- pos == GTK_TREE_VIEW_DROP_AFTER )
++ pos == GTK_TREE_VIEW_DROP_AFTER )
+ {
+ if (sidebar->drag_data_received &&
+- sidebar->drag_data_info == GTK_TREE_MODEL_ROW)
++ sidebar->drag_data_info == GTK_TREE_MODEL_ROW)
+ {
+ action = GDK_ACTION_MOVE;
+ }
+@@ -1527,7 +1531,7 @@ drag_data_received_callback (GtkWidget *widget,
+ success = FALSE;
+
+ if (tree_pos == GTK_TREE_VIEW_DROP_BEFORE ||
+- tree_pos == GTK_TREE_VIEW_DROP_AFTER)
++ tree_pos == GTK_TREE_VIEW_DROP_AFTER)
+ {
+ model = gtk_tree_view_get_model (tree_view);
+
+@@ -1538,14 +1542,20 @@ drag_data_received_callback (GtkWidget *widget,
+
+ gtk_tree_model_get (model, &iter,
+ PLACES_SIDEBAR_COLUMN_SECTION_TYPE, §ion_type,
+- PLACES_SIDEBAR_COLUMN_ROW_TYPE, &place_type,
++ PLACES_SIDEBAR_COLUMN_ROW_TYPE, &place_type,
+ PLACES_SIDEBAR_COLUMN_INDEX, &position,
+ -1);
+
+- if (section_type != SECTION_BOOKMARKS) {
++ if (section_type != SECTION_BOOKMARKS &&
++ !(section_type == SECTION_COMPUTER && place_type ==
PLACES_HEADING)) {
+ goto out;
+ }
+
++ if (section_type == SECTION_COMPUTER && place_type == PLACES_HEADING
&&
++ tree_pos == GTK_TREE_VIEW_DROP_BEFORE) {
++ position = caja_bookmark_list_length (sidebar->bookmarks);
++ }
++
+ if (tree_pos == GTK_TREE_VIEW_DROP_AFTER && place_type !=
PLACES_HEADING) {
+ /* heading already has position 0 */
+ position++;
diff -Nru caja-1.8.2/debian/patches/0008_fix-filename-font-color.patch
caja-1.8.2/debian/patches/0008_fix-filename-font-color.patch
--- caja-1.8.2/debian/patches/0008_fix-filename-font-color.patch
1970-01-01 01:00:00.000000000 +0100
+++ caja-1.8.2/debian/patches/0008_fix-filename-font-color.patch
2017-04-25 10:27:41.000000000 +0200
@@ -0,0 +1,54 @@
+From: monsta <mon...@inbox.ru>
+Date: Wed, 16 Mar 2016 18:00:49 +0300
+Subject: fix font color issues
+
+taken from https://github.com/mate-desktop/caja/pull/526
+
+diff --git a/eel/eel-background.c b/eel/eel-background.c
+index dc1dc1f..cd66e25 100644
+--- a/eel/eel-background.c
++++ b/eel/eel-background.c
+@@ -355,8 +355,6 @@ eel_background_ensure_realized (EelBackground *self)
+
+ free_background_surface (self);
+
+- /* Calls mate_bg_set_color, which sets "ignore-pending-change" to false,
+- and queues emission of changed signal if it's still false */
+ set_image_properties (self);
+
+ window = gtk_widget_get_window (self->details->widget);
+@@ -365,12 +363,6 @@ eel_background_ensure_realized (EelBackground *self)
+
self->details->is_desktop);
+ self->details->unset_root_surface = self->details->is_desktop;
+
+- /* We got the surface and everything, so we don't care about a change
+- that is pending (unless things actually change after this time) */
+- g_object_set_data (G_OBJECT (self->details->bg),
+- "ignore-pending-change",
+- GINT_TO_POINTER (TRUE));
+-
+ self->details->bg_entire_width = width;
+ self->details->bg_entire_height = height;
+
+diff --git a/libcaja-private/caja-icon-container.c
b/libcaja-private/caja-icon-container.c
+index c33868d..e453a7a 100644
+--- a/libcaja-private/caja-icon-container.c
++++ b/libcaja-private/caja-icon-container.c
+@@ -4561,8 +4561,6 @@ realize (GtkWidget *widget)
+ /* Set up DnD. */
+ caja_icon_dnd_init (container);
+
+- setup_label_gcs (container);
+-
+ hadj = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (widget));
+ g_signal_connect (hadj, "value_changed",
+ G_CALLBACK (handle_hadjustment_changed), widget);
+@@ -9414,7 +9412,7 @@ setup_label_gcs (CajaIconContainer *container)
+ "frame_text", &frame_text,
+ NULL);
+
+- if (frame_text /* || !eel_background_is_set(background) */)
++ if (frame_text || !eel_background_is_set (background))
+ {
+ setup_gc_with_fg (container, LABEL_COLOR,
+ eel_gdk_color_to_rgb
(&style->text[GTK_STATE_NORMAL]));
diff -Nru caja-1.8.2/debian/patches/series caja-1.8.2/debian/patches/series
--- caja-1.8.2/debian/patches/series 2015-05-11 09:26:06.000000000 +0200
+++ caja-1.8.2/debian/patches/series 2017-04-25 10:27:41.000000000 +0200
@@ -2,3 +2,7 @@
0002_dont-start-desktop-outside-of-MATE-sessions.patch
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
+0007_drag-and-drop-to-bookmarks-in-side-pane.patch
+0008_fix-filename-font-color.patch
