[maemo-commits] [maemo-commits] r8814 - in projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk: . dbus-daemon debian debian/patches

Tue Dec 19 11:35:39 EET 2006

Author: richard
Date: 2006-12-19 11:35:36 +0200 (Tue, 19 Dec 2006)
New Revision: 8814

Added:
   projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/patches/22-workaround-broken-http-servers.patch
Modified:
   projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/ChangeLog
   projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/configure.in
   projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/dbus-daemon/daemon-connection.c
   projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/dbus-daemon/dbus-method.c
   projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/dbus-daemon/vfs-daemon.c
   projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/changelog
   projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/control
Log:
Merge in changes from the old trunk to the new for it7 versions.

Modified: projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/ChangeLog
===================================================================

--- projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/ChangeLog	2006-12-19 09:23:19 UTC (rev 8813)
+++ projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/ChangeLog	2006-12-19 09:35:36 UTC (rev 8814)
@@ -1,3 +1,14 @@
+2006-12-19  Richard Hult  <richard at imendio.com>
+
+	* configure.in: Bump version.
+
+	* dbus-daemon/daemon-connection.c: (connection_unref):
+	* dbus-daemon/dbus-method.c: (ensure_connection),
+	(vfs_module_shutdown):
+	* dbus-daemon/vfs-daemon.c: (daemon_get_connection),
+	(daemon_shutdown): Revert the last commit since we don't want that
+	in this branch.
+
 2006-12-12  Richard Hult  <richard at imendio.com>
 
 	* Release 2.12.0.18
@@ -34,7 +45,7 @@
 	* configure.in: Bump version.
 
 	* libgnomevfs/gnome-vfs-mime-monitor.h: 
-	* libgnomevfs/gnome-vfs-mime-monitor.c: Upstream relicensed those
+	* libgnomevfs/gnome-vfs-mime-monitor.c: Upstream relicense those
 	files to LGPL, do the same here.
 
 2006-10-06  Richard Hult  <richard at imendio.com>

Modified: projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/configure.in
===================================================================
--- projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/configure.in	2006-12-19 09:23:19 UTC (rev 8813)
+++ projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/configure.in	2006-12-19 09:35:36 UTC (rev 8814)
@@ -14,7 +14,7 @@
 
 # If you need a modifier for the version number. 
 # Normally empty, but can be used to make "fixup" releases.
-LIBGNOMEVFS_EXTRAVERSION=18
+LIBGNOMEVFS_EXTRAVERSION=19
 
 dnl libtool versioning from libgnome
 

Modified: projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/dbus-daemon/daemon-connection.c
===================================================================
--- projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/dbus-daemon/daemon-connection.c	2006-12-19 09:23:19 UTC (rev 8813)
+++ projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/dbus-daemon/daemon-connection.c	2006-12-19 09:35:36 UTC (rev 8814)
@@ -321,7 +321,7 @@
 	d(g_print ("Last unref\n"));
 
 	if (dbus_connection_get_is_connected (conn->conn)) {
-		dbus_connection_close (conn->conn);
+		dbus_connection_disconnect (conn->conn);
 	}
 	dbus_connection_unref (conn->conn);
 

Modified: projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/dbus-daemon/dbus-method.c
===================================================================
--- projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/dbus-daemon/dbus-method.c	2006-12-19 09:23:19 UTC (rev 8813)
+++ projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/dbus-daemon/dbus-method.c	2006-12-19 09:35:36 UTC (rev 8814)
@@ -223,7 +223,7 @@
 	if (!dbus_connection_add_filter (dbus_conn, message_handler,
 					 NULL, NULL)) {
 		g_warning ("Failed to add filter to the connection.");
-		dbus_connection_close (dbus_conn);
+		dbus_connection_disconnect (dbus_conn);
 		dbus_connection_unref (dbus_conn);
 
 		dbus_conn = NULL;
@@ -1702,7 +1702,7 @@
 vfs_module_shutdown (GnomeVFSMethod* method)
 {
 	if (dbus_conn) {
-		dbus_connection_close (dbus_conn);
+		dbus_connection_disconnect (dbus_conn);
 		dbus_connection_unref (dbus_conn);
 
 		dbus_conn = NULL;

Modified: projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/dbus-daemon/vfs-daemon.c
===================================================================
--- projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/dbus-daemon/vfs-daemon.c	2006-12-19 09:23:19 UTC (rev 8813)
+++ projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/dbus-daemon/vfs-daemon.c	2006-12-19 09:35:36 UTC (rev 8814)
@@ -91,7 +91,7 @@
 		g_warning ("Failed to acquire vfs-daemon service: %s", error.message);
 		dbus_error_free (&error);
 
-		dbus_connection_close (conn);
+		dbus_connection_disconnect (conn);
 		dbus_connection_unref (conn);
 		conn = NULL;
 
@@ -101,7 +101,7 @@
 	if (ret == DBUS_REQUEST_NAME_REPLY_EXISTS) {
 		g_printerr ("VFS daemon already running, exiting.\n");
 
-		dbus_connection_close (conn);
+		dbus_connection_disconnect (conn);
 		dbus_connection_unref (conn);
 		conn = NULL;
 
@@ -111,7 +111,7 @@
 	if (ret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
 		g_printerr ("Not primary owner of the service, exiting.\n");
 
-		dbus_connection_close (conn);
+		dbus_connection_disconnect (conn);
 		dbus_connection_unref (conn);
 		conn = NULL;
 
@@ -124,7 +124,7 @@
 						   NULL)) {
 		g_printerr ("Failed to register object with D-BUS.\n");
 
-		dbus_connection_close (conn);
+		dbus_connection_disconnect (conn);
 		dbus_connection_unref (conn);
 		conn = NULL;
 
@@ -152,7 +152,7 @@
 		return;
 	}
 
-	dbus_connection_close (conn);
+	dbus_connection_disconnect (conn);
 	dbus_connection_unref (conn);
 }
 

Modified: projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/changelog
===================================================================
--- projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/changelog	2006-12-19 09:23:19 UTC (rev 8813)
+++ projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/changelog	2006-12-19 09:35:36 UTC (rev 8814)
@@ -1,3 +1,10 @@
+osso-gnome-vfs2 (2.12.0.19-2osso1) unstable; urgency=low
+
+  * Revert the change in .18 since we don't want that in this branch
+  * Fixes NB#43533, Media player failed to play some user added radio
+
+ -- Richard Hult <richard at imendio.com>  Tue, 19 Dec 2006 09:59:57 +0100
+
 osso-gnome-vfs2 (2.12.0.18-2osso1) unstable; urgency=low
 
   * Remove unsed osso-gwconnect dependency

Modified: projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/control
===================================================================
--- projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/control	2006-12-19 09:23:19 UTC (rev 8813)
+++ projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/control	2006-12-19 09:35:36 UTC (rev 8814)
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Richard Hult <richard at imendio.com>
-Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev, cdbs, libgconf2-dev (>= 2.6.4), libxml2-dev, gettext, debhelper (>> 4.1.0), zlib1g-dev, intltool, gnome-common, gnome-pkg-tools, libdbus-glib-1-dev (>= 0.60), gtk-doc-tools
+Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev, cdbs, libgconf2-dev (>= 2.6.4), libxml2-dev, gettext, debhelper (>> 4.1.0), zlib1g-dev, intltool, gnome-common, gnome-pkg-tools, libdbus-glib-1-dev (>= 0.60), osso-gwconnect-dev (>= 0.62), gtk-doc-tools
 Standards-Version: 3.6.1.0
 
 Package: libosso-gnomevfs2-common

Added: projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/patches/22-workaround-broken-http-servers.patch
===================================================================
--- projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/patches/22-workaround-broken-http-servers.patch	2006-12-19 09:23:19 UTC (rev 8813)
+++ projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/patches/22-workaround-broken-http-servers.patch	2006-12-19 09:35:36 UTC (rev 8814)
@@ -0,0 +1,80 @@
+Index: modules/http-neon-method.c
+===================================================================
+--- modules/http-neon-method.c	(revision 8808)
++++ modules/http-neon-method.c	(working copy)
+@@ -1832,6 +1832,41 @@ http_follow_redirect (HttpContext *conte
+ /* ************************************************************************** */
+ /* Http operations */
+ 
++/* Sends a HEAD/GET request where we are not interested in any information
++ * except headers. Some broken servers send the content for HEAD requests, so we
++ * always try to read to get rid of that by closing the connection, and for the
++ * case where this is used with GET as fallback for HEAD, we are also not
++ * interested in the data.
++ */
++static int
++dispatch_head_request (ne_request *req)
++{
++	gboolean must_close = FALSE;
++	char buffer[1];
++	size_t len;
++	int res;
++	
++	do {
++		res = ne_begin_request (req);
++		
++		if (NE_OK == res) {
++			len = ne_read_response_block (req, buffer, sizeof buffer);
++			must_close = (len > 0);
++		}
++
++		if (NE_OK == res) {
++			res = ne_end_request (req);
++		}
++	} while (NE_RETRY == res);
++
++	if (must_close) {
++		DEBUG_HTTP ("explictly closing connection");
++		ne_close_connection (ne_get_session (req));
++	}
++
++	return res;
++}
++
+ static GnomeVFSResult
+ http_get_file_info (HttpContext *context, GnomeVFSFileInfo *info)
+ {
+@@ -1896,8 +1931,19 @@ http_get_file_info (HttpContext *context
+ 
+ 	add_default_header_handlers (req, info);
+ 		
+-	res = ne_request_dispatch (req);
++	res = dispatch_head_request (req);
++	result = resolve_result (res, req);
+ 
++	if (res == NE_ERROR || result == GNOME_VFS_ERROR_NOT_SUPPORTED) {
++		/* Assume that there was a broken server... fallback to GET. */
++		DEBUG_HTTP ("Fall back to GET request");
++	
++		ne_request_destroy (req);
++		req = ne_request_create (context->session, "GET", context->path);
++		add_default_header_handlers (req, info);
++		res = dispatch_head_request (req);
++	}
++	
+ 	if (res == NE_REDIRECT) {
+ 		result = http_follow_redirect (context);
+ 		
+@@ -1922,12 +1968,6 @@ http_get_file_info (HttpContext *context
+ 		info->flags = GNOME_VFS_FILE_FLAGS_NONE;
+ 		
+ 		info->valid_fields |= GNOME_VFS_FILE_INFO_FIELDS_TYPE;
+-
+-		/* work-around for broken icecast server */
+-		if (! g_ascii_strcasecmp (info->mime_type, "audio/mpeg")) {
+-			ne_close_connection (ne_get_session (req));
+-		}
+-		
+ 	}
+ 
+ 	return result;


