[arch-commits] Commit in nautilus/trunk (2 files)

[Jan Steffens]

    Date: Friday, January 19, 2018 @ 20:45:47
  Author: heftig
Revision: 315159

3.26.2-3

Added:
  nautilus/trunk/0001-rename-file-popover-controller-Don-t-destroy-the-pop.patch
Modified:
  nautilus/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-rename-file-popover-controller-Don-t-destroy-the-pop.patch |   52 ++++++++++
 PKGBUILD                                                        |   11 +-
 2 files changed, 60 insertions(+), 3 deletions(-)

Added: 0001-rename-file-popover-controller-Don-t-destroy-the-pop.patch
===================================================================
--- 0001-rename-file-popover-controller-Don-t-destroy-the-pop.patch	                        (rev 0)
+++ 0001-rename-file-popover-controller-Don-t-destroy-the-pop.patch	2018-01-19 20:45:47 UTC (rev 315159)
@@ -0,0 +1,52 @@
+From bf86a803ab912a4cb8f7bd680616882ca47cad3a Mon Sep 17 00:00:00 2001
+Message-Id: <bf86a803ab912a4cb8f7bd680616882ca47cad3a.1516394111.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Fri, 19 Jan 2018 20:47:04 +0100
+Subject: [PATCH] rename-file-popover-controller: Don't destroy the popover in
+ 'unmap'
+
+Doing that when transitions are deactivated destroys the popover in the
+middle of gtk_popover_popdown, causing gtk_popover_hide_internal to
+operate on a finalized popover.
+
+Fixes #216.
+---
+ src/nautilus-rename-file-popover-controller.c | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/src/nautilus-rename-file-popover-controller.c b/src/nautilus-rename-file-popover-controller.c
+index 83a13d6d9..5806315fb 100644
+--- a/src/nautilus-rename-file-popover-controller.c
++++ b/src/nautilus-rename-file-popover-controller.c
+@@ -56,7 +56,6 @@ rename_file_popover_controller_on_closed (GtkPopover *popover,
+     g_signal_handler_disconnect (controller->rename_file_popover,
+                                  controller->closed_handler_id);
+     controller->closed_handler_id = 0;
+-    controller->rename_file_popover = NULL;
+ 
+     g_signal_emit_by_name (controller, "cancelled");
+ }
+@@ -282,11 +281,6 @@ nautilus_rename_file_popover_controller_new (NautilusFile *target_file,
+                                                       G_CALLBACK (target_file_on_changed),
+                                                       self);
+ 
+-    g_signal_connect (rename_file_popover,
+-                      "unmap",
+-                      (GCallback) gtk_widget_destroy,
+-                      NULL);
+-
+     g_signal_connect (name_entry,
+                       "key-press-event",
+                       G_CALLBACK (name_entry_on_key_pressed),
+@@ -357,7 +351,7 @@ nautilus_rename_file_popover_controller_finalize (GObject *object)
+             self->closed_handler_id = 0;
+         }
+         gtk_popover_popdown (GTK_POPOVER (self->rename_file_popover));
+-        self->rename_file_popover = NULL;
++        g_clear_pointer (&self->rename_file_popover, gtk_widget_destroy);
+     }
+ 
+     if (self->file_changed_handler_id != 0)
+-- 
+2.16.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-19 19:09:34 UTC (rev 315158)
+++ PKGBUILD	2018-01-19 20:45:47 UTC (rev 315159)
@@ -4,7 +4,7 @@
 pkgbase=nautilus
 pkgname=(nautilus libnautilus-extension)
 pkgver=3.26.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Default file manager for GNOME"
 url="https://wiki.gnome.org/Apps/Nautilus"
 arch=(x86_64)
@@ -14,9 +14,11 @@
 options=(!emptydirs)
 _commit=51637bc0960002b811e1c0c7be8671cf9a1cc5be  # tags/3.26.2^0
 source=("git+https://gitlab.gnome.org/GNOME/nautilus.git#commit=$_commit"
-        "git+https://git.gnome.org/browse/libgd")
+        "git+https://git.gnome.org/browse/libgd"
+        0001-rename-file-popover-controller-Don-t-destroy-the-pop.patch)
 sha256sums=('SKIP'
-            'SKIP')
+            'SKIP'
+            'de644c2426a96e595bd93daef1db1716dc4d9680af2b6884db9518d29ea7eaac')
 
 prepare() {
   mkdir -p build libne/usr/{lib,share}
@@ -25,6 +27,9 @@
   # https://gitlab.gnome.org/GNOME/nautilus/issues/25
   git cherry-pick -n d74e1a3d 9238456b
 
+  # https://gitlab.gnome.org/GNOME/nautilus/issues/216
+  patch -Np1 -i ../0001-rename-file-popover-controller-Don-t-destroy-the-pop.patch
+
   git submodule init
   git config --local submodule.libgd.url "$srcdir/libgd"
   git submodule update