[caja] 01/02: debian/patches: Drop 0000_revert_add_column_autosizing.patch and 0001_fix-high-cpu-while-loading-background-image.patch. Applied upstream.

[Martin Wimpress]

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

flexiondotorg-guest pushed a commit to branch master
in repository caja.

commit 28618fd6023646b06daea408ff2908bc8c3efcff
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Mon Nov 13 22:51:47 2017 +0000

    debian/patches: Drop 0000_revert_add_column_autosizing.patch and 0001_fix-high-cpu-while-loading-background-image.patch. Applied upstream.
---
 .../0000_revert_add_column_autosizing.patch        | 33 ----------------------
 ...x-high-cpu-while-loading-background-image.patch | 29 -------------------
 debian/patches/series                              |  2 --
 3 files changed, 64 deletions(-)

diff --git a/debian/patches/0000_revert_add_column_autosizing.patch b/debian/patches/0000_revert_add_column_autosizing.patch
deleted file mode 100644
index 88568c9..0000000
--- a/debian/patches/0000_revert_add_column_autosizing.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Author: Vlad Orlov <monsta at inbox.ru>
-Description: Revert "Adds columns autosizing". This reverts commit 2a424fca8bd928223e92570fa692266c471a52b3.
-
-diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
-index 155b3b20..85f6bad8 100644
---- a/src/file-manager/fm-list-view.c
-+++ b/src/file-manager/fm-list-view.c
-@@ -1766,7 +1766,6 @@ create_and_set_up_tree_view (FMListView *view)
-             gtk_tree_view_column_set_sort_column_id (view->details->file_name_column, column_num);
-             gtk_tree_view_column_set_title (view->details->file_name_column, _("Name"));
-             gtk_tree_view_column_set_resizable (view->details->file_name_column, TRUE);
--            gtk_tree_view_column_set_sizing(view->details->file_name_column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
- 
-             gtk_tree_view_column_pack_start (view->details->file_name_column, cell, FALSE);
-             gtk_tree_view_column_set_attributes (view->details->file_name_column,
-@@ -1806,7 +1805,6 @@ create_and_set_up_tree_view (FMListView *view)
-                                  column);
- 
-             gtk_tree_view_column_set_resizable (column, TRUE);
--            gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-         }
-         g_free (name);
-         g_free (label);
-@@ -2779,6 +2777,9 @@ fm_list_view_set_zoom_level (FMListView *view,
-     gtk_cell_renderer_set_fixed_size (GTK_CELL_RENDERER (view->details->pixbuf_cell),
-                                       -1, icon_size);
- 
-+    /* FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=641518 */
-+    gtk_tree_view_columns_autosize (view->details->tree_view);
-+
-     fm_directory_view_update_menus (FM_DIRECTORY_VIEW (view));
- 
-     gtk_tree_model_foreach (GTK_TREE_MODEL (view->details->model), list_view_changed_foreach, NULL);
diff --git a/debian/patches/0001_fix-high-cpu-while-loading-background-image.patch b/debian/patches/0001_fix-high-cpu-while-loading-background-image.patch
deleted file mode 100644
index 743f2d9..0000000
--- a/debian/patches/0001_fix-high-cpu-while-loading-background-image.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b9cf3667fa5563d52bffb9e3618aa41c7c908aa6 Mon Sep 17 00:00:00 2001
-From: Pablo Barciela <scow at riseup.net>
-Date: Fri, 1 Sep 2017 02:25:53 +0200
-Subject: [PATCH] Fix: high cpu while loading background image
-
-Fixes https://github.com/mate-desktop/caja/issues/606
----
- eel/eel-background.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/eel/eel-background.c b/eel/eel-background.c
-index a3392c2b..53e0a652 100644
---- a/eel/eel-background.c
-+++ b/eel/eel-background.c
-@@ -1062,6 +1062,14 @@ void
- eel_bg_load_from_gsettings (EelBackground *self,
- 			    GSettings     *settings)
- {
-+    char *keyfile = g_settings_get_string (settings, MATE_BG_KEY_PICTURE_FILENAME);
-+
-+    if (!g_file_test (keyfile, G_FILE_TEST_EXISTS) && (*keyfile != '\0'))
-+    {
-+        *keyfile = '\0';
-+        g_settings_set_string (settings, MATE_BG_KEY_PICTURE_FILENAME, keyfile);
-+    }
-+
-     if (self->details->bg)
-         mate_bg_load_from_gsettings (self->details->bg,
-         			     settings);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e3791d6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0000_revert_add_column_autosizing.patch
-0001_fix-high-cpu-while-loading-background-image.patch

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