From e4bb35203292b3885fd3865ac8409c85b48684ca Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Jul 17 2015 15:17:51 +0000
Subject: export-dialog-destroyed-crash patch: avoid subsequent warnings


---

diff --git a/gimp-2.8.14-export-dialog-destroyed-crash.patch b/gimp-2.8.14-export-dialog-destroyed-crash.patch
index 52b50d8..36505ce 100644
--- a/gimp-2.8.14-export-dialog-destroyed-crash.patch
+++ b/gimp-2.8.14-export-dialog-destroyed-crash.patch
@@ -1,69 +1,38 @@
-From 10f0f825bc5e0ec67a7b568faa9d444b8f26629d Mon Sep 17 00:00:00 2001
+From 1fc061aa469c1a70288907bbb02c371fc0c1f4d3 Mon Sep 17 00:00:00 2001
 From: Nils Philippsen <nils@redhat.com>
-Date: Tue, 14 Jul 2015 17:46:27 +0200
-Subject: [PATCH] patch: export-dialog-destroyed-crash
+Date: Fri, 17 Jul 2015 17:07:18 +0200
+Subject: [PATCH] Ref/unref dialog->image around saving as well...
 
-Squashed commit of the following:
+...to avoid warnings that happen if the image got closed before the
+saving finishes.
 
-commit 269b9574ea983c173c89110fbc8d9e73de513c80
-Author: Michael Natterer <mitch@gimp.org>
-Date:   Tue Jul 14 13:22:06 2015 +0200
+(amends commit a0e48ad29e93e2dc259879abeb2dedc9a420b8f6)
 
-    Bug 739003 - Crashes in file_save_dialog_response()
-
-    Ref/unref the dialog around saving the image insatead of connecting to
-    "destroy" and NULLifying the local dialog variable on destruction,
-    which has caused weird crashes on fedora.
-
-    (cherry picked from commit a0e48ad29e93e2dc259879abeb2dedc9a420b8f6)
+(cherry picked from commit 0b900239d57161da11e3e0c8094552cf1480dcd3)
 ---
- app/dialogs/file-save-dialog.c | 12 +++---------
- 1 file changed, 3 insertions(+), 9 deletions(-)
+ app/dialogs/file-save-dialog.c | 2 ++
+ 1 file changed, 2 insertions(+)
 
 diff --git a/app/dialogs/file-save-dialog.c b/app/dialogs/file-save-dialog.c
-index 8b0873f..b5f3093 100644
+index b5f3093..e8a3d95 100644
 --- a/app/dialogs/file-save-dialog.c
 +++ b/app/dialogs/file-save-dialog.c
-@@ -160,7 +160,6 @@ file_save_dialog_response (GtkWidget *save_dialog,
-   gchar               *uri;
-   gchar               *basename;
-   GimpPlugInProcedure *save_proc;
--  gulong               handler_id;
- 
-   if (! dialog->export)
-     {
-@@ -183,9 +182,7 @@ file_save_dialog_response (GtkWidget *save_dialog,
-       return;
+@@ -183,6 +183,7 @@ file_save_dialog_response (GtkWidget *save_dialog,
      }
  
--  handler_id = g_signal_connect (dialog, "destroy",
--                                 G_CALLBACK (gtk_widget_destroyed),
--                                 &dialog);
-+  g_object_ref (dialog);
+   g_object_ref (dialog);
++  g_object_ref (dialog->image);
  
    switch (file_save_dialog_check_uri (save_dialog, gimp,
                                        &uri, &basename, &save_proc))
-@@ -245,9 +242,7 @@ file_save_dialog_response (GtkWidget *save_dialog,
-       g_free (uri);
-       g_free (basename);
- 
--      if (dialog)
--        gimp_file_dialog_set_sensitive (dialog, TRUE);
--
-+      gimp_file_dialog_set_sensitive (dialog, TRUE);
-       break;
- 
-     case CHECK_URI_SWITCH_DIALOGS:
-@@ -259,8 +254,7 @@ file_save_dialog_response (GtkWidget *save_dialog,
+@@ -254,6 +255,7 @@ file_save_dialog_response (GtkWidget *save_dialog,
        break;
      }
  
--  if (dialog)
--    g_signal_handler_disconnect (dialog, handler_id);
-+  g_object_unref (dialog);
++  g_object_unref (dialog->image);
+   g_object_unref (dialog);
  }
  
- /* IMPORTANT: When changing this function, keep
 -- 
 2.4.3
 
diff --git a/gimp.spec b/gimp.spec
index c6b4167..aec5514 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -82,7 +82,7 @@ Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
 Version:        2.8.14
-Release:        %{?prerelprefix}2%{dotprerel}%{dotgitrev}%{?dist}
+Release:        %{?prerelprefix}3%{dotprerel}%{dotgitrev}%{?dist}
 
 # Compute some version related macros.
 # Ugly, need to get quoting percent signs straight.
@@ -668,6 +668,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Fri Jul 17 2015 Nils Philippsen <nils@redhat.com> - 2:2.8.14-3
+- export-dialog-destroyed-crash patch: avoid subsequent warnings
+
 * Thu Jul 16 2015 Nils Philippsen <nils@redhat.com> - 2:2.8.14-2
 - fix linking problem
 - use %%buildroot macro consistently again