rpms/obexd/F-13 0001-Revert-Fix-the-session-is-shutdown-when-the-agent-ex.patch, NONE, 1.1 obexd.spec, 1.23, 1.24

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/obexd/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31023

Modified Files:
	obexd.spec 
Added Files:
	0001-Revert-Fix-the-session-is-shutdown-when-the-agent-ex.patch 
Log Message:
* Mon Apr 12 2010 Bastien Nocera <bnocera at redhat.com> 0.22-2
- Fix bluetooth-sendto not disappearing after transfer


0001-Revert-Fix-the-session-is-shutdown-when-the-agent-ex.patch:
 session.c |   37 +++++++++++++++----------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

--- NEW FILE 0001-Revert-Fix-the-session-is-shutdown-when-the-agent-ex.patch ---
>From ca6fc415788f3a2d4d8ff4c97f297eebf1f668ed Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Wed, 14 Apr 2010 14:54:25 +0100
Subject: [PATCH] Revert "Fix: the session is shutdown when the agent exits the bus"

This reverts commit d57bffe46b71e17a640c11b389dd6da95f933729.
---
 client/session.c |   36 +++++++++++++++---------------------
 1 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/client/session.c b/client/session.c
index 817f950..3876136 100644
--- a/client/session.c
+++ b/client/session.c
@@ -588,6 +588,21 @@ static void abort_transfer(struct session_data *session)
 	session_unref(session);
 }
 
+int session_set_agent(struct session_data *session, const char *name,
+							const char *path)
+{
+	if (session == NULL)
+		return -EINVAL;
+
+	if (session->agent_name != NULL || session->agent_path != NULL)
+		return -EALREADY;
+
+	session->agent_name = g_strdup(name);
+	session->agent_path = g_strdup(path);
+
+	return 0;
+}
+
 static void append_entry(DBusMessageIter *dict,
 				const char *key, int type, void *val)
 {
@@ -1857,24 +1872,3 @@ int session_put(struct session_data *session, char *buf, const char *targetname)
 
 	return 0;
 }
-
-int session_set_agent(struct session_data *session, const char *name,
-							const char *path)
-{
-	if (session == NULL)
-		return -EINVAL;
-
-	if (session->agent_name != NULL || session->agent_path != NULL)
-		return -EALREADY;
-
-	session->agent_name = g_strdup(name);
-	session->agent_path = g_strdup(path);
-
-	session->owner_watch = g_dbus_add_disconnect_watch(session->conn,
-					session->owner, owner_disconnected,
-								session, NULL);
-
-	session_ref(session);
-
-	return 0;
-}
-- 
1.7.0.1



Index: obexd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/F-13/obexd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- obexd.spec	15 Mar 2010 11:39:23 -0000	1.23
+++ obexd.spec	14 Apr 2010 14:06:46 -0000	1.24
@@ -1,6 +1,6 @@
 Name:		obexd
 Version:	0.22
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	D-Bus service for Obex Client access
 
 Group:		System Environment/Daemons
@@ -10,6 +10,10 @@ Url:		http://www.bluez.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:  s390 s390x
 
+# Revert ca6fc415788f3a2d4d8ff4c97f297eebf1f668ed, see
+# http://thread.gmane.org/gmane.linux.bluez.kernel/5092/focus=5118
+Patch0:		0001-Revert-Fix-the-session-is-shutdown-when-the-agent-ex.patch
+
 BuildRequires:	glib2-devel
 BuildRequires:	dbus-devel
 BuildRequires:	bluez-libs-devel >= 4.0
@@ -22,6 +26,7 @@ other Bluetooth-equipped devices.
 
 %prep
 %setup -q
+%patch0 -p1 -b .release
 
 %build
 %configure --disable-server
@@ -44,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/obex-client.service
 
 %changelog
+* Mon Apr 12 2010 Bastien Nocera <bnocera at redhat.com> 0.22-2
+- Fix bluetooth-sendto not disappearing after transfer
+
 * Mon Mar 15 2010 Bastien Nocera <bnocera at redhat.com> 0.22-1
 - Update to 0.22