[caja] 01/02: debian/patches: Add 0003_fix-crash-in-places-sidebar.patch. Fix crash caja crashing after USB drive eject if any bookmarks are present. (Closes: #780731).

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository caja.

commit 8135f0b2511469c27cf7a18b933c56c8e2987007
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Mar 23 18:18:20 2015 +0100

    debian/patches: Add 0003_fix-crash-in-places-sidebar.patch. Fix crash caja crashing after USB drive eject if any bookmarks are present. (Closes: #780731).
---
 .../patches/0003_fix-crash-in-places-sidebar.patch | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 37 insertions(+)

diff --git a/debian/patches/0003_fix-crash-in-places-sidebar.patch b/debian/patches/0003_fix-crash-in-places-sidebar.patch
new file mode 100644
index 0000000..69f696f
--- /dev/null
+++ b/debian/patches/0003_fix-crash-in-places-sidebar.patch
@@ -0,0 +1,36 @@
+From 0de3e198db38b4e819159d958148bb386430d4dc Mon Sep 17 00:00:00 2001
+From: Monsta <monsta at inbox.ru>
+Date: Wed, 18 Mar 2015 16:10:04 +0300
+Subject: [PATCH] places-sidebar: fix crash
+
+taken from upstream commits:
+https://git.gnome.org/browse/nautilus/commit/?id=cda2c75df4b95a481e8b774081ec1240d47fa45f
+https://git.gnome.org/browse/nautilus/commit/?id=4764a856c7a6e5a84d4067e7b105c09a93ffdbe4
+---
+ src/caja-places-sidebar.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/caja-places-sidebar.c b/src/caja-places-sidebar.c
+index 0e1ce9c..f797497 100644
+--- a/src/caja-places-sidebar.c
++++ b/src/caja-places-sidebar.c
+@@ -1455,7 +1455,7 @@ reorder_bookmarks (CajaPlacesSidebar *sidebar,
+     /* Get the selected path */
+ 
+     if (!get_selected_iter (sidebar, &iter))
+-        g_assert_not_reached ();
++        return;
+ 
+     gtk_tree_model_get (GTK_TREE_MODEL (sidebar->filter_model), &iter,
+                         PLACES_SIDEBAR_COLUMN_ROW_TYPE, &type,
+@@ -1520,7 +1520,9 @@ drag_data_received_callback (GtkWidget *widget,
+     }
+ 
+     /* Compute position */
+-    compute_drop_position (tree_view, x, y, &tree_path, &tree_pos, sidebar);
++    success = compute_drop_position (tree_view, x, y, &tree_path, &tree_pos, sidebar);
++    if (!success)
++        goto out;
+ 
+     success = FALSE;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 74a7d8f..eec05e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001_fix-desktop-icon-size.patch
 0002_dont-start-desktop-outside-of-MATE-sessions.patch
+0003_fix-crash-in-places-sidebar.patch

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