[SCM] mate-file-manager Debian package branch, master, updated. 87b9c38b4fea1d6157e682b2446e88c88ac38abe
Stefano Karapetsas
stefanokarapetsas-guest at moszumanska.debian.org
Sat Jan 25 14:57:49 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-mate/caja.git;a=commitdiff;h=87b9c38
The following commit has been merged in the master branch:
commit 87b9c38b4fea1d6157e682b2446e88c88ac38abe
Author: Stefano Karapetsas <stefano at karapetsas.com>
Date: Sat Jan 25 15:57:26 2014 +0100
Bump version to 1.6.3 and remove patches applied upstream
---
debian/changelog | 2 +-
debian/patches/00-fix-spatial-mode.patch | 24 -------
debian/patches/01-fix-thumbnails-frames.patch | 65 -----------------
.../02-fix-crash-during-audio-preview.patch | 22 ------
.../03-fix-ctrl+a-behaviour-in-search-field.patch | 56 ---------------
.../04-fix-segfaults-with-thumbnails-frames.patch | 33 ---------
...sh-during-file-rename-in-external-devices.patch | 28 --------
...erly-free-GHashTable-in-properties-window.patch | 81 ----------------------
debian/patches/07-fix-icons-dir.patch | 34 ---------
debian/patches/series | 8 ---
10 files changed, 1 insertion(+), 352 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3de9de7..b2bed14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mate-file-manager (1.6.2-1) UNRELEASED; urgency=low
+mate-file-manager (1.6.3-1) UNRELEASED; urgency=low
* Initial release.
diff --git a/debian/patches/00-fix-spatial-mode.patch b/debian/patches/00-fix-spatial-mode.patch
deleted file mode 100644
index 046d0d9..0000000
--- a/debian/patches/00-fix-spatial-mode.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ecb6347e185f5973f2315060042ac3dc77b5fdb3 Mon Sep 17 00:00:00 2001
-From: infirit <infirit at gmail.com>
-Date: Sun, 01 Sep 2013 15:14:01 +0000
-Subject: Fix spatial mode crash and shift+double click
-
-Fixes issues:
-https://github.com/mate-desktop/mate-file-manager/issues/120
-https://github.com/mate-desktop/mate-file-manager/issues/161
----
-diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
-index c624610..00ee3f0 100644
---- a/src/file-manager/fm-icon-view.c
-+++ b/src/file-manager/fm-icon-view.c
-@@ -2061,7 +2061,7 @@ icon_container_activate_alternate_callback (CajaIconContainer *container,
- g_assert (FM_IS_ICON_VIEW (icon_view));
- g_assert (container == get_icon_container (icon_view));
-
-- open_in_tab = FALSE;
-+ open_in_tab = TRUE;
-
- window_info = fm_directory_view_get_caja_window (FM_DIRECTORY_VIEW (icon_view));
-
---
-cgit
diff --git a/debian/patches/01-fix-thumbnails-frames.patch b/debian/patches/01-fix-thumbnails-frames.patch
deleted file mode 100644
index a334002..0000000
--- a/debian/patches/01-fix-thumbnails-frames.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 9320cd66487c8da1a8ca3c514cd001515dba83f6 Mon Sep 17 00:00:00 2001
-From: romovs <romovs at gmail.com>
-Date: Sat, 24 Aug 2013 22:40:02 +0000
-Subject: fixed thumbnail frame not being displayed for some files. also fixes #135.
-
----
-diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
-index 84d799f..85f8a9c 100644
---- a/libcaja-private/caja-file.c
-+++ b/libcaja-private/caja-file.c
-@@ -4276,7 +4276,9 @@ caja_file_get_icon (CajaFile *file,
-
- pixbuf = caja_icon_info_get_pixbuf (icon);
- if (pixbuf != NULL) {
-- caja_ui_frame_image (&pixbuf);
-+ if (!file->details->is_launcher && !gdk_pixbuf_get_has_alpha (pixbuf)) {
-+ caja_ui_frame_image (&pixbuf);
-+ }
- g_object_unref (icon);
-
- icon = caja_icon_info_new_for_pixbuf (pixbuf);
-@@ -4320,7 +4322,14 @@ caja_file_get_icon (CajaFile *file,
- MAX (h * scale, 1),
- GDK_INTERP_BILINEAR);
-
-- caja_ui_frame_image (&scaled_pixbuf);
-+ /* Render frames only for thumbnails of non-image files
-+ and for images with no alpha channel. */
-+ gboolean is_image = strncmp(eel_ref_str_peek (file->details->mime_type), "image/", 6) == 0;
-+ if (!is_image ||
-+ is_image && !gdk_pixbuf_get_has_alpha (raw_pixbuf)) {
-+ caja_ui_frame_image (&scaled_pixbuf);
-+ }
-+
- g_object_unref (raw_pixbuf);
-
- /* Don't scale up if more than 25%, then read the original
-diff --git a/libcaja-private/caja-ui-utilities.c b/libcaja-private/caja-ui-utilities.c
-index 9732b6d..8077e97 100644
---- a/libcaja-private/caja-ui-utilities.c
-+++ b/libcaja-private/caja-ui-utilities.c
-@@ -287,21 +287,12 @@ caja_ui_frame_image (GdkPixbuf **pixbuf)
- {
- GdkPixbuf *pixbuf_with_frame, *frame;
- int left_offset, top_offset, right_offset, bottom_offset;
-- int size;
-
- frame = caja_get_thumbnail_frame ();
- if (frame == NULL) {
- return;
- }
-
-- size = MAX (gdk_pixbuf_get_width (*pixbuf),
-- gdk_pixbuf_get_height (*pixbuf));
--
-- /* We don't want frames around small icons */
-- if (size < 128 && gdk_pixbuf_get_has_alpha (*pixbuf)) {
-- return;
-- }
--
- left_offset = CAJA_THUMBNAIL_FRAME_LEFT;
- top_offset = CAJA_THUMBNAIL_FRAME_TOP;
- right_offset = CAJA_THUMBNAIL_FRAME_RIGHT;
---
-cgit
diff --git a/debian/patches/02-fix-crash-during-audio-preview.patch b/debian/patches/02-fix-crash-during-audio-preview.patch
deleted file mode 100644
index 6746515..0000000
--- a/debian/patches/02-fix-crash-during-audio-preview.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From e0bff0827f00d1af70c09e38db597e4922f7c2cd Mon Sep 17 00:00:00 2001
-From: Stefano Karapetsas <stefano at karapetsas.com>
-Date: Wed, 18 Sep 2013 15:02:01 +0000
-Subject: Possible fix for crash during audio preview
-
-See https://bugzilla.redhat.com/show_bug.cgi?id=959444
----
-diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
-index 00ee3f0..888db70 100644
---- a/src/file-manager/fm-icon-view.c
-+++ b/src/file-manager/fm-icon-view.c
-@@ -2170,6 +2170,8 @@ audio_child_died (GPid pid,
- {
- FMIconView *icon_view;
-
-+ g_return_if_fail (FM_IS_ICON_VIEW (data));
-+
- icon_view = FM_ICON_VIEW (data);
-
- icon_view->details->audio_preview_child_watch = 0;
---
-cgit
diff --git a/debian/patches/03-fix-ctrl+a-behaviour-in-search-field.patch b/debian/patches/03-fix-ctrl+a-behaviour-in-search-field.patch
deleted file mode 100644
index 3c29619..0000000
--- a/debian/patches/03-fix-ctrl+a-behaviour-in-search-field.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 749f7bf29e6c7b04d93eb54f2079455bf730a0c0 Mon Sep 17 00:00:00 2001
-From: infirit <infirit at gmail.com>
-Date: Sat, 21 Sep 2013 00:18:45 +0000
-Subject: Fix ctrl+a behaviour in search field
-
-From: Cosimo Cecchi <cosimoc at gnome.org>
-Even when we're not renaming, process events for focused GtkEditables
-before activating the menu accels and mnemonics.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=619529
-Caja bug: https://github.com/mate-desktop/mate-file-manager/issues/97
----
-diff --git a/src/caja-window.c b/src/caja-window.c
-index 782e260..28e1ea3 100644
---- a/src/caja-window.c
-+++ b/src/caja-window.c
-@@ -1094,10 +1094,37 @@ caja_window_key_press_event (GtkWidget *widget,
- GdkEventKey *event)
- {
- CajaWindow *window;
-+ CajaWindowSlot *active_slot;
-+ CajaView *view;
-+ GtkWidget *focus_widget;
- int i;
-
- window = CAJA_WINDOW (widget);
-
-+ active_slot = caja_window_get_active_slot (window);
-+ view = active_slot->content_view;
-+
-+ if (view != NULL && focus_widget != NULL &&
-+ GTK_IS_EDITABLE (focus_widget)) {
-+ /* if we have input focus on a GtkEditable (e.g. a GtkEntry), forward
-+ * the event to it before activating accelerator bindings too.
-+ */
-+ if (gtk_window_propagate_key_event (GTK_WINDOW (window), event)) {
-+ return TRUE;
-+ }
-+ }
-+
-+ focus_widget = gtk_window_get_focus (GTK_WINDOW (window));
-+ if (view != NULL && focus_widget != NULL &&
-+ GTK_IS_EDITABLE (focus_widget)) {
-+ /* if we have input focus on a GtkEditable (e.g. a GtkEntry), forward
-+ * the event to it before activating accelerator bindings too.
-+ */
-+ if (gtk_window_propagate_key_event (GTK_WINDOW (window), event)) {
-+ return TRUE;
-+ }
-+ }
-+
- for (i = 0; i < G_N_ELEMENTS (extra_window_keybindings); i++)
- {
- if (extra_window_keybindings[i].keyval == event->keyval)
---
-cgit
diff --git a/debian/patches/04-fix-segfaults-with-thumbnails-frames.patch b/debian/patches/04-fix-segfaults-with-thumbnails-frames.patch
deleted file mode 100644
index c3624bd..0000000
--- a/debian/patches/04-fix-segfaults-with-thumbnails-frames.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 38e0a2bd39c65001100f403dd2bd4162ffd824de Mon Sep 17 00:00:00 2001
-From: Stefano Karapetsas <stefano at karapetsas.com>
-Date: Sun, 22 Sep 2013 13:01:18 +0000
-Subject: Add check if mimetype is null before apply thumbnail frame
-
-To avoid segfaults on file deletions
----
-diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
-index 85f8a9c..fa00ac8 100644
---- a/libcaja-private/caja-file.c
-+++ b/libcaja-private/caja-file.c
-@@ -4324,12 +4324,13 @@ caja_file_get_icon (CajaFile *file,
-
- /* Render frames only for thumbnails of non-image files
- and for images with no alpha channel. */
-- gboolean is_image = strncmp(eel_ref_str_peek (file->details->mime_type), "image/", 6) == 0;
-- if (!is_image ||
-- is_image && !gdk_pixbuf_get_has_alpha (raw_pixbuf)) {
-- caja_ui_frame_image (&scaled_pixbuf);
-- }
--
-+ gboolean is_image = file->details->mime_type &&
-+ (strncmp(eel_ref_str_peek (file->details->mime_type), "image/", 6) == 0);
-+ if (!is_image ||
-+ is_image && !gdk_pixbuf_get_has_alpha (raw_pixbuf)) {
-+ caja_ui_frame_image (&scaled_pixbuf);
-+ }
-+
- g_object_unref (raw_pixbuf);
-
- /* Don't scale up if more than 25%, then read the original
---
-cgit
diff --git a/debian/patches/05-fix-crash-during-file-rename-in-external-devices.patch b/debian/patches/05-fix-crash-during-file-rename-in-external-devices.patch
deleted file mode 100644
index 0f5ea9a..0000000
--- a/debian/patches/05-fix-crash-during-file-rename-in-external-devices.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 73cc7e98f61b2d5f327f26a2e6f4e5004347bf01 Mon Sep 17 00:00:00 2001
-From: Stefano Karapetsas <stefano at karapetsas.com>
-Date: Thu, 19 Sep 2013 14:40:14 +0000
-Subject: Possible fix for crash during file rename in external devices
-
-Bug report: https://bugzilla.redhat.com/show_bug.cgi?id=1005660
-Solution from: https://git.gnome.org/browse/nautilus/commit/src/nautilus-icon-view.c?h=gnome-3-2&id=a67212a
----
-diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
-index 888db70..6ab19c4 100644
---- a/src/file-manager/fm-icon-view.c
-+++ b/src/file-manager/fm-icon-view.c
-@@ -2639,12 +2639,11 @@ fm_icon_view_icon_text_changed_callback (CajaIconContainer *container,
- FMIconView *icon_view)
- {
- g_assert (CAJA_IS_FILE (file));
-- g_assert (new_name != NULL);
-
- /* Don't allow a rename with an empty string. Revert to original
- * without notifying the user.
- */
-- if (new_name[0] == '
--
mate-file-manager Debian package
More information about the pkg-mate-commits
mailing list