55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
|
Novell bug: https://bugzilla.novell.com/show_bug.cgi?id=187126
|
||
|
|
Upstream bug: http://bugzilla.gnome.org/show_bug.cgi?id=342043
|
||
|
|
Original bug: https://launchpad.net/distros/ubuntu/+source/file-roller/+bug/40899
|
||
|
|
|
||
|
|
2006-12-11 jacob berkman <jberkman@novell.com>
|
||
|
|
|
||
|
|
* src/window.h (FRWindow): add batch_extracting_all boolean
|
||
|
|
|
||
|
|
* src/window.c (window_fake_load): load if batch extracting
|
||
|
|
all and archive doesn't directly support extracting all
|
||
|
|
|
||
|
|
* src/window.c (window_new): initialise batch_extracting_all
|
||
|
|
|
||
|
|
* src/window.c (window_archive__open_extract): tell
|
||
|
|
window_fake_load that we are batch extracting all
|
||
|
|
|
||
|
|
--- file-roller-2.12.2/src/window.h~ 2005-11-28 15:55:02.000000000 -0500
|
||
|
|
+++ file-roller-2.12.2/src/window.h 2006-12-11 14:28:10.000000000 -0500
|
||
|
|
@@ -192,6 +192,7 @@ typedef struct {
|
||
|
|
gboolean extracting_dragged_files;
|
||
|
|
gboolean extracting_dragged_files_interrupted;
|
||
|
|
gboolean batch_adding_one_file;
|
||
|
|
+ gboolean batch_extracting_all;
|
||
|
|
|
||
|
|
/* progress dialog data */
|
||
|
|
|
||
|
|
--- file-roller-2.12.2/src/window.c~ 2006-12-11 14:48:27.000000000 -0500
|
||
|
|
+++ file-roller-2.12.2/src/window.c 2006-12-11 14:52:09.000000000 -0500
|
||
|
|
@@ -3096,7 +3096,8 @@ window_fake_load (FRArchive *archive,
|
||
|
|
|
||
|
|
return (window->batch_mode
|
||
|
|
&& ! (window->add_after_opening && window->update_dropped_files && ! archive->command->propAddCanUpdate)
|
||
|
|
- && ! (window->add_after_opening && ! window->update_dropped_files && ! archive->command->propAddCanReplace));
|
||
|
|
+ && ! (window->add_after_opening && ! window->update_dropped_files && ! archive->command->propAddCanReplace)
|
||
|
|
+ && ! (window->batch_extracting_all && !archive->command->propCanExtractAll));
|
||
|
|
}
|
||
|
|
|
||
|
|
|
||
|
|
@@ -3446,6 +3447,7 @@ window_new (void)
|
||
|
|
window->stoppable = TRUE;
|
||
|
|
|
||
|
|
window->batch_adding_one_file = FALSE;
|
||
|
|
+ window->batch_extracting_all = FALSE;
|
||
|
|
|
||
|
|
window->path_clicked = NULL;
|
||
|
|
|
||
|
|
@@ -6040,6 +6042,7 @@ window_archive__open_extract (FRWindow
|
||
|
|
{
|
||
|
|
window->non_interactive = TRUE;
|
||
|
|
|
||
|
|
+ window->batch_extracting_all = TRUE;
|
||
|
|
window_batch_mode_add_action (window,
|
||
|
|
FR_BATCH_ACTION_OPEN,
|
||
|
|
g_strdup (filename),
|