[mate-file-manager] add upstream patches

Wolfgang Ulbrich raveit65 at fedoraproject.org
Sun Sep 22 18:08:39 UTC 2013


commit c8efd32b93acdadc114b45ee26cc3ec285674d92
Author: raveit65 <chat-to-me at raveit.de>
Date:   Sun Sep 22 20:08:20 2013 +0200

    add upstream patches

 ...sh-during-file-rename-in-external-devices.patch |   19 +++++++++
 ...-open-folders-in-same-window-spatial-mode.patch |   40 ++++++++++++++++++++
 2 files changed, 59 insertions(+), 0 deletions(-)
---
diff --git a/mate-file-manager_crash-during-file-rename-in-external-devices.patch b/mate-file-manager_crash-during-file-rename-in-external-devices.patch
new file mode 100644
index 0000000..1b2bdca
--- /dev/null
+++ b/mate-file-manager_crash-during-file-rename-in-external-devices.patch
@@ -0,0 +1,19 @@
+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 @@ static CajaFileSortType get_default_sort_order                    (CajaFile
+         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] == '\0')
++    if ((new_name == NULL) || (new_name[0] == '\0'))
+     {
+         return;
+     }
+
diff --git a/mate-file-manager_windows-open-folders-in-same-window-spatial-mode.patch b/mate-file-manager_windows-open-folders-in-same-window-spatial-mode.patch
new file mode 100644
index 0000000..8438c4b
--- /dev/null
+++ b/mate-file-manager_windows-open-folders-in-same-window-spatial-mode.patch
@@ -0,0 +1,40 @@
+From 77bd50e13ed0e111a2e1f0c4313caf798d66e8d9 Mon Sep 17 00:00:00 2001
+From: Stefano Karapetsas <stefano at karapetsas.com>
+Date: Fri, 20 Sep 2013 20:50:34 +0000
+Subject: Merge pull request #112 from aubade/browserfix
+
+Make browser windows always open new folders in the same window, even when Spatial enabled
+---
+diff --git a/src/caja-window-manage-views.c b/src/caja-window-manage-views.c
+index c2c5b5f..c7918e6 100644
+--- a/src/caja-window-manage-views.c
++++ b/src/caja-window-manage-views.c
+@@ -528,7 +528,7 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot,
+     int new_slot_position;
+     GList *l;
+     gboolean target_navigation = FALSE, target_same = FALSE;
+-    gboolean is_desktop;
++    gboolean is_desktop, is_navigation;
+ 
+     window = slot->pane->window;
+ 
+@@ -553,6 +553,7 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot,
+                 (flags & CAJA_WINDOW_OPEN_FLAG_NEW_TAB) != 0));
+ 
+     is_desktop = CAJA_IS_DESKTOP_WINDOW (window);
++    is_navigation = CAJA_IS_NAVIGATION_WINDOW (window);
+     target_same = is_desktop &&
+     		!caja_desktop_window_loaded (CAJA_DESKTOP_WINDOW (window));
+ 
+@@ -575,6 +576,8 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot,
+              * the target is a navigation.
+              */
+             target_navigation = TRUE;
++        } else if (is_navigation) {
++            target_same = TRUE;
+         }
+         break;
+     case CAJA_WINDOW_OPEN_IN_NAVIGATION :
+--
+cgit 
+


More information about the scm-commits mailing list