[caja] 01/01: Remove obsolete patches

[Martin Wimpress]

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

flexiondotorg-guest pushed a commit to branch debian/experimental
in repository caja.

commit d2f130b4a932d582f814bfdf805a262fb246d929
Author: Martin Wimpress <code at flexion.org>
Date:   Wed Jun 10 16:52:41 2015 +0100

    Remove obsolete patches
---
 debian/patches/0001_fix-desktop-icon-size.patch    | 32 -------------------
 .../patches/0003_fix-crash-in-places-sidebar.patch | 36 ----------------------
 2 files changed, 68 deletions(-)

diff --git a/debian/patches/0001_fix-desktop-icon-size.patch b/debian/patches/0001_fix-desktop-icon-size.patch
deleted file mode 100644
index 58f205e..0000000
--- a/debian/patches/0001_fix-desktop-icon-size.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a823778ec6c091cada6f4473413f220d6732ed7a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=E9=AB=98=E7=BE=A4=E5=87=AF?= <lenky0401 at gmail.com>
-Date: Mon, 29 Dec 2014 17:29:07 +0800
-Subject: [PATCH] fixed: Adjust Default _zoom level always get the last "old"
- value
-
-The callback function update_auto_enum should be connected before the default_zoom_level_changed, otherwise the new_level always get the last "old" value in default_zoom_level_changed and the desktop-view display strange.
----
- src/file-manager/fm-desktop-icon-view.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
-index 06fdc93..7f02efb 100644
---- a/src/file-manager/fm-desktop-icon-view.c
-+++ b/src/file-manager/fm-desktop-icon-view.c
-@@ -600,6 +600,8 @@ fm_desktop_icon_view_init (FMDesktopIconView *desktop_icon_view)
-     g_signal_connect_object (desktop_icon_view, "unrealize",
-                              G_CALLBACK (unrealized_callback), desktop_icon_view, 0);
- 
-+    default_zoom_level_changed (desktop_icon_view);
-+
-     g_signal_connect_swapped (caja_icon_view_preferences,
-                               "changed::" CAJA_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL,
-                               G_CALLBACK (default_zoom_level_changed),
-@@ -610,7 +612,6 @@ fm_desktop_icon_view_init (FMDesktopIconView *desktop_icon_view)
-                               G_CALLBACK (font_changed_callback),
-                               desktop_icon_view);
- 
--    default_zoom_level_changed (desktop_icon_view);
-     fm_desktop_icon_view_update_icon_container_fonts (desktop_icon_view);
- 
-     g_signal_connect_swapped (mate_lockdown_preferences,
diff --git a/debian/patches/0003_fix-crash-in-places-sidebar.patch b/debian/patches/0003_fix-crash-in-places-sidebar.patch
deleted file mode 100644
index 69f696f..0000000
--- a/debian/patches/0003_fix-crash-in-places-sidebar.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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;
- 

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