r36341 - in /desktop/experimental/file-roller/debian: changelog patches/git_extract_progress_fix.patch patches/git_extract_segfault.patch patches/series

[bdrung at users.alioth.debian.org]

Author: bdrung
Date: Sat Nov 24 23:13:37 2012
New Revision: 36341

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36341
Log:
* debian/patches/git_extract_segfault.patch: don't segfault when
  using --extract-to, thanks Maarten Baert (LP: #978789)
* debian/patches/git_extract_progress_fix.patch:
  - backport another patch to complete the previous commit

Added:
    desktop/experimental/file-roller/debian/patches/git_extract_progress_fix.patch
    desktop/experimental/file-roller/debian/patches/git_extract_segfault.patch
Modified:
    desktop/experimental/file-roller/debian/changelog
    desktop/experimental/file-roller/debian/patches/series

Modified: desktop/experimental/file-roller/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/changelog?rev=36341&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/changelog [utf-8] (original)
+++ desktop/experimental/file-roller/debian/changelog [utf-8] Sat Nov 24 23:13:37 2012
@@ -12,6 +12,10 @@
   * Build-Depends on libarchive-dev and libnotify-dev.
   * Recommend unar instead of non-free unrar | p7zip-rar (Closes: #620650,
     LP: #965757, #1025588).
+  * debian/patches/git_extract_segfault.patch: don't segfault when
+    using --extract-to, thanks Maarten Baert (LP: #978789)
+  * debian/patches/git_extract_progress_fix.patch:
+    - backport another patch to complete the previous commit
 
  -- Jeremy Bicha <jbicha at ubuntu.com>  Wed, 23 May 2012 17:56:48 -0400
 

Added: desktop/experimental/file-roller/debian/patches/git_extract_progress_fix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/patches/git_extract_progress_fix.patch?rev=36341&op=file
==============================================================================
--- desktop/experimental/file-roller/debian/patches/git_extract_progress_fix.patch (added)
+++ desktop/experimental/file-roller/debian/patches/git_extract_progress_fix.patch [utf-8] Sat Nov 24 23:13:37 2012
@@ -1,0 +1,50 @@
+From f26f6593aa06bc6b4cc15d343745cc924d200b57 Mon Sep 17 00:00:00 2001
+From: Paolo Bacchilega <paobac at src.gnome.org>
+Date: Wed, 14 Nov 2012 08:24:37 +0000
+Subject: respect the --notify option when the extraction is complete
+
+---
+diff --git a/src/fr-window.c b/src/fr-window.c
+index f1edda9..abcf821 100644
+--- a/src/fr-window.c
++++ b/src/fr-window.c
+@@ -6429,8 +6429,10 @@ archive_extraction_ready_cb (GObject      *source_object,
+ 	fr_archive_operation_finish (FR_ARCHIVE (source_object), result, &error);
+ 	_archive_operation_completed (window, FR_ACTION_EXTRACTING_FILES, error);
+ 
+-	if ((error == NULL) && ask_to_open_destination)
++	if ((error == NULL) && ask_to_open_destination) {
++		window->priv->quit_with_progress_dialog = window->priv->batch_mode;
+ 		open_progress_dialog_with_open_destination (window);
++	}
+ 	else if ((error == NULL) && ! batch_mode && ! gtk_window_has_toplevel_focus (GTK_WINDOW (window->priv->progress_dialog)))
+ 		gtk_window_present (GTK_WINDOW (window));
+ 
+@@ -9257,7 +9259,7 @@ fr_window_exec_batch_action (FrWindow      *window,
+ 					   edata->skip_older,
+ 					   edata->overwrite,
+ 					   edata->junk_paths,
+-					   TRUE);
++					   ! window->priv->batch_mode || window->priv->notify);
+ 		break;
+ 
+ 	case FR_BATCH_ACTION_EXTRACT_HERE:
+diff --git a/src/main.c b/src/main.c
+index 539ddfa..5602b31 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -826,7 +826,10 @@ fr_application_command_line (GApplication            *application,
+ 
+ 			g_object_unref (file);
+ 		}
+-		fr_window_append_batch_action (FR_WINDOW (window), FR_BATCH_ACTION_QUIT, NULL, NULL);
++		if (! arg_notify)
++			fr_window_append_batch_action (FR_WINDOW (window), FR_BATCH_ACTION_QUIT, NULL, NULL);
++		else
++			fr_window_set_notify (FR_WINDOW (window), TRUE);
+ 
+ 		fr_window_start_batch (FR_WINDOW (window));
+ 	}
+--
+cgit v0.9.0.2
+

Added: desktop/experimental/file-roller/debian/patches/git_extract_segfault.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/patches/git_extract_segfault.patch?rev=36341&op=file
==============================================================================
--- desktop/experimental/file-roller/debian/patches/git_extract_segfault.patch (added)
+++ desktop/experimental/file-roller/debian/patches/git_extract_segfault.patch [utf-8] Sat Nov 24 23:13:37 2012
@@ -1,0 +1,21 @@
+From a094eab661ce1c5cf414dd836bf893fdfedc08ee Mon Sep 17 00:00:00 2001
+From: Paolo Bacchilega <paobac at src.gnome.org>
+Date: Wed, 14 Nov 2012 07:48:54 +0000
+Subject: Fixed crash when using the --extract-to option
+
+[bug #686321]
+---
+diff --git a/src/main.c b/src/main.c
+index 1eb2e65..539ddfa 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -850,7 +850,7 @@ fr_application_command_line (GApplication            *application,
+ 
+ 	_g_object_unref (default_directory);
+ 	_g_object_unref (add_to_archive);
+-	g_free (extraction_destination);
++	_g_object_unref (extraction_destination);
+ 
+ 	return fr_application_command_line_finished (application, EXIT_SUCCESS);
+ }
+

Modified: desktop/experimental/file-roller/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/patches/series?rev=36341&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/patches/series [utf-8] (original)
+++ desktop/experimental/file-roller/debian/patches/series [utf-8] Sat Nov 24 23:13:37 2012
@@ -1,2 +1,4 @@
 01_package_names.patch
 99_ltmain_as-needed.patch
+git_extract_segfault.patch
+git_extract_progress_fix.patch