Fix http leak, bug #256892. Fix obexftp icon, bug #256890.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

2 files changed, 79 insertions, 0 deletions

diff --git a/gnome-base/gvfs/files/gvfs-1.0.3-http-leak.patch b/gnome-base/gvfs/files/gvfs-1.0.3-http-leak.patch
new file mode 100644
index 000000000000..93adf5b043ac
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.0.3-http-leak.patch
@@ -0,0 +1,57 @@
+Index: daemon/gvfsbackendhttp.c
+===================================================================
+--- daemon/gvfsbackendhttp.c	(revision 2129)
++++ daemon/gvfsbackendhttp.c	(revision 2130)
+@@ -346,6 +346,7 @@
+                                 error->message);
+ 
+       g_error_free (error);
++      g_object_unref (stream);
+       return;
+     }
+ 
+@@ -371,6 +372,8 @@
+   msg = soup_message_new_from_uri (SOUP_METHOD_GET, uri);
+   soup_uri_free (uri);
+ 
++  soup_message_body_set_accumulate (msg->response_body, FALSE);
++
+   stream = soup_input_stream_new (op_backend->session_async, msg);
+   g_object_unref (msg);
+ 
+Index: daemon/soup-input-stream.c
+===================================================================
+--- daemon/soup-input-stream.c	(revision 2129)
++++ daemon/soup-input-stream.c	(revision 2130)
+@@ -714,6 +714,7 @@
+   soup_input_stream_done_io (stream);
+ 
+   g_simple_async_result_complete (result);
++  g_object_unref (result);
+ }
+ 
+ static void
+@@ -748,6 +749,7 @@
+     {
+       g_simple_async_result_set_op_res_gssize (result, 0);
+       g_simple_async_result_complete_in_idle (result);
++      g_object_unref (result);
+       return;
+     }
+ 
+@@ -756,6 +758,7 @@
+       gsize nread = read_from_leftover (priv, buffer, count);
+       g_simple_async_result_set_op_res_gssize (result, nread);
+       g_simple_async_result_complete_in_idle (result);
++      g_object_unref (result);
+       return;
+     }
+ 
+@@ -804,6 +807,7 @@
+     }
+ 
+   g_simple_async_result_complete_in_idle (result);
++  g_object_unref (result);
+ }
+ 
+ static gboolean
diff --git a/gnome-base/gvfs/files/gvfs-1.0.3-obexftp-icon.patch b/gnome-base/gvfs/files/gvfs-1.0.3-obexftp-icon.patch
new file mode 100644
index 000000000000..6ae45e9d4004
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.0.3-obexftp-icon.patch
@@ -0,0 +1,22 @@
+# https://bugs.gentoo.org/show_bug.cgi?id=256890
+# https://bugzilla.gnome.org/show_bug.cgi?id=542687
+Index: b/daemon/gvfsbackendobexftp.c
+===================================================================
+--- a/daemon/gvfsbackendobexftp.c	(revision 2125)
++++ b/daemon/gvfsbackendobexftp.c	(working copy)
+@@ -376,7 +376,14 @@
+       g_file_info_set_file_type (info, G_FILE_TYPE_DIRECTORY);
+       g_file_info_set_content_type (info, "inode/directory");
+       g_file_info_set_name (info, "/");
+-      g_vfs_backend_set_icon_name (backend, op_backend->icon_name);
++      if (op_backend->icon_name) {
++          GIcon *icon;
++
++          g_vfs_backend_set_icon_name (backend, op_backend->icon_name);
++          icon = g_themed_icon_new (op_backend->icon_name);
++          g_file_info_set_icon (info, icon);
++          g_object_unref (icon);
++      }
+       display = g_strdup_printf (_("%s on %s"), "/", op_backend->display_name);
+       g_file_info_set_display_name (info, display);
+       g_free (display);