summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe McCann <joem@gentoo.org>2005-03-15 21:12:20 +0000
committerJoe McCann <joem@gentoo.org>2005-03-15 21:12:20 +0000
commit98ccc1b370d4c0b87b320cf9e9ae750b465849ca (patch)
treeade49a09ea7ef6095d4000f4c92344c25f7b6f35 /app-arch/file-roller/files
parentblah again (diff)
downloadgentoo-2-98ccc1b370d4c0b87b320cf9e9ae750b465849ca.tar.gz
gentoo-2-98ccc1b370d4c0b87b320cf9e9ae750b465849ca.tar.bz2
gentoo-2-98ccc1b370d4c0b87b320cf9e9ae750b465849ca.zip
patch from gnome cvs to fix behavior when dealing with whitespaces in filenames. thanks to bug 85218
(Portage version: 2.0.51.19)
Diffstat (limited to 'app-arch/file-roller/files')
-rw-r--r--app-arch/file-roller/files/digest-file-roller-2.10.0-r11
-rw-r--r--app-arch/file-roller/files/file-roller-2.10.0-fix_whitespace.patch56
2 files changed, 57 insertions, 0 deletions
diff --git a/app-arch/file-roller/files/digest-file-roller-2.10.0-r1 b/app-arch/file-roller/files/digest-file-roller-2.10.0-r1
new file mode 100644
index 000000000000..6f0df710fa92
--- /dev/null
+++ b/app-arch/file-roller/files/digest-file-roller-2.10.0-r1
@@ -0,0 +1 @@
+MD5 0cb5b09aad7c9d352922994a6e8cf088 file-roller-2.10.0.tar.bz2 1311026
diff --git a/app-arch/file-roller/files/file-roller-2.10.0-fix_whitespace.patch b/app-arch/file-roller/files/file-roller-2.10.0-fix_whitespace.patch
new file mode 100644
index 000000000000..cf774aab124e
--- /dev/null
+++ b/app-arch/file-roller/files/file-roller-2.10.0-fix_whitespace.patch
@@ -0,0 +1,56 @@
+diff -u -r1.125 -r1.128
+--- src/window.c 2005/03/07 12:33:45 1.125
++++ src/window.c 2005/03/14 10:17:51 1.128
+@@ -1842,10 +1842,8 @@
+ FRWindow *window = data;
+ GtkTreeSelection *selection;
+
+- /* FIXME: uncomment after freeze
+ if (event->window != gtk_tree_view_get_bin_window (GTK_TREE_VIEW (window->list_view)))
+ return FALSE;
+- */
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (window->list_view));
+ if (selection == NULL)
+@@ -1917,10 +1915,8 @@
+ FRWindow *window = data;
+ GtkTreeSelection *selection;
+
+- /* FIXME: uncomment after freeze
+ if (event->window != gtk_tree_view_get_bin_window (GTK_TREE_VIEW (window->list_view)))
+ return FALSE;
+- */
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (window->list_view));
+ if (selection == NULL)
+@@ -5436,8 +5432,9 @@
+
+ fr_process_begin_command (proc, cdata->command);
+ for (scan = cdata->file_list; scan; scan = scan->next) {
+- char *filename = scan->data;
++ char *filename = shell_escape (scan->data);
+ fr_process_add_arg (proc, filename);
++ g_free (filename);
+ }
+ fr_process_end_command (proc);
+
+@@ -5452,6 +5449,7 @@
+ uris = g_list_prepend (uris, gnome_vfs_get_uri_from_local_path (filename));
+ }
+
++ command_list = g_list_prepend (command_list, cdata);
+ gnome_vfs_mime_application_launch (cdata->app, uris);
+
+ path_list_free (uris);
+@@ -5488,9 +5486,7 @@
+ "/",
+ file,
+ NULL);
+- cdata->file_list = g_list_prepend (cdata->file_list,
+- shell_escape (filename));
+- g_free (filename);
++ cdata->file_list = g_list_prepend (cdata->file_list, filename);
+ }
+
+ g_signal_connect (G_OBJECT (window->archive),
+