rpms/gnome-vfs2-obexftp/devel gnome-vfs-obexftp-find-obex-directly.patch, NONE, 1.1 gnome-vfs2-obexftp.spec, 1.5, 1.6

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/gnome-vfs2-obexftp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7525

Modified Files:
	gnome-vfs2-obexftp.spec 
Added Files:
	gnome-vfs-obexftp-find-obex-directly.patch 
Log Message:
* Sun Nov 25 2007 - Bastien Nocera <bnocera at redhat.com> - 0.4-3
- Add patch to try and fix for broken devices that don't answer SDP
  queries without a specific service (#345581)


gnome-vfs-obexftp-find-obex-directly.patch:

--- NEW FILE gnome-vfs-obexftp-find-obex-directly.patch ---
=== modified file 'src/om-bluetooth.c'
--- src/om-bluetooth.c	2007-06-10 11:23:36 +0000
+++ src/om-bluetooth.c	2007-11-25 17:11:01 +0000
@@ -178,9 +178,26 @@
 	if (sdp_service_search_attr_req (sdp, search,
 					 SDP_ATTR_REQ_INDIVIDUAL, attrs,
 					 &recs)) {
+		uint32_t range = SDP_ATTR_PROTO_DESC_LIST;
+
 		d(g_printerr("find_obexftp_channel: "
-			     "Could not browse services"));
-		goto end;
+			     "Could not browse services, trying direct search"));
+
+		sdp_list_free (recs, (sdp_free_func_t)sdp_record_free);
+		sdp_list_free (search, NULL);
+		sdp_list_free (attrs, NULL);
+
+		sdp_uuid16_create(&obex_uuid, OBEX_FILETRANS_SVCLASS_ID);
+		attrs = sdp_list_append(0, &range);
+		search = sdp_list_append(0, uuid);
+
+		if (sdp_service_search_attr_req (sdp, search,
+						 SDP_ATTR_REQ_INDIVIDUAL, attrs,
+						 &seq)) {
+			d(g_printerr("find_obexftp_channel: "
+				     "Could not browse services, finding obex"));
+			goto end;
+		}
 	}
 	for (tmp = recs; tmp != NULL; tmp = tmp->next) {
 		sdp_record_t *rec = tmp->data;



Index: gnome-vfs2-obexftp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2-obexftp/devel/gnome-vfs2-obexftp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-vfs2-obexftp.spec	24 Aug 2007 12:15:59 -0000	1.5
+++ gnome-vfs2-obexftp.spec	25 Nov 2007 17:22:45 -0000	1.6
@@ -1,11 +1,12 @@
 Summary:	ObexFTP over Bluetooth support for GNOME
 Name:		gnome-vfs2-obexftp
 Version:	0.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://www.gnome.org/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs-obexftp/%{version}/gnome-vfs-obexftp-%{version}.tar.bz2
+Patch0:		gnome-vfs-obexftp-find-obex-directly.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gawk
@@ -23,6 +24,7 @@
 
 %prep
 %setup -q -n gnome-vfs-obexftp-%{version}
+%patch0 -p0 -b .obex-search
 
 %build
 %configure --enable-nautilus-workaround --disable-dependency-tracking
@@ -46,6 +48,10 @@
 %{_libdir}/gnome-vfs-2.0/modules/*.so
 
 %changelog
+* Sun Nov 25 2007 - Bastien Nocera <bnocera at redhat.com> - 0.4-3
+- Add patch to try and fix for broken devices that don't answer SDP
+  queries without a specific service (#345581)
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 0.4-2
 - Rebuild for PPC toolchain bug