Merge lp:~bluetooth/ubuntu/lucid/obexd/main into lp:ubuntu/lucid/obexd

[Baptiste Mille-Mathias]

Revision of the 0.22-0ubuntu1, (did again, I used import-dsc this time, really better :)

[lp:~bluetooth/ubuntu/lucid/obexd/main]

5. By Baptiste Mille-Mathias on 2010-04-28

Revert change in release 0.22 to fix bluetooth-sendto dialog not being

=== modified file 'ChangeLog'
--- ChangeLog	2010-01-10 10:46:58 +0000
+++ ChangeLog	2010-04-28 20:38:30 +0000
@@ -1,3 +1,15 @@
+ver 0.22:
+	Fix file corruption during PUT operation.
+	Fix the response of PUT requests for PBAP.
+	Fix blocking while waiting capability script to exit.
+	Fix compilation issues with driver and plugin options.
+	Fix service driver selection when WHO header is informed.
+	Fix issue with PC-Suite WHO header.
+	Fix issue when mime type exists but is unknown.
+	Fix issue when opening file fails during SendFiles.
+	Fix error code response when there is no default vCard.
+	Fix a memory leak when opening a folder for listing.
+
 ver 0.21:
 	Fix crash caused by D-Bus timeout handling.
 	Fix issue when the object size is unknown.

=== modified file 'Makefile.am'
--- Makefile.am	2010-01-10 10:46:58 +0000
+++ Makefile.am	2010-04-28 20:38:30 +0000
@@ -90,6 +90,7 @@
 
 client_obex_client_SOURCES = $(gdbus_sources) $(gwobex_sources) client/main.c \
 				client/session.h client/session.c \
+				src/logging.h src/logging.c \
 				client/pbap.h client/pbap.c \
 				client/sync.h client/sync.c
 

=== modified file 'Makefile.in'
--- Makefile.in	2010-01-10 10:46:58 +0000
+++ Makefile.in	2010-04-28 20:38:30 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -89,8 +89,9 @@
 	gdbus/object.c gdbus/watch.c gwobex/gw-obex.h gwobex/gw-obex.c \
 	gwobex/obex-priv.h gwobex/obex-priv.c gwobex/obex-xfer.h \
 	gwobex/obex-xfer.c gwobex/utils.h gwobex/utils.c gwobex/log.h \
-	client/main.c client/session.h client/session.c client/pbap.h \
-	client/pbap.c client/sync.h client/sync.c
+	client/main.c client/session.h client/session.c src/logging.h \
+	src/logging.c client/pbap.h client/pbap.c client/sync.h \
+	client/sync.c
 am__dirstamp = $(am__leading_dot)dirstamp
 am__objects_1 = gdbus/mainloop.$(OBJEXT) gdbus/object.$(OBJEXT) \
 	gdbus/watch.$(OBJEXT)
@@ -98,8 +99,8 @@
 	gwobex/obex-xfer.$(OBJEXT) gwobex/utils.$(OBJEXT)
 @CLIENT_TRUE@am_client_obex_client_OBJECTS = $(am__objects_1) \
 @CLIENT_TRUE@	$(am__objects_2) client/main.$(OBJEXT) \
-@CLIENT_TRUE@	client/session.$(OBJEXT) client/pbap.$(OBJEXT) \
-@CLIENT_TRUE@	client/sync.$(OBJEXT)
+@CLIENT_TRUE@	client/session.$(OBJEXT) src/logging.$(OBJEXT) \
+@CLIENT_TRUE@	client/pbap.$(OBJEXT) client/sync.$(OBJEXT)
 client_obex_client_OBJECTS = $(am_client_obex_client_OBJECTS)
 client_obex_client_DEPENDENCIES =
 AM_V_lt = $(am__v_lt_$(V))
@@ -354,6 +355,7 @@
 @SERVER_TRUE@test_obex_test_LDADD = @OPENOBEX_LIBS@ @BLUEZ_LIBS@ @GLIB_LIBS@
 @CLIENT_TRUE@client_obex_client_SOURCES = $(gdbus_sources) $(gwobex_sources) client/main.c \
 @CLIENT_TRUE@				client/session.h client/session.c \
+@CLIENT_TRUE@				src/logging.h src/logging.c \
 @CLIENT_TRUE@				client/pbap.h client/pbap.c \
 @CLIENT_TRUE@				client/sync.h client/sync.c
 
@@ -552,6 +554,14 @@
 	client/$(DEPDIR)/$(am__dirstamp)
 client/session.$(OBJEXT): client/$(am__dirstamp) \
 	client/$(DEPDIR)/$(am__dirstamp)
+src/$(am__dirstamp):
+	@$(MKDIR_P) src
+	@: > src/$(am__dirstamp)
+src/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/$(DEPDIR)
+	@: > src/$(DEPDIR)/$(am__dirstamp)
+src/logging.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 client/pbap.$(OBJEXT): client/$(am__dirstamp) \
 	client/$(DEPDIR)/$(am__dirstamp)
 client/sync.$(OBJEXT): client/$(am__dirstamp) \
@@ -575,17 +585,9 @@
 	plugins/$(DEPDIR)/$(am__dirstamp)
 plugins/syncevolution.$(OBJEXT): plugins/$(am__dirstamp) \
 	plugins/$(DEPDIR)/$(am__dirstamp)
-src/$(am__dirstamp):
-	@$(MKDIR_P) src
-	@: > src/$(am__dirstamp)
-src/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/$(DEPDIR)
-	@: > src/$(DEPDIR)/$(am__dirstamp)
 src/main.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/plugin.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
-src/logging.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
 src/btio.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/manager.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
@@ -822,7 +824,8 @@
 	  fi; \
 	done
 	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -866,17 +869,17 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac

=== modified file 'README'
--- README	2009-07-27 19:02:30 +0000
+++ README	2010-04-28 20:38:30 +0000
@@ -1,7 +1,7 @@
 OBEX Server and Client
 **********************
 
-Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
 
 
 Compilation and installation

=== modified file 'aclocal.m4'
--- aclocal.m4	2009-07-27 19:02:30 +0000
+++ aclocal.m4	2010-04-28 20:38:30 +0000
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
@@ -7862,15 +7862,15 @@
 
 # Generated from ltversion.in.
 
-# serial 3012 ltversion.m4
+# serial 3017 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
-m4_define([LT_PACKAGE_REVISION], [1.3012])
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+m4_define([LT_PACKAGE_REVISION], [1.3017])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6'
-macro_revision='1.3012'
+[macro_version='2.2.6b'
+macro_revision='1.3017'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
@@ -8139,7 +8139,7 @@
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.11.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -8155,7 +8155,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

=== modified file 'client/main.c'
--- client/main.c	2010-01-10 10:46:58 +0000
+++ client/main.c	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  OBEX Client
  *
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -29,10 +29,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
+#include <syslog.h>
 
 #include <glib.h>
 #include <gdbus.h>
 
+#include "logging.h"
 #include "session.h"
 
 #define CLIENT_SERVICE  "org.openobex.client"
@@ -429,6 +431,17 @@
 
 static GMainLoop *event_loop = NULL;
 
+static gboolean option_debug = FALSE;
+static gboolean option_stderr = FALSE;
+
+static GOptionEntry options[] = {
+	{ "debug", 'd', 0, G_OPTION_ARG_NONE, &option_debug,
+				"Enable debug information output" },
+	{ "stderr", 's', 0, G_OPTION_ARG_NONE, &option_stderr,
+				"Write log information to stderr" },
+	{ NULL },
+};
+
 static void sig_term(int sig)
 {
 	g_main_loop_quit(event_loop);
@@ -436,32 +449,56 @@
 
 int main(int argc, char *argv[])
 {
+	GOptionContext *context;
 	struct sigaction sa;
 	DBusConnection *conn;
-	DBusError err;
-
-	dbus_error_init(&err);
-
-	conn = g_dbus_setup_bus(DBUS_BUS_SESSION, CLIENT_SERVICE, &err);
-	if (conn == NULL) {
-		if (dbus_error_is_set(&err) == TRUE) {
-			fprintf(stderr, "%s\n", err.message);
-			dbus_error_free(&err);
-		} else
-			fprintf(stderr, "Can't register with session bus\n");
+	DBusError derr;
+	GError *gerr = NULL;
+	int log_option;
+
+	context = g_option_context_new(NULL);
+	g_option_context_add_main_entries(context, options, NULL);
+
+	g_option_context_parse(context, &argc, &argv, &gerr);
+	if (gerr != NULL) {
+		g_printerr("%s\n", gerr->message);
+		g_error_free(gerr);
+		exit(EXIT_FAILURE);
+	}
+
+	g_option_context_free(context);
+
+	dbus_error_init(&derr);
+
+	conn = g_dbus_setup_bus(DBUS_BUS_SESSION, CLIENT_SERVICE, &derr);
+	if (dbus_error_is_set(&derr) == TRUE) {
+		g_printerr("%s: %s\n", derr.name, derr.message);
+		dbus_error_free(&derr);
 		exit(EXIT_FAILURE);
 	}
 
 	if (g_dbus_register_interface(conn, CLIENT_PATH, CLIENT_INTERFACE,
 						client_methods, NULL, NULL,
 							NULL, NULL) == FALSE) {
-		fprintf(stderr, "Can't register client interface\n");
+		g_printerr("Can't register client interface\n");
 		dbus_connection_unref(conn);
 		exit(EXIT_FAILURE);
 	}
 
 	event_loop = g_main_loop_new(NULL, FALSE);
 
+	log_option = LOG_NDELAY | LOG_PID;
+
+	if (option_stderr == TRUE)
+		log_option |= LOG_PERROR;
+
+	openlog("obex-client", log_option, LOG_DAEMON);
+
+	if (option_debug == TRUE) {
+		info("Enabling debug information");
+		enable_debug();
+	}
+
 	memset(&sa, 0, sizeof(sa));
 	sa.sa_handler = sig_term;
 	sigaction(SIGINT, &sa, NULL);

=== modified file 'client/pbap.c'
--- client/pbap.c	2010-01-10 10:46:58 +0000
+++ client/pbap.c	2010-04-28 20:38:30 +0000
@@ -2,8 +2,8 @@
  *
  *  OBEX Client
  *
- *  Copyright (C) 2007-2008  Intel Corporation
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Intel Corporation
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -30,6 +30,7 @@
 #include <glib.h>
 #include <gdbus.h>
 
+#include "logging.h"
 #include "session.h"
 #include "pbap.h"
 
@@ -298,8 +299,8 @@
 		struct apparam_hdr *hdr = (struct apparam_hdr *) buf;
 
 		if (hdr->len > size - APPARAM_HDR_SIZE) {
-			fprintf(stderr, "Unexpected PBAP pullphonebook app"
-					" length, tag %d, len %d\n",
+			error("Unexpected PBAP pullphonebook app"
+					" length, tag %d, len %d",
 					hdr->tag, hdr->len);
 			return;
 		}
@@ -317,8 +318,8 @@
 				*new_missed_calls = hdr->val[0];
 			break;
 		default:
-			fprintf(stderr, "Unexpected PBAP pullphonebook app"
-					" parameter, tag %d, len %d\n",
+			error("Unexpected PBAP pullphonebook app"
+					" parameter, tag %d, len %d",
 					hdr->tag, hdr->len);
 		}
 
@@ -443,7 +444,7 @@
 		func = phonebook_size_callback;
 		break;
 	default:
-		fprintf(stderr, "Unexpected type : 0x%2x\n", type);
+		error("Unexpected type : 0x%2x", type);
 		return NULL;
 	}
 

=== modified file 'client/pbap.h'
--- client/pbap.h	2009-07-27 19:02:30 +0000
+++ client/pbap.h	2010-04-28 20:38:30 +0000
@@ -2,8 +2,8 @@
  *
  *  OBEX Client
  *
- *  Copyright (C) 2007-2008  Intel Corporation
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Intel Corporation
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify

=== modified file 'client/session.c'
--- client/session.c	2009-07-27 19:02:30 +0000
+++ client/session.c	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  OBEX Client
  *
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -39,6 +39,7 @@
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
+#include "logging.h"
 #include "pbap.h"
 #include "sync.h"
 #include "session.h"
@@ -55,6 +56,8 @@
 
 #define DEFAULT_BUFFER_SIZE 4096
 
+typedef int (*reply_callback_t) (struct session_data *session, void *data);
+
 static guint64 counter = 0;
 
 static unsigned char pcsuite_uuid[] = { 0x00, 0x00, 0x50, 0x05, 0x00, 0x00,
@@ -68,6 +71,19 @@
 	void *data;
 };
 
+struct pending_request {
+	struct session_data *session;
+	reply_callback_t callback;
+	void *data;
+};
+
+struct get_params {
+	const char *type;
+	const guint8 *apparam;
+	gint apparam_size;
+	session_callback_t func;
+};
+
 static struct session_data *session_ref(struct session_data *session)
 {
 	g_atomic_int_inc(&session->refcount);
@@ -461,26 +477,6 @@
 	return 0;
 }
 
-static void agent_request(DBusConnection *conn, const char *agent_name,
-			const char *agent_path, const char *transfer_path)
-{
-	DBusMessage *message;
-
-	if (agent_name == NULL || agent_path == NULL || transfer_path == NULL)
-		return;
-
-	message = dbus_message_new_method_call(agent_name,
-			agent_path, AGENT_INTERFACE, "Request");
-
-	dbus_message_append_args(message,
-			DBUS_TYPE_OBJECT_PATH, &transfer_path,
-			DBUS_TYPE_INVALID);
-
-	g_dbus_send_message(conn, message);
-
-	/* FIXME: Reply needs be handled */
-}
-
 static void agent_notify_progress(DBusConnection *conn, const char *agent_name,
 			const char *agent_path, const char *transfer_path,
 			uint64_t transferred)
@@ -592,21 +588,6 @@
 	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)
 {
@@ -978,9 +959,11 @@
 
 static void unregister_transfer(struct session_data *session)
 {
-	gw_obex_xfer_close(session->xfer, NULL);
-	gw_obex_xfer_free(session->xfer);
-	session->xfer = NULL;
+	if (session->xfer) {
+		gw_obex_xfer_close(session->xfer, NULL);
+		gw_obex_xfer_free(session->xfer);
+		session->xfer = NULL;
+	}
 
 	g_free(session->filename);
 	session->filename = NULL;
@@ -1081,7 +1064,7 @@
 	}
 
 	if (err) {
-		fprintf(stderr, "gw_obex_xfer_read(): %s\n",
+		error("gw_obex_xfer_read(): %s",
 				OBEX_ResponseToString(err));
 		goto complete;
 	}
@@ -1157,7 +1140,7 @@
 	}
 
 	if (ret == FALSE) {
-		fprintf(stderr, "gw_obex_xfer_read(): %s\n",
+		error("gw_obex_xfer_read(): %s",
 				OBEX_ResponseToString(err));
 		goto complete;
 	}
@@ -1215,13 +1198,212 @@
 	g_free(callback);
 }
 
+static void put_xfer_progress(GwObexXfer *xfer, gpointer user_data)
+{
+	struct session_data *session = user_data;
+	ssize_t len;
+	gint written;
+
+	if (session->buffer_len == 0) {
+		session->buffer_len = DEFAULT_BUFFER_SIZE;
+		session->buffer = g_new0(char, DEFAULT_BUFFER_SIZE);
+	}
+
+	len = read(session->fd, session->buffer + session->filled,
+				session->buffer_len - session->filled);
+	if (len <= 0)
+		goto complete;
+
+	if (gw_obex_xfer_write(xfer, session->buffer, session->filled + len,
+						&written, NULL) == FALSE)
+		goto complete;
+
+	if (gw_obex_xfer_flush(xfer, NULL) == FALSE)
+		goto complete;
+
+	session->filled = (session->filled + len) - written;
+
+	memmove(session->buffer, session->buffer + written, session->filled);
+
+	session->transferred += written;
+
+	agent_notify_progress(session->conn, session->agent_name,
+			session->agent_path, session->transfer_path,
+			session->transferred);
+	return;
+
+complete:
+	if (len == 0)
+		agent_notify_complete(session->conn, session->agent_name,
+				session->agent_path, session->transfer_path);
+	else
+		agent_notify_error(session->conn, session->agent_name,
+				session->agent_path, session->transfer_path,
+				"Error sending object");
+
+	unregister_transfer(session);
+
+	if (session->pending->len > 0) {
+		gchar *filename = g_ptr_array_index(session->pending, 0);
+		gchar *basename = g_path_get_basename(filename);
+
+		g_ptr_array_remove(session->pending, filename);
+
+		session_send(session, filename, basename);
+		g_free(filename);
+		g_free(basename);
+	}
+
+	session_unref(session);
+}
+
+static void agent_request_reply(DBusPendingCall *call, gpointer user_data)
+{
+	struct pending_request *pending = user_data;
+	struct session_data *session = pending->session;
+	DBusMessage *reply = dbus_pending_call_steal_reply(call);
+	const char *name;
+	DBusError derr;
+
+	dbus_error_init(&derr);
+	if (dbus_set_error_from_message(&derr, reply)) {
+		error("Replied with an error: %s, %s",
+				derr.name, derr.message);
+		dbus_error_free(&derr);
+		goto fail;
+	}
+
+	dbus_message_get_args(reply, NULL,
+			DBUS_TYPE_STRING, &name,
+			DBUS_TYPE_INVALID);
+
+	if (strlen(name)) {
+		g_free(session->name);
+		session->name = g_strdup(name);
+	}
+
+	if (pending->callback(session, pending->data))
+		goto fail;
+
+	g_free(pending);
+
+	return;
+
+fail:
+	unregister_transfer(session);
+
+	session_unref(session);
+
+	if (session->pending->len > 0) {
+		gchar *filename = g_ptr_array_index(session->pending, 0);
+		gchar *basename = g_path_get_basename(filename);
+
+		g_ptr_array_remove(session->pending, filename);
+
+		session_send(session, filename, basename);
+		g_free(filename);
+		g_free(basename);
+	}
+
+	g_free(pending);
+}
+
+static void agent_request(DBusConnection *conn, struct session_data *session,
+		reply_callback_t cb, void *user_data)
+{
+	DBusMessage *message;
+	DBusPendingCall *call;
+	struct pending_request *pending;
+
+	if (session->agent_name == NULL || session->agent_path == NULL ||
+			session->transfer_path == NULL) {
+		if (cb(session, user_data))
+			goto fail;
+
+		return;
+	}
+
+	message = dbus_message_new_method_call(session->agent_name,
+			session->agent_path, AGENT_INTERFACE, "Request");
+
+	dbus_message_append_args(message,
+			DBUS_TYPE_OBJECT_PATH, &session->transfer_path,
+			DBUS_TYPE_INVALID);
+
+	if (!dbus_connection_send_with_reply(conn, message, &call, -1)) {
+		dbus_message_unref(message);
+		return;
+	}
+
+	dbus_message_unref(message);
+
+	pending = g_new0(struct pending_request, 1);
+	pending->session = session;
+	pending->callback = cb;
+	pending->data = user_data;
+
+	dbus_pending_call_set_notify(call, agent_request_reply, pending, NULL);
+	dbus_pending_call_unref(call);
+
+	return;
+
+fail:
+	unregister_transfer(session);
+
+	session_unref(session);
+}
+
+static int session_get_reply(struct session_data *session, void *data)
+{
+	struct get_params *params = data;
+	struct callback_data *callback;
+	GwObexXfer *xfer;
+
+	xfer = gw_obex_get_async_with_apparam(session->obex, session->filename,
+			params->type, params->apparam, params->apparam_size,
+			NULL);
+
+	if (xfer == NULL) {
+		close(session->fd);
+		session_unref(session);
+		g_free(params);
+		return -EIO;
+	}
+
+	callback = g_try_malloc0(sizeof(*callback));
+	if (callback == NULL) {
+		close(session->fd);
+		session_unref(session);
+		gw_obex_xfer_free(xfer);
+		g_free(params);
+		return -ENOMEM;
+	}
+
+	callback->session = session;
+	callback->func = params->func;
+
+	if (params->type == NULL)
+		gw_obex_xfer_set_callback(xfer, get_xfer_progress, callback);
+	else
+		gw_obex_xfer_set_callback(xfer, get_xfer_listing_progress,
+					callback);
+
+	session->xfer = xfer;
+
+	agent_notify_progress(session->conn, session->agent_name,
+			session->agent_path, session->transfer_path, 0);
+
+	g_free(params);
+
+	return 0;
+}
+
 int session_get(struct session_data *session, const char *type,
 		const char *filename, const char *targetname,
 		const guint8  *apparam, gint apparam_size,
 		session_callback_t func)
 {
-	struct callback_data *callback;
-	GwObexXfer *xfer;
+	struct get_params *params;
 	int err, fd = 0;
 
 	if (session->obex == NULL)
@@ -1234,12 +1416,13 @@
 		fd = open(targetname, O_WRONLY | O_CREAT, 0600);
 		if (fd < 0) {
 			err = errno;
-			fprintf(stderr, "open(): %s(%d)\n", strerror(err), err);
+			error("open(): %s(%d)", strerror(err), err);
 			return -err;
 		}
 	}
 
-	if (type == NULL || !g_str_equal(type, "x-obex/folder-listing")) {
+	/* for OBEX specific mime types we don't need to register a transfer */
+	if (type == NULL || (strncmp(type, "x-obex/", 7) && strncmp(type, "x-bt/", 5))) {
 		session->transfer_path = register_transfer(session->conn, session);
 		if (session->transfer_path == NULL) {
 			if (fd)
@@ -1257,38 +1440,13 @@
 
 	session_ref(session);
 
-	xfer = gw_obex_get_async_with_apparam(session->obex,
-				filename, type, apparam, apparam_size, NULL);
-	if (xfer == NULL) {
-		close(session->fd);
-		session_unref(session);
-		return -EIO;
-	}
-
-	callback = g_try_malloc0(sizeof(*callback));
-	if (callback == NULL) {
-		close(session->fd);
-		session_unref(session);
-		gw_obex_xfer_free(xfer);
-		return -ENOMEM;
-	}
-
-	callback->session = session;
-	callback->func = func;
-
-	if (type == NULL)
-		gw_obex_xfer_set_callback(xfer, get_xfer_progress, callback);
-	else
-		gw_obex_xfer_set_callback(xfer, get_xfer_listing_progress,
-					callback);
-
-	session->xfer = xfer;
-
-	agent_request(session->conn, session->agent_name,
-			session->agent_path, session->transfer_path);
-
-	agent_notify_progress(session->conn, session->agent_name,
-			session->agent_path, session->transfer_path, 0);
+	params = g_new0(struct get_params, 1);
+	params->type = type;
+	params->apparam = apparam;
+	params->apparam_size = apparam_size;
+	params->func = func;
+
+	agent_request(session->conn, session, session_get_reply, params);
 
 	return 0;
 }
@@ -1458,93 +1616,56 @@
 	{ }
 };
 
-static void put_xfer_progress(GwObexXfer *xfer, gpointer user_data)
+
+static int session_send_reply(struct session_data *session, void *data)
 {
-	struct session_data *session = user_data;
-	ssize_t len;
-	gint written;
-
-	if (session->buffer_len == 0) {
-		session->buffer_len = DEFAULT_BUFFER_SIZE;
-		session->buffer = g_new0(char, DEFAULT_BUFFER_SIZE);
-	}
-
-	len = read(session->fd, session->buffer + session->filled,
-				session->buffer_len - session->filled);
-	if (len <= 0)
-		goto complete;
-
-	if (gw_obex_xfer_write(xfer, session->buffer, session->filled + len,
-						&written, NULL) == FALSE)
-		goto complete;
-
-	if (gw_obex_xfer_flush(xfer, NULL) == FALSE)
-		goto complete;
-
-	session->filled = (session->filled + len) - written;
-
-	memmove(session->buffer + written, session->buffer, session->filled);
-
-	session->transferred += written;
+	GwObexXfer *xfer;
+
+	xfer = gw_obex_put_async(session->obex, session->name, NULL,
+			session->size, -1, NULL);
+	if (xfer == NULL)
+		return -ENOTCONN;
+
+	gw_obex_xfer_set_callback(xfer, put_xfer_progress, session);
+
+	session->xfer = xfer;
 
 	agent_notify_progress(session->conn, session->agent_name,
-			session->agent_path, session->transfer_path,
-			session->transferred);
-	return;
-
-complete:
-	if (len == 0)
-		agent_notify_complete(session->conn, session->agent_name,
-				session->agent_path, session->transfer_path);
-	else
-		agent_notify_error(session->conn, session->agent_name,
-				session->agent_path, session->transfer_path,
-				"Error sending object");
-
-	unregister_transfer(session);
-
-	if (session->pending->len > 0) {
-		gchar *filename = g_ptr_array_index(session->pending, 0);
-		gchar *basename = g_path_get_basename(filename);
-
-		g_ptr_array_remove(session->pending, filename);
-
-		session_send(session, filename, basename);
-		g_free(filename);
-		g_free(basename);
-	}
-
-	session_unref(session);
+			session->agent_path, session->transfer_path, 0);
+
+	return 0;
 }
 
 int session_send(struct session_data *session, const char *filename,
 				const char *targetname)
 {
-	GwObexXfer *xfer;
 	struct stat st;
-	int fd;
+	int fd, err;
 
 	if (session->obex == NULL)
 		return -ENOTCONN;
 
-	if (session->xfer != NULL) {
+	if (session->transfer_path != NULL) {
 		g_ptr_array_add(session->pending, g_strdup(filename));
 		return 0;
 	}
 
+	session->transfer_path = register_transfer(session->conn, session);
+	if (session->transfer_path == NULL) {
+		err = -EINVAL;
+		goto fail;
+	}
+
 	fd = open(filename, O_RDONLY);
-	if (fd < 0)
-		return -EIO;
+	if (fd < 0) {
+		err = -EIO;
+		goto fail;
+	}
 
 	if (fstat(fd, &st) < 0) {
 		close(fd);
-		return -EIO;
-	}
-
-	session->transfer_path = register_transfer(session->conn, session);
-	if (session->transfer_path == NULL) {
-		close(fd);
-		return -EIO;
+		err = -EIO;
+		goto fail;
 	}
 
 	session->fd = fd;
@@ -1555,22 +1676,16 @@
 
 	session_ref(session);
 
-	xfer = gw_obex_put_async(session->obex, session->name, NULL,
-						session->size, -1, NULL);
-	if (xfer == NULL)
-		return -ENOTCONN;
-
-	gw_obex_xfer_set_callback(xfer, put_xfer_progress, session);
-
-	session->xfer = xfer;
-
-	agent_request(session->conn, session->agent_name,
-			session->agent_path, session->transfer_path);
-
-	agent_notify_progress(session->conn, session->agent_name,
-			session->agent_path, session->transfer_path, 0);
+	agent_request(session->conn, session, session_send_reply, NULL);
 
 	return 0;
+
+fail:
+	agent_notify_error(session->conn, session->agent_name,
+			session->agent_path, session->transfer_path,
+			"Could not open file for sending");
+
+	return err;
 }
 
 int session_pull(struct session_data *session,
@@ -1695,10 +1810,30 @@
 	session_unref(session);
 }
 
+
+static int session_put_reply(struct session_data *session, void *data)
+{
+	GwObexXfer *xfer;
+
+	xfer = gw_obex_put_async(session->obex, session->name, NULL,
+						session->size, -1, NULL);
+	if (xfer == NULL)
+		return -ENOTCONN;
+
+	session_ref(session);
+
+	gw_obex_xfer_set_callback(xfer, put_buf_xfer_progress, session);
+
+	session->xfer = xfer;
+
+	agent_notify_progress(session->conn, session->agent_name,
+		session->agent_path, session->transfer_path, 0);
+
+	return 0;
+}
+
 int session_put(struct session_data *session, char *buf, const char *targetname)
 {
-	GwObexXfer *xfer;
-
 	if (session->obex == NULL)
 		return -ENOTCONN;
 
@@ -1711,22 +1846,28 @@
 	session->name = g_strdup(targetname);
 	session->buffer = buf;
 
-	xfer = gw_obex_put_async(session->obex, session->name, NULL,
-						session->size, -1, NULL);
-	if (xfer == NULL)
-		return -ENOTCONN;
+	agent_request(session->conn, session, session_put_reply, NULL);
+
+	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);
 
-	gw_obex_xfer_set_callback(xfer, put_buf_xfer_progress, session);
-
-	session->xfer = xfer;
-
-	agent_request(session->conn, session->agent_name,
-		session->agent_path, session->transfer_path);
-
-	agent_notify_progress(session->conn, session->agent_name,
-		session->agent_path, session->transfer_path, 0);
-
 	return 0;
 }

=== modified file 'client/session.h'
--- client/session.h	2010-01-10 10:46:58 +0000
+++ client/session.h	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  OBEX Client
  *
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify

=== modified file 'client/sync.c'
--- client/sync.c	2009-07-27 19:02:30 +0000
+++ client/sync.c	2010-04-28 20:38:30 +0000
@@ -2,8 +2,8 @@
  *
  *  OBEX Client
  *
- *  Copyright (C) 2007-2009  Intel Corporation
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Intel Corporation
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify

=== modified file 'client/sync.h'
--- client/sync.h	2009-07-27 19:02:30 +0000
+++ client/sync.h	2010-04-28 20:38:30 +0000
@@ -2,8 +2,8 @@
  *
  *  OBEX Client
  *
- *  Copyright (C) 2007-2008  Intel Corporation
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Intel Corporation
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify

=== modified file 'config.guess'
--- config.guess	2009-07-27 19:02:30 +0000
+++ config.guess	2010-04-28 20:38:30 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-27'
+timestamp='2009-11-20'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <[e-mail]>.
-# Please send patches to <[e-mail]>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <[e-mail]> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -170,7 +170,7 @@
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -333,6 +333,9 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@@ -656,7 +659,7 @@
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -807,12 +810,12 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
+    *:Interix*:*)
     	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd | genuineintel)
+	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -822,6 +825,9 @@
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -851,6 +857,20 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -873,6 +893,17 @@
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
 	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
@@ -882,78 +913,34 @@
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
 	echo or32-unknown-linux-gnu
 	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
 	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -962,8 +949,11 @@
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
@@ -986,66 +976,6 @@
     xtensa*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1074,7 +1004,7 @@
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1182,7 +1112,7 @@
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1275,6 +1205,16 @@
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}

=== modified file 'config.h.in'
--- config.h.in	2009-07-27 19:02:30 +0000
+++ config.h.in	2010-04-28 20:38:30 +0000
@@ -43,6 +43,9 @@
    */
 #undef LT_OBJDIR
 
+/* Define to 1 if you need the dbus_connection_can_send_type() funnction. */
+#undef NEED_DBUS_CONNECTION_CAN_SEND_TYPE
+
 /* Define to 1 if you need the dbus_watch_get_unix_fd() function. */
 #undef NEED_DBUS_WATCH_GET_UNIX_FD
 

=== modified file 'config.sub'
--- config.sub	2009-07-27 19:02:30 +0000
+++ config.sub	2010-04-28 20:38:30 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-17'
+timestamp='2009-11-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@
 
 
 # Please send patches to <[e-mail]>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -149,10 +152,13 @@
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -281,6 +287,7 @@
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -288,13 +295,14 @@
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
+	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -337,7 +345,7 @@
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -365,7 +373,7 @@
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
+	| romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -374,6 +382,7 @@
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
+	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -467,6 +476,10 @@
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -719,6 +732,9 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+        microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -1240,6 +1256,9 @@
         # First match some system type aliases
         # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+        -auroraux)
+	        os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1260,9 +1279,9 @@
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -kopensolaris* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1283,7 +1302,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1613,7 +1632,7 @@
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)

=== modified file 'configure'
--- configure	2010-01-10 10:46:58 +0000
+++ configure	2010-04-28 20:38:30 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for obexd 0.21.
+# Generated by GNU Autoconf 2.63 for obexd 0.22.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -743,8 +743,8 @@
 # Identity of this package.
 PACKAGE_NAME='obexd'
 PACKAGE_TARNAME='obexd'
-PACKAGE_VERSION='0.21'
-PACKAGE_STRING='obexd 0.21'
+PACKAGE_VERSION='0.22'
+PACKAGE_STRING='obexd 0.22'
 PACKAGE_BUGREPORT=''
 
 ac_default_prefix=/usr/local
@@ -1509,7 +1509,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures obexd 0.21 to adapt to many kinds of systems.
+\`configure' configures obexd 0.22 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1579,7 +1579,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of obexd 0.21:";;
+     short | recursive ) echo "Configuration of obexd 0.22:";;
    esac
   cat <<\_ACEOF
 
@@ -1706,7 +1706,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-obexd configure 0.21
+obexd configure 0.22
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1720,7 +1720,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by obexd $as_me 0.21, which was
+It was created by obexd $as_me 0.22, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2570,7 +2570,7 @@
 
 # Define the identity of the package.
  PACKAGE='obexd'
- VERSION='0.21'
+ VERSION='0.22'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4040,8 +4040,8 @@
 
 
 
-macro_version='2.2.6'
-macro_revision='1.3012'
+macro_version='2.2.6b'
+macro_revision='1.3017'
 
 
 
@@ -11932,6 +11932,81 @@
 
 fi
 
+{ $as_echo "$as_me:$LINENO: checking for dbus_connection_can_send_type in -ldbus-1" >&5
+$as_echo_n "checking for dbus_connection_can_send_type in -ldbus-1... " >&6; }
+if test "${ac_cv_lib_dbus_1_dbus_connection_can_send_type+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldbus-1  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dbus_connection_can_send_type ();
+int
+main ()
+{
+return dbus_connection_can_send_type ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_dbus_1_dbus_connection_can_send_type=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_dbus_1_dbus_connection_can_send_type=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dbus_1_dbus_connection_can_send_type" >&5
+$as_echo "$ac_cv_lib_dbus_1_dbus_connection_can_send_type" >&6; }
+if test "x$ac_cv_lib_dbus_1_dbus_connection_can_send_type" = x""yes; then
+  dummy=yes
+else
+
+cat >>confdefs.h <<\_ACEOF
+#define NEED_DBUS_CONNECTION_CAN_SEND_TYPE 1
+_ACEOF
+
+fi
+
 
 
 
@@ -12102,13 +12177,16 @@
 
 fi
 
-
 phonebook_driver=dummy
 
 # Check whether --with-phonebook was given.
 if test "${with_phonebook+set}" = set; then
   withval=$with_phonebook;
-	phonebook_driver=${withval}
+	if (test "${withval}" = "no"); then
+		phonebook_driver=dummy;
+	else
+		phonebook_driver=${withval};
+	fi
 
 fi
 
@@ -12277,7 +12355,11 @@
 # Check whether --with-telephony was given.
 if test "${with_telephony+set}" = set; then
   withval=$with_telephony;
-	telephony_driver=${withval}
+	if (test "${withval}" = "no"); then
+		telephony_driver=dummy;
+	else
+		telephony_driver=${withval};
+	fi
 
 fi
 
@@ -12781,7 +12863,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by obexd $as_me 0.21, which was
+This file was extended by obexd $as_me 0.22, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12844,7 +12926,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-obexd config.status 0.21
+obexd config.status 0.22
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

=== modified file 'configure.ac'
--- configure.ac	2010-01-10 10:46:58 +0000
+++ configure.ac	2010-04-28 20:38:30 +0000
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(obexd, 0.21)
+AC_INIT(obexd, 0.22)
 
 AM_INIT_AUTOMAKE([foreign subdir-objects])
 AM_CONFIG_HEADER(config.h)
@@ -76,6 +76,9 @@
 AC_CHECK_LIB(dbus-1, dbus_watch_get_unix_fd, dummy=yes,
 	AC_DEFINE(NEED_DBUS_WATCH_GET_UNIX_FD, 1,
 		[Define to 1 if you need the dbus_watch_get_unix_fd() function.]))
+AC_CHECK_LIB(dbus-1, dbus_connection_can_send_type, dummy=yes,
+	AC_DEFINE(NEED_DBUS_CONNECTION_CAN_SEND_TYPE, 1,
+		[Define to 1 if you need the dbus_connection_can_send_type() funnction.]))
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
@@ -102,10 +105,13 @@
 		CFLAGS="$CFLAGS -g"
 	fi
 ])
-
 phonebook_driver=dummy
 AC_ARG_WITH(phonebook, AC_HELP_STRING([--with-phonebook=DRIVER], [select phonebook driver]), [
-	phonebook_driver=${withval}
+	if (test "${withval}" = "no"); then
+		phonebook_driver=dummy;
+	else
+		phonebook_driver=${withval};
+	fi
 ])
 
 if (test "${phonebook_driver}" = "ebook"); then
@@ -126,7 +132,11 @@
 
 telephony_driver=dummy
 AC_ARG_WITH(telephony, AC_HELP_STRING([--with-telephony=DRIVER], [select telephony driver]), [
-	telephony_driver=${withval}
+	if (test "${withval}" = "no"); then
+		telephony_driver=dummy;
+	else
+		telephony_driver=${withval};
+	fi
 ])
 
 AC_SUBST([TELEPHONY_DRIVER], [telephony-${telephony_driver}.c])

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-10 10:46:58 +0000
+++ debian/changelog	2010-04-28 20:38:30 +0000
@@ -1,4 +1,28 @@
-obexd (0.21-0ubuntu1) lucid; urgency=low
+obexd (0.22-0ubuntu2) lucid-proposed; urgency=low
+
+  * debian/patches/0001-Revert-Fix-the-session-is-shutdown-when-the-agent-ex.patch
+    - Revert change in release 0.22 to fix bluetooth-sendto dialog not being
+    closed after transfer (LP: #559412)
+
+ -- Baptiste Mille-Mathias <[e-mail]>  Wed, 28 Apr 2010 21:20:16 +0200
+
+obexd (0.22-0ubuntu1) lucid; urgency=low
+
+  * New upstream release (LP: #539914):
+    - Fix file corruption during PUT operation. (LP: #421684]
+    - Fix the response of PUT requests for PBAP.
+    - Fix blocking while waiting capability script to exit.
+    - Fix compilation issues with driver and plugin options.
+    - Fix service driver selection when WHO header is informed.
+    - Fix issue with PC-Suite WHO header.
+    - Fix issue when mime type exists but is unknown.
+    - Fix issue when opening file fails during SendFiles.
+    - Fix error code response when there is no default vCard.
+    - Fix a memory leak when opening a folder for listing.
+
+ -- Baptiste Mille-Mathias <[e-mail]>  Mon, 15 Mar 2010 20:43:06 +0100
+
+obexd (0.21-0ubuntu1) karmic; urgency=low
 
   * New upstream release: (LP: #505432)
     - Fix crash caused by D-Bus timeout handling.

=== added directory 'debian/patches'
=== added file 'debian/patches/0001-Revert-Fix-the-session-is-shutdown-when-the-agent-ex.patch'
--- debian/patches/0001-Revert-Fix-the-session-is-shutdown-when-the-agent-ex.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0001-Revert-Fix-the-session-is-shutdown-when-the-agent-ex.patch	2010-04-28 20:38:30 +0000
@@ -0,0 +1,50 @@
+diff -Nur -x '*.orig' -x '*~' obexd/client/session.c obexd.new/client/session.c
+--- obexd/client/session.c	2010-04-26 21:41:26.362047000 +0200
++++ obexd.new/client/session.c	2010-04-28 22:32:26.726018633 +0200
+@@ -588,6 +588,21 @@
+ 	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)
+ {
+@@ -1850,24 +1865,3 @@
+ 
+ 	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;
+-}

=== modified file 'doc/agent-api.txt'
--- doc/agent-api.txt	2009-07-27 19:02:30 +0000
+++ doc/agent-api.txt	2010-04-28 20:38:30 +0000
@@ -1,9 +1,8 @@
 obexd Agent API description
 **********************************
 
-Copyright (C) 2007-2008  Nokia Corporation
-Copyright (C) 2007-2008  Instituto Nokia de Tecnologia (INdT)
-Copyright (C) 2007-2008  Marcel Holtmann <[e-mail]>
+Copyright (C) 2007-2010  Nokia Corporation
+Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
 
 
 Agent hierarchy

=== modified file 'doc/client-api.txt'
--- doc/client-api.txt	2010-01-10 10:46:58 +0000
+++ doc/client-api.txt	2010-04-28 20:38:30 +0000
@@ -1,7 +1,7 @@
 OBEX client API description
 ***************************
 
-Copyright (C) 2007-2008  Marcel Holtmann <[e-mail]>
+Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
 
 
 Client hierarchy

=== modified file 'doc/obexd-api.txt'
--- doc/obexd-api.txt	2009-07-27 19:02:30 +0000
+++ doc/obexd-api.txt	2010-04-28 20:38:30 +0000
@@ -1,9 +1,8 @@
 obexd API description
 **********************************
 
-Copyright (C) 2007-2008  Nokia Corporation
-Copyright (C) 2007-2008  Instituto Nokia de Tecnologia (INdT)
-Copyright (C) 2007-2008  Marcel Holtmann <[e-mail]>
+Copyright (C) 2007-2010  Nokia Corporation
+Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
 
 
 Manager hierarchy

=== modified file 'gdbus/gdbus.h'
--- gdbus/gdbus.h	2010-01-10 10:46:58 +0000
+++ gdbus/gdbus.h	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  D-Bus helper library
  *
- *  Copyright (C) 2004-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2004-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -40,6 +40,9 @@
 DBusConnection *g_dbus_setup_bus(DBusBusType type, const char *name,
 							DBusError *error);
 
+DBusConnection *g_dbus_setup_private(DBusBusType type, const char *name,
+							DBusError *error);
+
 gboolean g_dbus_request_name(DBusConnection *connection, const char *name,
 							DBusError *error);
 
@@ -88,9 +91,9 @@
 
 gboolean g_dbus_register_interface(DBusConnection *connection,
 					const char *path, const char *name,
-					GDBusMethodTable *methods,
-					GDBusSignalTable *signals,
-					GDBusPropertyTable *properties,
+					const GDBusMethodTable *methods,
+					const GDBusSignalTable *signals,
+					const GDBusPropertyTable *properties,
 					void *user_data,
 					GDBusDestroyFunction destroy);
 gboolean g_dbus_unregister_interface(DBusConnection *connection,
@@ -125,8 +128,10 @@
 				GDBusWatchFunction function,
 				void *user_data, GDBusDestroyFunction destroy);
 guint g_dbus_add_signal_watch(DBusConnection *connection,
-				const char *rule, GDBusSignalFunction function,
-				void *user_data, GDBusDestroyFunction destroy);
+				const char *sender, const char *path,
+				const char *interface, const char *member,
+				GDBusSignalFunction function, void *user_data,
+				GDBusDestroyFunction destroy);
 gboolean g_dbus_remove_watch(DBusConnection *connection, guint tag);
 void g_dbus_remove_all_watches(DBusConnection *connection);
 

=== modified file 'gdbus/mainloop.c'
--- gdbus/mainloop.c	2010-01-10 10:46:58 +0000
+++ gdbus/mainloop.c	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  D-Bus helper library
  *
- *  Copyright (C) 2004-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2004-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -25,8 +25,6 @@
 #include <config.h>
 #endif
 
-#include <stdint.h>
-
 #include <glib.h>
 #include <dbus/dbus.h>
 
@@ -42,116 +40,131 @@
 #define error(fmt...)
 #define debug(fmt...)
 
-typedef struct {
-	uint32_t id;
+struct timeout_handler {
+	guint id;
 	DBusTimeout *timeout;
-} timeout_handler_t;
+};
 
 struct watch_info {
-	guint watch_id;
-	GIOChannel *io;
+	guint id;
+	DBusWatch *watch;
 	DBusConnection *conn;
 };
 
-struct server_info {
-	guint watch_id;
-	GIOChannel *io;
-	DBusServer *server;
-};
-
 struct disconnect_data {
-	GDBusWatchFunction disconnect_cb;
+	GDBusWatchFunction function;
 	void *user_data;
 };
 
-static DBusHandlerResult disconnect_filter(DBusConnection *conn,
+static gboolean disconnected_signal(DBusConnection *conn,
 						DBusMessage *msg, void *data)
 {
 	struct disconnect_data *dc_data = data;
 
-	if (dbus_message_is_signal(msg,
-			DBUS_INTERFACE_LOCAL, "Disconnected") == TRUE) {
-		error("Got disconnected from the system message bus");
-		dc_data->disconnect_cb(conn, dc_data->user_data);
-		dbus_connection_unref(conn);
-	}
-
-	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	error("Got disconnected from the system message bus");
+
+	dc_data->function(conn, dc_data->user_data);
+
+	dbus_connection_unref(conn);
+
+	return TRUE;
 }
 
-static gboolean message_dispatch_cb(void *data)
+static gboolean message_dispatch(void *data)
 {
-	DBusConnection *connection = data;
+	DBusConnection *conn = data;
 
-	dbus_connection_ref(connection);
+	dbus_connection_ref(conn);
 
 	/* Dispatch messages */
-	while (dbus_connection_dispatch(connection) == DBUS_DISPATCH_DATA_REMAINS);
+	while (dbus_connection_dispatch(conn) == DBUS_DISPATCH_DATA_REMAINS);
 
-	dbus_connection_unref(connection);
+	dbus_connection_unref(conn);
 
 	return FALSE;
 }
 
+static inline void queue_dispatch(DBusConnection *conn,
+						DBusDispatchStatus status)
+{
+	if (status == DBUS_DISPATCH_DATA_REMAINS)
+		g_timeout_add(DISPATCH_TIMEOUT, message_dispatch, conn);
+}
+
 static gboolean watch_func(GIOChannel *chan, GIOCondition cond, gpointer data)
 {
-	DBusWatch *watch = data;
-	struct watch_info *info = dbus_watch_get_data(watch);
-	int flags = 0;
+	struct watch_info *info = data;
+	unsigned int flags = 0;
+
+	dbus_connection_ref(info->conn);
 
 	if (cond & G_IO_IN)  flags |= DBUS_WATCH_READABLE;
 	if (cond & G_IO_OUT) flags |= DBUS_WATCH_WRITABLE;
 	if (cond & G_IO_HUP) flags |= DBUS_WATCH_HANGUP;
 	if (cond & G_IO_ERR) flags |= DBUS_WATCH_ERROR;
 
-	dbus_watch_handle(watch, flags);
+	dbus_watch_handle(info->watch, flags);
 
-	if (dbus_connection_get_dispatch_status(info->conn) == DBUS_DISPATCH_DATA_REMAINS)
-		g_timeout_add(DISPATCH_TIMEOUT, message_dispatch_cb, info->conn);
+	dbus_connection_unref(info->conn);
 
 	return TRUE;
 }
 
+static void watch_info_free(void *data)
+{
+	struct watch_info *info = data;
+
+	if (info->id > 0) {
+		g_source_remove(info->id);
+		info->id = 0;
+	}
+
+	dbus_connection_unref(info->conn);
+
+	g_free(info);
+}
+
 static dbus_bool_t add_watch(DBusWatch *watch, void *data)
 {
+	DBusConnection *conn = data;
 	GIOCondition cond = G_IO_HUP | G_IO_ERR;
-	DBusConnection *conn = data;
+	GIOChannel *chan;
 	struct watch_info *info;
-	int fd, flags;
+	unsigned int flags;
+	int fd;
 
 	if (!dbus_watch_get_enabled(watch))
 		return TRUE;
 
-	info = g_new(struct watch_info, 1);
+	info = g_new0(struct watch_info, 1);
 
 	fd = dbus_watch_get_unix_fd(watch);
-	info->io = g_io_channel_unix_new(fd);
+	chan = g_io_channel_unix_new(fd);
+
+	info->watch = watch;
 	info->conn = dbus_connection_ref(conn);
 
-	dbus_watch_set_data(watch, info, NULL);
+	dbus_watch_set_data(watch, info, watch_info_free);
 
 	flags = dbus_watch_get_flags(watch);
 
 	if (flags & DBUS_WATCH_READABLE) cond |= G_IO_IN;
 	if (flags & DBUS_WATCH_WRITABLE) cond |= G_IO_OUT;
 
-	info->watch_id = g_io_add_watch(info->io, cond, watch_func, watch);
+	info->id = g_io_add_watch(chan, cond, watch_func, info);
+
+	g_io_channel_unref(chan);
 
 	return TRUE;
 }
 
 static void remove_watch(DBusWatch *watch, void *data)
 {
-	struct watch_info *info = dbus_watch_get_data(watch);
+	if (dbus_watch_get_enabled(watch))
+		return;
 
+	/* will trigger watch_info_free() */
 	dbus_watch_set_data(watch, NULL, NULL);
-
-	if (info) {
-		g_source_remove(info->watch_id);
-		g_io_channel_unref(info->io);
-		dbus_connection_unref(info->conn);
-		g_free(info);
-	}
 }
 
 static void watch_toggled(DBusWatch *watch, void *data)
@@ -166,10 +179,12 @@
 
 static gboolean timeout_handler_dispatch(gpointer data)
 {
-	timeout_handler_t *handler = data;
+	struct timeout_handler *handler = data;
+
+	handler->id = 0;
 
 	/* if not enabled should not be polled by the main loop */
-	if (dbus_timeout_get_enabled(handler->timeout) != TRUE)
+	if (!dbus_timeout_get_enabled(handler->timeout))
 		return FALSE;
 
 	dbus_timeout_handle(handler->timeout);
@@ -179,9 +194,7 @@
 
 static void timeout_handler_free(void *data)
 {
-	timeout_handler_t *handler = data;
-	if (!handler)
-		return;
+	struct timeout_handler *handler = data;
 
 	if (handler->id > 0) {
 		g_source_remove(handler->id);
@@ -193,35 +206,31 @@
 
 static dbus_bool_t add_timeout(DBusTimeout *timeout, void *data)
 {
-	timeout_handler_t *handler;
+	int interval = dbus_timeout_get_interval(timeout);
+	struct timeout_handler *handler;
 
 	if (!dbus_timeout_get_enabled(timeout))
 		return TRUE;
 
-	handler = g_new0(timeout_handler_t, 1);
+	handler = g_new0(struct timeout_handler, 1);
 
 	handler->timeout = timeout;
-	handler->id = g_timeout_add(dbus_timeout_get_interval(timeout),
-					timeout_handler_dispatch, handler);
 
 	dbus_timeout_set_data(timeout, handler, timeout_handler_free);
 
+	handler->id = g_timeout_add(interval, timeout_handler_dispatch,
+								handler);
+
 	return TRUE;
 }
 
 static void remove_timeout(DBusTimeout *timeout, void *data)
 {
-        timeout_handler_t *handler;
-
-        handler = dbus_timeout_get_data(timeout);
-
-        if (!handler)
-                return;
-
-        if (handler->id > 0) {
-                g_source_remove(handler->id);
-                handler->id = 0;
-        }
+	if (dbus_timeout_get_enabled(timeout))
+		return;
+
+	/* will trigger timeout_handler_free() */
+	dbus_timeout_set_data(timeout, NULL, NULL);
 }
 
 static void timeout_toggled(DBusTimeout *timeout, void *data)
@@ -232,63 +241,95 @@
 		remove_timeout(timeout, data);
 }
 
-static void dispatch_status_cb(DBusConnection *conn,
-				DBusDispatchStatus new_status, void *data)
+static void dispatch_status(DBusConnection *conn,
+					DBusDispatchStatus status, void *data)
 {
 	if (!dbus_connection_get_is_connected(conn))
 		return;
 
-	if (new_status == DBUS_DISPATCH_DATA_REMAINS)
-		g_timeout_add(DISPATCH_TIMEOUT, message_dispatch_cb, data);
+	queue_dispatch(conn, status);
 }
 
-static void setup_dbus_with_main_loop(DBusConnection *conn)
+static inline void setup_dbus_with_main_loop(DBusConnection *conn)
 {
 	dbus_connection_set_watch_functions(conn, add_watch, remove_watch,
 						watch_toggled, conn, NULL);
 
 	dbus_connection_set_timeout_functions(conn, add_timeout, remove_timeout,
-						timeout_toggled, conn, NULL);
+						timeout_toggled, NULL, NULL);
 
-	dbus_connection_set_dispatch_status_function(conn, dispatch_status_cb,
-								conn, NULL);
+	dbus_connection_set_dispatch_status_function(conn, dispatch_status,
+								NULL, NULL);
 }
 
-DBusConnection *g_dbus_setup_bus(DBusBusType type, const char *name,
-							DBusError *error)
+static gboolean setup_bus(DBusConnection *conn, const char *name,
+						DBusError *error)
 {
-	DBusConnection *conn;
-
-	conn = dbus_bus_get(type, error);
-
-	if (error != NULL) {
-		if (dbus_error_is_set(error) == TRUE)
-			return NULL;
-	}
-
-	if (conn == NULL)
-		return NULL;
+	gboolean result;
+	DBusDispatchStatus status;
 
 	if (name != NULL) {
-		if (dbus_bus_request_name(conn, name,
-				DBUS_NAME_FLAG_DO_NOT_QUEUE, error) !=
-				DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER ) {
-			dbus_connection_unref(conn);
-			return NULL;
-		}
+		result = g_dbus_request_name(conn, name, error);
 
 		if (error != NULL) {
-			if (dbus_error_is_set(error) == TRUE) {
-				dbus_connection_unref(conn);
-				return NULL;
-			}
+			if (dbus_error_is_set(error) == TRUE)
+				return FALSE;
 		}
+
+		if (result == FALSE)
+			return FALSE;
 	}
 
 	setup_dbus_with_main_loop(conn);
 
-	if (dbus_connection_get_dispatch_status(conn) == DBUS_DISPATCH_DATA_REMAINS)
-		g_timeout_add(DISPATCH_TIMEOUT, message_dispatch_cb, conn);
+	status = dbus_connection_get_dispatch_status(conn);
+	queue_dispatch(conn, status);
+
+	return TRUE;
+}
+
+DBusConnection *g_dbus_setup_bus(DBusBusType type, const char *name,
+							DBusError *error)
+{
+	DBusConnection *conn;
+
+	conn = dbus_bus_get(type, error);
+
+	if (error != NULL) {
+		if (dbus_error_is_set(error) == TRUE)
+			return NULL;
+	}
+
+	if (conn == NULL)
+		return NULL;
+
+	if (setup_bus(conn, name, error) == FALSE) {
+		dbus_connection_unref(conn);
+		return NULL;
+	}
+
+	return conn;
+}
+
+DBusConnection *g_dbus_setup_private(DBusBusType type, const char *name,
+							DBusError *error)
+{
+	DBusConnection *conn;
+
+	conn = dbus_bus_get_private(type, error);
+
+	if (error != NULL) {
+		if (dbus_error_is_set(error) == TRUE)
+			return NULL;
+	}
+
+	if (conn == NULL)
+		return NULL;
+
+	if (setup_bus(conn, name, error) == FALSE) {
+		dbus_connection_unref(conn);
+		return NULL;
+	}
 
 	return conn;
 }
@@ -296,6 +337,23 @@
 gboolean g_dbus_request_name(DBusConnection *connection, const char *name,
 							DBusError *error)
 {
+	int result;
+
+	result = dbus_bus_request_name(connection, name,
+					DBUS_NAME_FLAG_DO_NOT_QUEUE, error);
+
+	if (error != NULL) {
+		if (dbus_error_is_set(error) == TRUE)
+			return FALSE;
+	}
+
+	if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+		if (error != NULL)
+			dbus_set_error(error, name, "Name already in use");
+
+		return FALSE;
+	}
+
 	return TRUE;
 }
 
@@ -305,16 +363,17 @@
 {
 	struct disconnect_data *dc_data;
 
-	dc_data = g_new(struct disconnect_data, 1);
+	dc_data = g_new0(struct disconnect_data, 1);
 
-	dc_data->disconnect_cb = function;
+	dc_data->function = function;
 	dc_data->user_data = user_data;
 
 	dbus_connection_set_exit_on_disconnect(connection, FALSE);
 
-	if (dbus_connection_add_filter(connection, disconnect_filter,
-						dc_data, g_free) == FALSE) {
-		error("Can't add D-Bus disconnect filter");
+	if (g_dbus_add_signal_watch(connection, NULL, NULL,
+				DBUS_INTERFACE_LOCAL, "Disconnected",
+				disconnected_signal, dc_data, g_free) == 0) {
+		error("Failed to add watch for D-Bus Disconnected signal");
 		g_free(dc_data);
 		return FALSE;
 	}

=== modified file 'gdbus/object.c'
--- gdbus/object.c	2010-01-10 10:46:58 +0000
+++ gdbus/object.c	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  D-Bus helper library
  *
- *  Copyright (C) 2004-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2004-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -45,9 +45,9 @@
 
 struct interface_data {
 	char *name;
-	GDBusMethodTable *methods;
-	GDBusSignalTable *signals;
-	GDBusPropertyTable *properties;
+	const GDBusMethodTable *methods;
+	const GDBusSignalTable *signals;
+	const GDBusPropertyTable *properties;
 	void *user_data;
 	GDBusDestroyFunction destroy;
 };
@@ -114,8 +114,8 @@
 
 static void generate_interface_xml(GString *gstr, struct interface_data *iface)
 {
-	GDBusMethodTable *method;
-	GDBusSignalTable *signal;
+	const GDBusMethodTable *method;
+	const GDBusSignalTable *signal;
 
 	for (method = iface->methods; method && method->name; method++) {
 		if (!strlen(method->signature) && !strlen(method->reply))
@@ -238,7 +238,7 @@
 {
 	struct generic_data *data = user_data;
 	struct interface_data *iface;
-	GDBusMethodTable *method;
+	const GDBusMethodTable *method;
 	const char *interface;
 
 	interface = dbus_message_get_interface(message);
@@ -327,9 +327,9 @@
 };
 
 static void add_interface(struct generic_data *data, const char *name,
-				GDBusMethodTable *methods,
-				GDBusSignalTable *signals,
-				GDBusPropertyTable *properties,
+				const GDBusMethodTable *methods,
+				const GDBusSignalTable *signals,
+				const GDBusPropertyTable *properties,
 				void *user_data,
 				GDBusDestroyFunction destroy)
 {
@@ -428,7 +428,7 @@
 {
 	struct generic_data *data = NULL;
 	struct interface_data *iface;
-	GDBusSignalTable *signal;
+	const GDBusSignalTable *signal;
 
 	*args = NULL;
 	if (!dbus_connection_get_object_path_data(conn, path,
@@ -502,9 +502,9 @@
 
 gboolean g_dbus_register_interface(DBusConnection *connection,
 					const char *path, const char *name,
-					GDBusMethodTable *methods,
-					GDBusSignalTable *signals,
-					GDBusPropertyTable *properties,
+					const GDBusMethodTable *methods,
+					const GDBusSignalTable *signals,
+					const GDBusPropertyTable *properties,
 					void *user_data,
 					GDBusDestroyFunction destroy)
 {

=== modified file 'gdbus/watch.c'
--- gdbus/watch.c	2010-01-10 10:46:58 +0000
+++ gdbus/watch.c	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  D-Bus helper library
  *
- *  Copyright (C) 2004-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2004-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -37,212 +37,335 @@
 #define error(fmt...)
 #define debug(fmt...)
 
-static DBusHandlerResult name_exit_filter(DBusConnection *connection,
+static DBusHandlerResult message_filter(DBusConnection *connection,
 					DBusMessage *message, void *user_data);
 
 static guint listener_id = 0;
-static GSList *name_listeners = NULL;
+static GSList *listeners = NULL;
 
-struct name_callback {
+struct filter_callback {
 	GDBusWatchFunction conn_func;
 	GDBusWatchFunction disc_func;
+	GDBusSignalFunction signal_func;
+	GDBusDestroyFunction destroy_func;
 	void *user_data;
 	guint id;
 };
 
-struct name_data {
+struct filter_data {
 	DBusConnection *connection;
-	char *name;
+	DBusHandleMessageFunction handle_func;
+	char *sender;
+	char *path;
+	char *interface;
+	char *member;
+	char *argument;
 	GSList *callbacks;
 	GSList *processed;
 	gboolean lock;
+	gboolean registered;
 };
 
-static struct name_data *name_data_find(DBusConnection *connection,
-							const char *name)
+static struct filter_data *filter_data_find(DBusConnection *connection,
+							const char *sender,
+							const char *path,
+							const char *interface,
+							const char *member,
+							const char *argument)
 {
 	GSList *current;
 
-	for (current = name_listeners;
+	for (current = listeners;
 			current != NULL; current = current->next) {
-		struct name_data *data = current->data;
+		struct filter_data *data = current->data;
 
 		if (connection != data->connection)
 			continue;
 
-		if (name == NULL || g_str_equal(name, data->name))
-			return data;
-	}
-
-	return NULL;
-}
-
-static struct name_callback *name_callback_find(GSList *callbacks, guint id)
-{
-	GSList *current;
-
-	for (current = callbacks; current != NULL; current = current->next) {
-		struct name_callback *cb = current->data;
-		if (cb->id == id)
-			return cb;
-	}
-
-	return NULL;
-}
-
-static void name_data_call_and_free(struct name_data *data)
+		if (sender && data->sender &&
+				g_str_equal(sender, data->sender) == FALSE)
+			continue;
+
+		if (path && data->path &&
+				g_str_equal(path, data->path) == FALSE)
+			continue;
+
+		if (interface && data->interface &&
+				g_str_equal(interface, data->interface) == FALSE)
+			continue;
+
+		if (member && data->member &&
+				g_str_equal(member, data->member) == FALSE)
+			continue;
+
+		if (argument && data->argument &&
+				g_str_equal(argument, data->argument) == FALSE)
+			continue;
+
+		return data;
+	}
+
+	return NULL;
+}
+
+static void format_rule(struct filter_data *data, char *rule, size_t size)
+{
+	int offset;
+
+	offset = snprintf(rule, size, "type='signal'");
+
+	if (data->sender)
+		offset += snprintf(rule + offset, size - offset,
+				",sender='%s'", data->sender);
+	if (data->path)
+		offset += snprintf(rule + offset, size - offset,
+				",path='%s'", data->path);
+	if (data->interface)
+		offset += snprintf(rule + offset, size - offset,
+				",interface='%s'", data->interface);
+	if (data->member)
+		offset += snprintf(rule + offset, size - offset,
+				",member='%s'", data->member);
+	if (data->argument)
+		snprintf(rule + offset, size - offset,
+				",arg0='%s'", data->argument);
+}
+
+static gboolean add_match(struct filter_data *data,
+				DBusHandleMessageFunction filter)
+{
+	DBusError err;
+	char rule[DBUS_MAXIMUM_MATCH_RULE_LENGTH];
+
+	format_rule(data, rule, sizeof(rule));
+	dbus_error_init(&err);
+
+	dbus_bus_add_match(data->connection, rule, &err);
+	if (dbus_error_is_set(&err)) {
+		error("Adding match rule \"%s\" failed: %s", rule,
+				err.message);
+		dbus_error_free(&err);
+		return FALSE;
+	}
+
+	data->handle_func = filter;
+	data->registered = TRUE;
+
+	return TRUE;
+}
+
+static gboolean remove_match(struct filter_data *data)
+{
+	DBusError err;
+	char rule[DBUS_MAXIMUM_MATCH_RULE_LENGTH];
+
+	format_rule(data, rule, sizeof(rule));
+
+	dbus_error_init(&err);
+
+	dbus_bus_remove_match(data->connection, rule, &err);
+	if (dbus_error_is_set(&err)) {
+		error("Removing owner match rule for %s failed: %s",
+				rule, err.message);
+		dbus_error_free(&err);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static struct filter_data *filter_data_get(DBusConnection *connection,
+					DBusHandleMessageFunction filter,
+					const char *sender,
+					const char *path,
+					const char *interface,
+					const char *member,
+					const char *argument)
+{
+	struct filter_data *data;
+
+	if (!filter_data_find(connection, NULL, NULL, NULL, NULL, NULL)) {
+		if (!dbus_connection_add_filter(connection,
+					message_filter, NULL, NULL)) {
+			error("dbus_connection_add_filter() failed");
+			return NULL;
+		}
+	}
+
+	data = filter_data_find(connection, sender, path, interface, member,
+					argument);
+	if (data)
+		return data;
+
+	data = g_new0(struct filter_data, 1);
+
+	data->connection = dbus_connection_ref(connection);
+	data->sender = g_strdup(sender);
+	data->path = g_strdup(path);
+	data->interface = g_strdup(interface);
+	data->member = g_strdup(member);
+	data->argument = g_strdup(argument);
+
+	if (!add_match(data, filter)) {
+		g_free(data);
+		return NULL;
+	}
+
+	listeners = g_slist_append(listeners, data);
+
+	return data;
+}
+
+static struct filter_callback *filter_data_find_callback(
+						struct filter_data *data,
+						guint id)
+{
+	GSList *l;
+
+	for (l = data->callbacks; l; l = l->next) {
+		struct filter_callback *cb = l->data;
+		if (cb->id == id)
+			return cb;
+	}
+	for (l = data->processed; l; l = l->next) {
+		struct filter_callback *cb = l->data;
+		if (cb->id == id)
+			return cb;
+	}
+
+	return NULL;
+}
+
+static void filter_data_free(struct filter_data *data)
+{
+	GSList *l;
+
+	for (l = data->callbacks; l != NULL; l = l->next)
+		g_free(l->data);
+
+	g_slist_free(data->callbacks);
+	g_free(data->sender);
+	g_free(data->path);
+	g_free(data->interface);
+	g_free(data->member);
+	g_free(data->argument);
+	dbus_connection_unref(data->connection);
+	g_free(data);
+}
+
+static void filter_data_call_and_free(struct filter_data *data)
 {
 	GSList *l;
 
 	for (l = data->callbacks; l != NULL; l = l->next) {
-		struct name_callback *cb = l->data;
+		struct filter_callback *cb = l->data;
 		if (cb->disc_func)
 			cb->disc_func(data->connection, cb->user_data);
+		if (cb->destroy_func)
+			cb->destroy_func(cb->user_data);
 		g_free(cb);
 	}
 
-	g_slist_free(data->callbacks);
-	g_free(data->name);
-	g_free(data);
-}
-
-static void name_data_free(struct name_data *data)
-{
-	GSList *l;
-
-	for (l = data->callbacks; l != NULL; l = l->next)
-		g_free(l->data);
-
-	g_slist_free(data->callbacks);
-	g_free(data->name);
-	g_free(data);
-}
-
-static int name_data_add(DBusConnection *connection, const char *name,
+	filter_data_free(data);
+}
+
+static struct filter_callback *filter_data_add_callback(
+						struct filter_data *data,
 						GDBusWatchFunction connect,
 						GDBusWatchFunction disconnect,
-						void *user_data, guint id)
+						GDBusSignalFunction signal,
+						GDBusDestroyFunction destroy,
+						void *user_data)
 {
-	int first = 1;
-	struct name_data *data = NULL;
-	struct name_callback *cb = NULL;
+	struct filter_callback *cb = NULL;
 
-	cb = g_new(struct name_callback, 1);
+	cb = g_new(struct filter_callback, 1);
 
 	cb->conn_func = connect;
 	cb->disc_func = disconnect;
+	cb->signal_func = signal;
+	cb->destroy_func = destroy;
 	cb->user_data = user_data;
-	cb->id = id;
-
-	data = name_data_find(connection, name);
-	if (data) {
-		first = 0;
-		goto done;
-	}
-
-	data = g_new0(struct name_data, 1);
-
-	data->connection = connection;
-	data->name = g_strdup(name);
-
-	name_listeners = g_slist_append(name_listeners, data);
-
-done:
+	cb->id = ++listener_id;
+
 	if (data->lock)
 		data->processed = g_slist_append(data->processed, cb);
 	else
 		data->callbacks = g_slist_append(data->callbacks, cb);
 
-	return first;
+	return cb;
 }
 
-static void name_data_remove(DBusConnection *connection,
-					const char *name, guint id)
+static gboolean filter_data_remove_callback(struct filter_data *data,
+						struct filter_callback *cb)
 {
-	struct name_data *data;
-	struct name_callback *cb = NULL;
-
-	data = name_data_find(connection, name);
-	if (!data)
-		return;
-
-	cb = name_callback_find(data->callbacks, id);
-	if (cb) {
-		data->callbacks = g_slist_remove(data->callbacks, cb);
-		g_free(cb);
-	}
-
-	if (data->callbacks)
-		return;
-
-	name_listeners = g_slist_remove(name_listeners, data);
-	name_data_free(data);
+	DBusConnection *connection;
+
+	data->callbacks = g_slist_remove(data->callbacks, cb);
+	data->processed = g_slist_remove(data->processed, cb);
+
+	if (cb->destroy_func)
+		cb->destroy_func(cb->user_data);
+
+	g_free(cb);
+
+	/* Don't remove the filter if other callbacks exist or data is lock
+	 * processing callbacks */
+	if (data->callbacks || data->lock)
+		return TRUE;
+
+	if (data->registered && !remove_match(data))
+		return FALSE;
+
+	connection = dbus_connection_ref(data->connection);
+	listeners = g_slist_remove(listeners, data);
+	filter_data_free(data);
 
 	/* Remove filter if there are no listeners left for the connection */
-	data = name_data_find(connection, NULL);
+	data = filter_data_find(connection, NULL, NULL, NULL, NULL, NULL);
 	if (!data)
-		dbus_connection_remove_filter(connection,
-						name_exit_filter,
+		dbus_connection_remove_filter(connection, message_filter,
 						NULL);
-}
-
-static gboolean add_match(DBusConnection *connection, const char *name)
-{
-	DBusError err;
-	char match_string[128];
-
-	snprintf(match_string, sizeof(match_string),
-			"interface=%s,member=NameOwnerChanged,arg0=%s",
-			DBUS_INTERFACE_DBUS, name);
-
-	dbus_error_init(&err);
-
-	dbus_bus_add_match(connection, match_string, &err);
-
-	if (dbus_error_is_set(&err)) {
-		error("Adding match rule \"%s\" failed: %s", match_string,
-				err.message);
-		dbus_error_free(&err);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static gboolean remove_match(DBusConnection *connection, const char *name)
-{
-	DBusError err;
-	char match_string[128];
-
-	snprintf(match_string, sizeof(match_string),
-			"interface=%s,member=NameOwnerChanged,arg0=%s",
-			DBUS_INTERFACE_DBUS, name);
-
-	dbus_error_init(&err);
-
-	dbus_bus_remove_match(connection, match_string, &err);
-
-	if (dbus_error_is_set(&err)) {
-		error("Removing owner match rule for %s failed: %s",
-				name, err.message);
-		dbus_error_free(&err);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static DBusHandlerResult name_exit_filter(DBusConnection *connection,
-					DBusMessage *message, void *user_data)
-{
-	struct name_data *data;
-	struct name_callback *cb;
+
+	dbus_connection_unref(connection);
+
+	return TRUE;
+}
+
+static DBusHandlerResult signal_filter(DBusConnection *connection,
+					DBusMessage *message, void *user_data)
+{
+	struct filter_data *data = user_data;
+	struct filter_callback *cb;
+
+	while (data->callbacks) {
+		cb = data->callbacks->data;
+
+		if (cb->signal_func && !cb->signal_func(connection, message,
+							cb->user_data)) {
+			filter_data_remove_callback(data, cb);
+			continue;
+		}
+
+		/* Check if the watch was removed/freed by the callback
+		 * function */
+		if (!g_slist_find(data->callbacks, cb))
+			continue;
+
+		data->callbacks = g_slist_remove(data->callbacks, cb);
+		data->processed = g_slist_append(data->processed, cb);
+	}
+
+	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+static DBusHandlerResult service_filter(DBusConnection *connection,
+					DBusMessage *message, void *user_data)
+{
+	struct filter_data *data = user_data;
+	struct filter_callback *cb;
 	char *name, *old, *new;
 
-	if (!dbus_message_is_signal(message, DBUS_INTERFACE_DBUS,
-							"NameOwnerChanged"))
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
 	if (!dbus_message_get_args(message, NULL,
 				DBUS_TYPE_STRING, &name,
 				DBUS_TYPE_STRING, &old,
@@ -252,14 +375,6 @@
 		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 	}
 
-	data = name_data_find(connection, name);
-	if (!data) {
-		error("Got NameOwnerChanged signal for %s which has no listeners", name);
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	data->lock = TRUE;
-
 	while (data->callbacks) {
 		cb = data->callbacks->data;
 
@@ -286,24 +401,56 @@
 		data->processed = g_slist_append(data->processed, cb);
 	}
 
-	data->callbacks = data->processed;
-	data->processed = NULL;
-	data->lock = FALSE;
+	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+
+static DBusHandlerResult message_filter(DBusConnection *connection,
+					DBusMessage *message, void *user_data)
+{
+	struct filter_data *data;
+	const char *sender, *path, *iface, *member, *arg = NULL;
+
+	/* Only filter signals */
+	if (dbus_message_get_type(message) != DBUS_MESSAGE_TYPE_SIGNAL)
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+	sender = dbus_message_get_sender(message);
+	path = dbus_message_get_path(message);
+	iface = dbus_message_get_interface(message);
+	member = dbus_message_get_member(message);
+	dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &arg, DBUS_TYPE_INVALID);
+
+	data = filter_data_find(connection, sender, path, iface, member, arg);
+	if (!data) {
+		error("Got %s.%s signal which has no listeners", iface, member);
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+
+	if (data->handle_func) {
+		data->lock = TRUE;
+
+		data->handle_func(connection, message, data);
+
+		data->callbacks = data->processed;
+		data->processed = NULL;
+		data->lock = FALSE;
+	}
 
 	if (data->callbacks)
 		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 
-	name_listeners = g_slist_remove(name_listeners, data);
-	name_data_free(data);
+	remove_match(data);
+
+	listeners = g_slist_remove(listeners, data);
+	filter_data_free(data);
 
 	/* Remove filter if there no listener left for the connection */
-	data = name_data_find(connection, NULL);
+	data = filter_data_find(connection, NULL, NULL, NULL, NULL, NULL);
 	if (!data)
-		dbus_connection_remove_filter(connection, name_exit_filter,
+		dbus_connection_remove_filter(connection, message_filter,
 						NULL);
 
-	remove_match(connection, name);
-
 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
@@ -388,6 +535,8 @@
 
 	dbus_pending_call_set_notify(call, service_reply, data, NULL);
 
+	dbus_pending_call_unref(call);
+
 done:
 	dbus_message_unref(message);
 }
@@ -397,38 +546,27 @@
 				GDBusWatchFunction disconnect,
 				void *user_data, GDBusDestroyFunction destroy)
 {
-	int first;
-
-	if (!name_data_find(connection, NULL)) {
-		if (!dbus_connection_add_filter(connection,
-					name_exit_filter, NULL, NULL)) {
-			error("dbus_connection_add_filter() failed");
-			return 0;
-		}
-	}
-
-	listener_id++;
-	first = name_data_add(connection, name, connect, disconnect,
-						user_data, listener_id);
-	/* The filter is already added if this is not the first callback
-	 * registration for the name */
-	if (!first)
-		goto done;
-
-	if (name) {
-		debug("name_listener_add(%s)", name);
-
-		if (!add_match(connection, name)) {
-			name_data_remove(connection, name, listener_id);
-			return 0;
-		}
-	}
-
-done:
+	struct filter_data *data;
+	struct filter_callback *cb;
+
+	if (!name)
+		return 0;
+
+	data = filter_data_get(connection, service_filter, NULL, NULL,
+				DBUS_INTERFACE_DBUS, "NameOwnerChanged",
+				name);
+	if (!data)
+		return 0;
+
+	cb = filter_data_add_callback(data, connect, disconnect, NULL, NULL,
+					user_data);
+	if (!cb)
+		return 0;
+
 	if (connect)
 		check_service(connection, name, connect, user_data);
 
-	return listener_id;
+	return cb->id;
 }
 
 guint g_dbus_add_disconnect_watch(DBusConnection *connection, const char *name,
@@ -440,72 +578,57 @@
 }
 
 guint g_dbus_add_signal_watch(DBusConnection *connection,
-				const char *rule, GDBusSignalFunction function,
-				void *user_data, GDBusDestroyFunction destroy)
+				const char *sender, const char *path,
+				const char *interface, const char *member,
+				GDBusSignalFunction function, void *user_data,
+				GDBusDestroyFunction destroy)
 {
-	return 0;
+	struct filter_data *data;
+	struct filter_callback *cb;
+
+	data = filter_data_get(connection, signal_filter, sender, path,
+				interface, member, NULL);
+	if (!data)
+		return 0;
+
+	cb = filter_data_add_callback(data, NULL, NULL, function, destroy,
+					user_data);
+	if (!cb)
+		return 0;
+
+	return cb->id;
 }
 
 gboolean g_dbus_remove_watch(DBusConnection *connection, guint id)
 {
-	struct name_data *data;
-	struct name_callback *cb;
-	GSList *ldata, *lcb;
+	struct filter_data *data;
+	struct filter_callback *cb;
+	GSList *ldata;
 
 	if (id == 0)
 		return FALSE;
 
-	for (ldata = name_listeners; ldata; ldata = ldata->next) {
+	for (ldata = listeners; ldata; ldata = ldata->next) {
 		data = ldata->data;
-		for (lcb = data->callbacks; lcb; lcb = lcb->next) {
-			cb = lcb->data;
-			if (cb->id == id)
-				goto remove;
-		}
-		for (lcb = data->processed; lcb; lcb = lcb->next) {
-			cb = lcb->data;
-			if (cb->id == id)
-				goto remove;
+
+		cb = filter_data_find_callback(data, id);
+		if (cb) {
+			filter_data_remove_callback(data, cb);
+			return TRUE;
 		}
 	}
 
 	return FALSE;
-
-remove:
-	data->callbacks = g_slist_remove(data->callbacks, cb);
-	data->processed = g_slist_remove(data->processed, cb);
-	g_free(cb);
-
-	/* Don't remove the filter if other callbacks exist or data is lock
-	 * processing callbacks */
-	if (data->callbacks || data->lock)
-		return TRUE;
-
-	if (data->name) {
-		if (!remove_match(data->connection, data->name))
-			return FALSE;
-	}
-
-	name_listeners = g_slist_remove(name_listeners, data);
-	name_data_free(data);
-
-	/* Remove filter if there are no listeners left for the connection */
-	data = name_data_find(connection, NULL);
-	if (!data)
-		dbus_connection_remove_filter(connection, name_exit_filter,
-						NULL);
-
-	return TRUE;
 }
 
 void g_dbus_remove_all_watches(DBusConnection *connection)
 {
-	struct name_data *data;
+	struct filter_data *data;
 
-	while ((data = name_data_find(connection, NULL))) {
-		name_listeners = g_slist_remove(name_listeners, data);
-		name_data_call_and_free(data);
+	while ((data = filter_data_find(connection, NULL, NULL, NULL, NULL, NULL))) {
+		listeners = g_slist_remove(listeners, data);
+		filter_data_call_and_free(data);
 	}
 
-	dbus_connection_remove_filter(connection, name_exit_filter, NULL);
+	dbus_connection_remove_filter(connection, message_filter, NULL);
 }

=== modified file 'ltmain.sh'
--- ltmain.sh	2009-07-27 19:02:30 +0000
+++ ltmain.sh	2010-04-28 20:38:30 +0000
@@ -1,6 +1,6 @@
 # Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool) 2.2.6
+# ltmain.sh (GNU libtool) 2.2.6b
 # Written by Gordon Matzigkeit <[e-mail]>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -65,7 +65,7 @@
 #       compiler:		$LTCC
 #       compiler flags:		$LTCFLAGS
 #       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6
+#       $progname:		(GNU libtool) 2.2.6b
 #       automake:		$automake_version
 #       autoconf:		$autoconf_version
 #
@@ -73,9 +73,9 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=2.2.6
+VERSION=2.2.6b
 TIMESTAMP=""
-package_revision=1.3012
+package_revision=1.3017
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

=== modified file 'plugins/filesystem.c'
--- plugins/filesystem.c	2010-01-10 10:46:58 +0000
+++ plugins/filesystem.c	2010-04-28 20:38:30 +0000
@@ -2,8 +2,8 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2009  Intel Corporation
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2009-2010  Intel Corporation
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -123,37 +123,49 @@
 }
 
 static gpointer filesystem_open(const char *name, int oflag, mode_t mode,
-				size_t *size)
+				size_t *size, int *err)
 {
 	struct stat stats;
 	struct statvfs buf;
 	int fd = open(name, oflag, mode);
 
-	if (fd < 0)
+	if (fd < 0) {
+		if (err)
+			*err = -errno;
 		return NULL;
+	}
 
 	if (fstat(fd, &stats) < 0) {
-		error("fstat(fd=%d): %s (%d)", fd, strerror(errno), errno);
+		if (err)
+			*err = -errno;
 		goto failed;
 	}
 
 	if (oflag == O_RDONLY) {
 		if (size)
 			*size = stats.st_size;
-		return GINT_TO_POINTER(fd);
+		goto done;
 	}
 
-	if (fstatvfs(fd, &buf) < 0)
+	if (fstatvfs(fd, &buf) < 0) {
+		if (err)
+			*err = -errno;
 		goto failed;
+	}
 
 	if (size == NULL)
-		return GINT_TO_POINTER(fd);
+		goto done;
 
 	if (buf.f_bsize * buf.f_bavail < *size) {
-		errno = ENOSPC;
+		if (err)
+			*err = -ENOSPC;
 		goto failed;
 	}
 
+done:
+	if (err)
+		*err = 0;
+
 	return GINT_TO_POINTER(fd);
 
 failed:
@@ -163,71 +175,138 @@
 
 static int filesystem_close(gpointer object)
 {
-	return close(GPOINTER_TO_INT(object));
+	if (close(GPOINTER_TO_INT(object)) < 0)
+		return -errno;
+
+	return 0;
 }
 
 static ssize_t filesystem_read(gpointer object, void *buf, size_t count)
 {
-	return read(GPOINTER_TO_INT(object), buf, count);
+	ssize_t ret;
+
+	ret = read(GPOINTER_TO_INT(object), buf, count);
+	if (ret < 0)
+		return -errno;
+
+	return ret;
 }
 
 static ssize_t filesystem_write(gpointer object, const void *buf, size_t count)
 {
-	return write(GPOINTER_TO_INT(object), buf, count);
+	ssize_t ret;
+
+	ret = write(GPOINTER_TO_INT(object), buf, count);
+	if (ret < 0)
+		return -errno;
+
+	return ret;
+}
+
+struct capability_object {
+	int pid;
+	int output;
+	int err;
+	guint watch;
+	GString *buffer;
+};
+
+static void script_exited(GPid pid, gint status, gpointer data)
+{
+	struct capability_object *object = data;
+	char buf[128];
+
+	object->pid = -1;
+
+	if (WEXITSTATUS(status) != EXIT_SUCCESS) {
+		memset(buf, 0, sizeof(buf));
+		if (read(object->err, buf, sizeof(buf)) > 0)
+			error("%s", buf);
+		obex_object_set_io_flags(data, G_IO_ERR, -EPERM);
+	} else
+		obex_object_set_io_flags(data, G_IO_IN, 0);
+
+	g_spawn_close_pid(pid);
+}
+
+static int capability_exec(const char **argv, int *output, int *err)
+{
+	GError *gerr = NULL;
+	int pid;
+	GSpawnFlags flags = G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH;
+
+	if (!g_spawn_async_with_pipes(NULL, (char **) argv, NULL, flags, NULL,
+				NULL, &pid, NULL, output, err, &gerr)) {
+		error("%s", gerr->message);
+		g_error_free(gerr);
+		return -EPERM;
+	}
+
+	return pid;
 }
 
 static gpointer capability_open(const char *name, int oflag, mode_t mode,
-				size_t *size)
+				size_t *size, int *err)
 {
-	GError *gerr = NULL;
+	struct capability_object *object = NULL;
 	gchar *buf;
-	gint exit;
-	gboolean ret;
-	GString *object;
+	const char *argv[2];
 
 	if (oflag != O_RDONLY)
 		goto fail;
 
+	object = g_new0(struct capability_object, 1);
+	object->pid = -1;
+	object->output = -1;
+	object->err = -1;
+
 	if (name[0] != '!') {
+		GError *gerr = NULL;
+		gboolean ret;
+
 		ret = g_file_get_contents(name, &buf, NULL, &gerr);
 		if (ret == FALSE) {
 			error("%s", gerr->message);
+			g_error_free(gerr);
 			goto fail;
 		}
 
+		object->buffer = g_string_new(buf);
+
+		if (size)
+			*size = object->buffer->len;
+
 		goto done;
 	}
 
-	ret = g_spawn_command_line_sync(name + 1, &buf, NULL, &exit, &gerr);
-	if (ret == FALSE) {
-		error("%s", gerr->message);
-		goto fail;
-	}
-
-	if (WEXITSTATUS(exit) != EXIT_SUCCESS) {
-		error("%s failed", name + 1);
-		g_free(buf);
-		goto fail;
-	}
+	argv[0] = &name[1];
+	argv[1] = NULL;
+
+	object->pid = capability_exec(argv, &object->output, &object->err);
+	if (object->pid < 0)
+		goto fail;
+
+	object->watch = g_child_watch_add(object->pid, script_exited, object);
+
+	if (size)
+		*size = 1;
 
 done:
-	object = g_string_new(buf);
-
-	if (size)
-		*size = object->len;
+	if (err)
+		*err = 0;
 
 	return object;
 
 fail:
-	if (gerr)
-		g_error_free(gerr);
+	if (err)
+		*err = -EPERM;
 
-	errno = EPERM;
+	g_free(object);
 	return NULL;
 }
 
 static gpointer folder_open(const char *name, int oflag, mode_t mode,
-				size_t *size)
+				size_t *size, int *err)
 {
 	struct obex_session *os;
 	struct stat fstat, dstat;
@@ -235,7 +314,7 @@
 	DIR *dp;
 	GString *object;
 	gboolean root, pcsuite;
-	gint err;
+	int ret;
 
 	os = obex_get_session(NULL);
 
@@ -250,20 +329,21 @@
 
 	dp = opendir(name);
 	if (dp == NULL) {
-		errno = ENOENT;
+		if (err)
+			*err = -ENOENT;
 		goto failed;
 	}
 
 	if (root && os->server->symlinks)
-		err = stat(name, &dstat);
+		ret = stat(name, &dstat);
 	else {
 		object = g_string_append(object, FL_PARENT_FOLDER_ELEMENT);
-		err = lstat(name, &dstat);
+		ret = lstat(name, &dstat);
 	}
 
-	if (err < 0) {
-		error("%s: %s(%d)", root ? "stat" : "lstat",
-				strerror(errno), errno);
+	if (ret < 0) {
+		if (err)
+			*err = -errno;
 		goto failed;
 	}
 
@@ -284,11 +364,11 @@
 		fullname = g_build_filename(os->current_folder, ep->d_name, NULL);
 
 		if (root && os->server->symlinks)
-			err = stat(fullname, &fstat);
+			ret = stat(fullname, &fstat);
 		else
-			err = lstat(fullname, &fstat);
+			ret = lstat(fullname, &fstat);
 
-		if (err < 0) {
+		if (ret < 0) {
 			debug("%s: %s(%d)", root ? "stat" : "lstat",
 					strerror(errno), errno);
 			g_free(name);
@@ -310,13 +390,21 @@
 		g_free(line);
 	}
 
+	closedir(dp);
+
 	object = g_string_append(object, FL_BODY_END);
 	if (size)
 		*size = object->len;
 
+	if (err)
+		*err = 0;
+
 	return object;
 
 failed:
+	if (dp)
+		closedir(dp);
+
 	g_string_free(object, TRUE);
 	return NULL;
 }
@@ -345,6 +433,37 @@
 	return len;
 }
 
+static ssize_t capability_read(gpointer object, void *buf, size_t count)
+{
+	struct capability_object *obj = object;
+
+	if (obj->buffer)
+		return string_read(obj->buffer, buf, count);
+
+	if (obj->pid >= 0)
+		return -EAGAIN;
+
+	return read(obj->output, buf, count);
+}
+
+static int capability_close(gpointer object)
+{
+	struct capability_object *obj = object;
+
+	if (obj->pid >= 0) {
+		g_source_remove(obj->watch);
+		kill(obj->pid, SIGTERM);
+		g_spawn_close_pid(obj->pid);
+	}
+
+	if (obj->buffer != NULL)
+		g_string_free(obj->buffer, TRUE);
+
+	g_free(obj);
+
+	return 0;
+}
+
 struct obex_mime_type_driver file = {
 	.open = filesystem_open,
 	.close = filesystem_close,
@@ -357,8 +476,8 @@
 	.target = FTP_TARGET,
 	.mimetype = "x-obex/capability",
 	.open = capability_open,
-	.close = string_free,
-	.read = string_read,
+	.close = capability_close,
+	.read = capability_read,
 };
 
 struct obex_mime_type_driver folder = {

=== modified file 'plugins/ftp.c'
--- plugins/ftp.c	2010-01-10 10:46:58 +0000
+++ plugins/ftp.c	2010-04-28 20:38:30 +0000
@@ -2,9 +2,8 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2007-2008  Nokia Corporation
- *  Copyright (C) 2007-2008  Instituto Nokia de Tecnologia (INdT)
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Nokia Corporation
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -94,6 +93,7 @@
 </record>"
 
 #define PCSUITE_CHANNEL        24
+#define PCSUITE_WHO_SIZE 8
 #define PCSUITE_RECORD "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>                                    \
 <record>                                                                       \
   <attribute id=\"0x0001\">                                                    \
@@ -141,9 +141,8 @@
 			0xF9, 0xEC, 0x7B, 0xC4,  0x95, 0x3C, 0x11, 0xD2,
 			0x98, 0x4E, 0x52, 0x54,  0x00, 0xDC, 0x9E, 0x09  };
 
-static const guint8 PCSUITE_TARGET[TARGET_SIZE] = {
-			0x00, 0x00, 0x50, 0x05, 0x00, 0x00, 0x10, 0x00,
-			0x80, 0x00, 0x00, 0x02, 0xEE, 0x00, 0x00, 0x01 };
+static const guint8 PCSUITE_WHO[PCSUITE_WHO_SIZE] = {
+			'P','C',' ','S','u','i','t','e' };
 
 static gint get_by_type(struct obex_session *os, gchar *type, size_t *size)
 {
@@ -156,7 +155,7 @@
 	if (g_str_equal(type, LST_TYPE))
 		return os_prepare_get(os, os->current_folder, size);
 
-	return FALSE;
+	return -ENOENT;
 }
 
 static gint ftp_prepare_get(struct obex_session *os, gchar *file,
@@ -465,8 +464,8 @@
 	.record = PCSUITE_RECORD,
 	.target = FTP_TARGET,
 	.target_size = TARGET_SIZE,
-	.who = PCSUITE_TARGET,
-	.who_size = TARGET_SIZE,
+	.who = PCSUITE_WHO,
+	.who_size = PCSUITE_WHO_SIZE,
 	.connect = ftp_connect,
 	.get = ftp_get,
 	.put = ftp_put,

=== modified file 'plugins/opp.c'
--- plugins/opp.c	2010-01-10 10:46:58 +0000
+++ plugins/opp.c	2010-04-28 20:38:30 +0000
@@ -2,9 +2,8 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2007-2008  Nokia Corporation
- *  Copyright (C) 2007-2008  Instituto Nokia de Tecnologia (INdT)
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Nokia Corporation
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -193,8 +192,11 @@
 		goto fail;
 
 	if (g_str_equal(os->type, VCARD_TYPE)) {
-		if (os_prepare_get(os, VCARD_FILE, &size) < 0)
-			goto fail;
+		if (os_prepare_get(os, VCARD_FILE, &size) < 0) {
+			OBEX_ObjectSetRsp(obj, OBEX_RSP_NOT_FOUND,
+					OBEX_RSP_NOT_FOUND);
+			return;
+		}
 	} else
 		goto fail;
 

=== modified file 'plugins/pbap.c'
--- plugins/pbap.c	2010-01-10 10:46:58 +0000
+++ plugins/pbap.c	2010-04-28 20:38:30 +0000
@@ -2,8 +2,8 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2009  Intel Corporation
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2009-2010  Intel Corporation
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -558,6 +558,12 @@
 	unregister_session(os->cid);
 }
 
+static gint pbap_chkput(obex_t *obex, obex_object_t *obj)
+{
+	/* Rejects all PUTs */
+	return -EINVAL;
+}
+
 struct obex_service_driver pbap = {
 	.name = "Phonebook Access server",
 	.service = OBEX_PBAP,
@@ -568,7 +574,8 @@
 	.connect = pbap_connect,
 	.get = pbap_get,
 	.setpath = pbap_setpath,
-	.disconnect = pbap_disconnect
+	.disconnect = pbap_disconnect,
+	.chkput = pbap_chkput
 };
 
 static int pbap_init(void)

=== modified file 'plugins/phonebook-dummy.c'
--- plugins/phonebook-dummy.c	2010-01-10 10:46:58 +0000
+++ plugins/phonebook-dummy.c	2010-04-28 20:38:30 +0000
@@ -2,8 +2,8 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2009  Intel Corporation
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2009-2010  Intel Corporation
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify

=== modified file 'plugins/phonebook-ebook.c'
--- plugins/phonebook-ebook.c	2010-01-10 10:46:58 +0000
+++ plugins/phonebook-ebook.c	2010-04-28 20:38:30 +0000
@@ -2,8 +2,8 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2009  Intel Corporation
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2009-2010  Intel Corporation
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -113,7 +113,7 @@
 		for (l = attrib_list; l; l = l->next) {
 			int i;
 			const char *attrib_name = e_vcard_attribute_get_name(
-						(EVCardAttribute *)l->data);
+						(EVCardAttribute *) l->data);
 
 			for (i = 0; i <= 28; i++) {
 				int mask;
@@ -123,10 +123,9 @@
 					continue;
 				if (g_strcmp0(vcard_attribs[i], attrib_name))
 					continue;
-				e_vcard_add_attribute(
-					evcard_filtered,
-					e_vcard_attribute_copy(
-					(EVCardAttribute *)l->data));
+				e_vcard_add_attribute(evcard_filtered,
+						e_vcard_attribute_copy(
+						(EVCardAttribute *) l->data));
 				break;
 			}
 		}
@@ -365,7 +364,7 @@
 		for (l = attrib_list; l; l = l->next) {
 			int i;
 			const char *attrib_name = e_vcard_attribute_get_name(
-						(EVCardAttribute *)l->data);
+						(EVCardAttribute *) l->data);
 			for (i = 0; i <= 28; i++) {
 				int mask;
 
@@ -375,11 +374,10 @@
 				if (g_strcmp0(vcard_attribs[i], attrib_name))
 					continue;
 
-				e_vcard_add_attribute(
-					evcard_filtered,
-					e_vcard_attribute_copy(
-					(EVCardAttribute *)l->data));
-				 break;
+				e_vcard_add_attribute(evcard_filtered,
+						e_vcard_attribute_copy(
+						(EVCardAttribute *) l->data));
+				break;
 			}
 		}
 		vcard = e_vcard_to_string(evcard_filtered, params->format);

=== modified file 'plugins/phonebook.h'
--- plugins/phonebook.h	2010-01-10 10:46:58 +0000
+++ plugins/phonebook.h	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify

=== modified file 'plugins/syncevolution.c'
--- plugins/syncevolution.c	2010-01-10 10:46:58 +0000
+++ plugins/syncevolution.c	2010-04-28 20:38:30 +0000
@@ -2,8 +2,8 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2007-2008  Intel Corporation
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Intel Corporation
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -43,6 +43,7 @@
 #include "dbus.h"
 #include "btio.h"
 #include "obexd.h"
+#include "gdbus.h"
 
 #define SYNCML_TARGET_SIZE 11
 
@@ -85,13 +86,13 @@
 #define SYNCE_SERVER_INTERFACE	"org.syncevolution.Server"
 #define SYNCE_CONN_INTERFACE	"org.syncevolution.Connection"
 
-static char match_string[256];
-
 struct synce_context {
 	struct obex_session *os;
 	DBusConnection *dbus_conn;
 	gchar *conn_obj;
 	gboolean reply_received;
+	guint reply_watch;
+	guint abort_watch;
 };
 
 struct callback_data {
@@ -115,20 +116,6 @@
 	return NULL;
 }
 
-static struct synce_context *find_context_by_conn_obj(const char *path)
-{
-	GSList *l;
-
-	for (l = context_list; l != NULL; l = l->next) {
-		struct synce_context *context = l->data;
-
-		if (strcmp(context->conn_obj, path) == 0)
-			return context;
-	}
-
-	return NULL;
-}
-
 static void append_dict_entry(DBusMessageIter *dict, const char *key,
 							int type, void *val)
 {
@@ -141,17 +128,18 @@
 	dbus_message_iter_close_container(dict, &entry);
 }
 
-static void handle_connection_reply_signal(DBusMessage *msg,
-				const char *obj_path, void *data)
+static gboolean reply_signal(DBusConnection *conn, DBusMessage *msg,
+				void *data)
 {
 	struct synce_context *context = data;
 	struct obex_session *os = context->os;
+	const char *path = dbus_message_get_path(msg);
 	DBusMessageIter iter, array_iter;
 	gchar *value;
 	gint length;
 
-	if (strcmp(context->conn_obj, obj_path) != 0)
-		return;
+	if (strcmp(context->conn_obj, path) != 0)
+		return FALSE;
 
 	dbus_message_iter_init(msg, &iter);
 
@@ -159,7 +147,7 @@
 	dbus_message_iter_get_fixed_array(&array_iter, &value, &length);
 
 	if (length == 0)
-		return;
+		return TRUE;
 
 	os->buf = g_malloc(length);
 	memcpy(os->buf, value, length);
@@ -167,10 +155,12 @@
 	os->finished = TRUE;
 	context->reply_received = TRUE;
 	OBEX_ResumeRequest(os->obex);
+
+	return TRUE;
 }
 
-static void handle_connection_abort_signal(DBusMessage *msg,
-				const char *obj_path, void *data)
+static gboolean abort_signal(DBusConnection *conn, DBusMessage *msg,
+				void *data)
 {
 	struct synce_context *context = data;
 	struct obex_session *os = context->os;
@@ -179,35 +169,12 @@
 	os->finished = TRUE;
 	OBEX_ResumeRequest(os->obex);
 	OBEX_TransportDisconnect(os->obex);
-}
-
-static DBusHandlerResult signal_filter(DBusConnection *conn,
-				DBusMessage *msg, void *data)
-{
-	const char *path = dbus_message_get_path(msg);
-	struct synce_context *context;
-
-	if (dbus_message_get_type(msg) != DBUS_MESSAGE_TYPE_SIGNAL)
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
-	context = find_context_by_conn_obj(path);
-	if (!context)
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
-	if (dbus_message_is_signal(msg, SYNCE_CONN_INTERFACE, "Reply")) {
-		debug("Reply signal is received.");
-		handle_connection_reply_signal(msg, path, context);
-	} else if (dbus_message_is_signal(msg, SYNCE_CONN_INTERFACE, "Abort")) {
-		debug("Abort signal is received.");
-		handle_connection_abort_signal(msg, path, context);
-	}
-
-	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+	return TRUE;
 }
 
 static void connect_cb(DBusPendingCall *call, void *user_data)
 {
-	static gboolean signal_filter_added = FALSE;
 	struct callback_data *cb_data = user_data;
 	obex_t *obex = cb_data->obex;
 	obex_object_t *obj = cb_data->obj;
@@ -240,22 +207,13 @@
 	debug("Got conn object %s from syncevolution", path);
 	context->conn_obj = g_strdup(path);
 
-	/* add signal filter */
-	if (!signal_filter_added) {
-		if (!dbus_connection_add_filter(conn, signal_filter,
-							os, NULL)) {
-			error("Can't add signal filter");
-			dbus_message_unref(reply);
-			g_free(cb_data);
-			goto failed;
-		}
-		signal_filter_added = TRUE;
-	}
+	context->reply_watch = g_dbus_add_signal_watch(conn, NULL, path,
+						SYNCE_CONN_INTERFACE, "Reply",
+						reply_signal, context, NULL);
 
-	snprintf(match_string, sizeof(match_string), "type=signal,interface=%s,"
-			"path=%s", SYNCE_CONN_INTERFACE, context->conn_obj);
-	dbus_bus_add_match(conn, match_string, NULL);
-	dbus_connection_flush(conn);
+	context->abort_watch = g_dbus_add_signal_watch(conn, NULL, path,
+						SYNCE_CONN_INTERFACE, "Abort",
+						abort_signal, context, NULL);
 
 	dbus_message_unref(reply);
 	g_free(cb_data);
@@ -311,7 +269,7 @@
 	struct callback_data *cb_data;
 	struct synce_context *context;
 
-	conn = dbus_bus_get(DBUS_BUS_SESSION, NULL);
+	conn = obex_dbus_get_connection();
 	if (!conn)
 		goto failed;
 
@@ -507,10 +465,11 @@
 	dbus_pending_call_unref(call);
 
 failed:
-	snprintf(match_string, sizeof(match_string),
-				"type=signal,interface=%s,path=%s",
-				SYNCE_CONN_INTERFACE, context->conn_obj);
-	dbus_bus_remove_match(context->dbus_conn, match_string, NULL);
+	g_dbus_remove_watch(context->dbus_conn, context->reply_watch);
+	context->reply_watch = 0;
+	g_dbus_remove_watch(context->dbus_conn, context->abort_watch);
+	context->abort_watch = 0;
+
 	g_free(context->conn_obj);
 	context->conn_obj = NULL;
 

=== modified file 'plugins/telephony-dummy.c'
--- plugins/telephony-dummy.c	2010-01-10 10:46:58 +0000
+++ plugins/telephony-dummy.c	2010-04-28 20:38:30 +0000
@@ -2,8 +2,8 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2009  Intel Corporation
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2009-2010  Intel Corporation
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify

=== modified file 'plugins/telephony.h'
--- plugins/telephony.h	2010-01-10 10:46:58 +0000
+++ plugins/telephony.h	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify

=== modified file 'src/bluetooth.c'
--- src/bluetooth.c	2010-01-10 10:46:58 +0000
+++ src/bluetooth.c	2010-04-28 20:38:30 +0000
@@ -2,9 +2,8 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2007-2008  Nokia Corporation
- *  Copyright (C) 2007-2008  Instituto Nokia de Tecnologia (INdT)
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Nokia Corporation
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify

=== modified file 'src/bluetooth.h'
--- src/bluetooth.h	2010-01-10 10:46:58 +0000
+++ src/bluetooth.h	2010-04-28 20:38:30 +0000
@@ -2,9 +2,8 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2007-2008  Nokia Corporation
- *  Copyright (C) 2007-2008  Instituto Nokia de Tecnologia (INdT)
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Nokia Corporation
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify

=== modified file 'src/btio.c'
--- src/btio.c	2010-01-10 10:46:58 +0000
+++ src/btio.c	2010-04-28 20:38:30 +0000
@@ -2,8 +2,8 @@
  *
  *  BlueZ - Bluetooth protocol stack for Linux
  *
- *  Copyright (C) 2009  Marcel Holtmann <[e-mail]>
- *  Copyright (C) 2009  Nokia Corporation
+ *  Copyright (C) 2009-2010  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2009-2010  Nokia Corporation
  *
  *
  *  This program is free software; you can redistribute it and/or modify

=== modified file 'src/btio.h'
--- src/btio.h	2010-01-10 10:46:58 +0000
+++ src/btio.h	2010-04-28 20:38:30 +0000
@@ -2,8 +2,8 @@
  *
  *  BlueZ - Bluetooth protocol stack for Linux
  *
- *  Copyright (C) 2009  Marcel Holtmann <[e-mail]>
- *  Copyright (C) 2009  Nokia Corporation
+ *  Copyright (C) 2009-2010  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2009-2010  Nokia Corporation
  *
  *
  *  This program is free software; you can redistribute it and/or modify

=== modified file 'src/dbus.h'
--- src/dbus.h	2009-07-27 19:02:30 +0000
+++ src/dbus.h	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2007-2008  Instituto Nokia de Tecnologia (INdT)
+ *  Copyright (C) 2007-2010  Nokia Corporation
  *
  *
  *  This program is free software; you can redistribute it and/or modify

=== modified file 'src/logging.c'
--- src/logging.c	2009-07-27 19:02:30 +0000
+++ src/logging.c	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify

=== modified file 'src/logging.h'
--- src/logging.h	2009-07-27 19:02:30 +0000
+++ src/logging.h	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify

=== modified file 'src/main.c'
--- src/main.c	2010-01-10 10:46:58 +0000
+++ src/main.c	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify

=== modified file 'src/manager.c'
--- src/manager.c	2010-01-10 10:46:58 +0000
+++ src/manager.c	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -528,7 +528,8 @@
 
 	dbus_error_init(&err);
 
-	connection = g_dbus_setup_bus(DBUS_BUS_SESSION, OPENOBEX_SERVICE, &err);
+	connection = g_dbus_setup_private(DBUS_BUS_SESSION, OPENOBEX_SERVICE,
+									&err);
 	if (connection == NULL) {
 		if (dbus_error_is_set(&err) == TRUE) {
 			fprintf(stderr, "%s\n", err.message);
@@ -539,8 +540,11 @@
 	}
 
 	system_conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, NULL, NULL);
-	if (system_conn == NULL)
+	if (system_conn == NULL) {
+		dbus_connection_unref(connection);
+		connection = NULL;
 		return FALSE;
+	}
 
 	listener_id = g_dbus_add_service_watch(system_conn, "org.bluez",
 				name_acquired, name_released, NULL, NULL);
@@ -1028,4 +1032,10 @@
 	g_free(path);
 }
 
+DBusConnection *obex_dbus_get_connection(void)
+{
+	if (connection == NULL)
+		return NULL;
 
+	return dbus_connection_ref(connection);
+}

=== modified file 'src/mimetype.c'
--- src/mimetype.c	2010-01-10 10:46:58 +0000
+++ src/mimetype.c	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -38,6 +38,85 @@
 
 static GSList *drivers = NULL;
 
+static GSList *watches = NULL;
+
+struct io_watch {
+	gpointer object;
+	obex_object_io_func func;
+	gpointer user_data;
+};
+
+void obex_object_set_io_flags(gpointer object, int flags, int err)
+{
+	GSList *l;
+
+	for (l = watches; l; l = l->next) {
+		struct io_watch *watch = l->data;
+
+		if (watch->object != object)
+			continue;
+
+		if (watch->func(object, flags, err, watch->user_data) == TRUE)
+			continue;
+
+		if (g_slist_find(watches, watch) == NULL)
+			continue;
+
+		watches = g_slist_remove(watches, watch);
+		g_free(watch);
+	}
+}
+
+static struct io_watch *find_io_watch(gpointer object)
+{
+	GSList *l;
+
+	for (l = watches; l; l = l->next) {
+		struct io_watch *watch = l->data;
+
+		if (watch->object == object)
+			return watch;
+	}
+
+	return NULL;
+}
+
+static void reset_io_watch(gpointer object)
+{
+	struct io_watch *watch;
+
+	watch = find_io_watch(object);
+	if (watch == NULL)
+		return;
+
+	watches = g_slist_remove(watches, watch);
+	g_free(watch);
+}
+
+static int set_io_watch(gpointer object, obex_object_io_func func,
+				gpointer user_data)
+{
+	struct io_watch *watch;
+
+	if (func == NULL) {
+		reset_io_watch(object);
+		return 0;
+	}
+
+	watch = find_io_watch(object);
+	if (watch)
+		return -EPERM;
+
+	watch = g_new0(struct io_watch, 1);
+	watch->object = object;
+	watch->func = func;
+	watch->user_data = user_data;
+
+	watches = g_slist_append(watches, watch);
+
+	return 0;
+}
+
 struct obex_mime_type_driver *obex_mime_type_driver_find(const guint8 *target, const char *mimetype)
 {
 	GSList *l;
@@ -68,6 +147,9 @@
 		return -EPERM;
 	}
 
+	if (driver->set_io_watch == NULL)
+		driver->set_io_watch = set_io_watch;
+
 	debug("driver %p mimetype %s registered", driver, driver->mimetype);
 
 	drivers = g_slist_append(drivers, driver);

=== modified file 'src/mimetype.h'
--- src/mimetype.h	2010-01-10 10:46:58 +0000
+++ src/mimetype.h	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -23,17 +23,25 @@
 
 #define TARGET_SIZE 16
 
+typedef gboolean (*obex_object_io_func) (gpointer object, int flags, int err,
+					gpointer user_data);
+
 struct obex_mime_type_driver {
 	const guint8 *target;
 	const char *mimetype;
-	gpointer (*open) (const char *name, int oflag, mode_t mode, size_t *size);
+	gpointer (*open) (const char *name, int oflag, mode_t mode,
+				size_t *size, int *err);
 	int (*close) (gpointer object);
 	ssize_t (*read) (gpointer object, void *buf, size_t count);
 	ssize_t (*write) (gpointer object, const void *buf, size_t count);
 	int (*remove) (const char *name);
+	int (*set_io_watch) (gpointer object, obex_object_io_func func,
+				gpointer user_data);
 };
 
 int obex_mime_type_driver_register(struct obex_mime_type_driver *driver);
 void obex_mime_type_driver_unregister(struct obex_mime_type_driver *driver);
 struct obex_mime_type_driver *obex_mime_type_driver_find(const guint8 *target,
 							const char *mimetype);
+
+void obex_object_set_io_flags(gpointer object, int flags, int err);

=== modified file 'src/obex.c'
--- src/obex.c	2010-01-10 10:46:58 +0000
+++ src/obex.c	2010-04-28 20:38:30 +0000
@@ -2,9 +2,8 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2007-2008  Nokia Corporation
- *  Copyright (C) 2007-2008  Instituto Nokia de Tecnologia (INdT)
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Nokia Corporation
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -68,8 +67,10 @@
 static void os_reset_session(struct obex_session *os)
 {
 	if (os->object) {
+		os->driver->set_io_watch(os->object, NULL, NULL);
 		os->driver->close(os->object);
 		os->object = NULL;
+		os->obj = NULL;
 		if (os->aborted && os->cmd == OBEX_CMD_PUT && os->current_folder) {
 			gchar *path;
 			path = g_build_filename(os->current_folder, os->name, NULL);
@@ -90,6 +91,7 @@
 		g_free(os->buf);
 		os->buf = NULL;
 	}
+
 	os->driver = NULL;
 	os->aborted = FALSE;
 	os->offset = 0;
@@ -386,10 +388,9 @@
 	gint err;
 	gpointer object;
 
-	object = os->driver->open(filename, O_RDONLY, 0, size);
+	object = os->driver->open(filename, O_RDONLY, 0, size, &err);
 	if (object == NULL) {
-		err = -errno;
-		error("open(%s): %s (%d)", filename, strerror(errno), errno);
+		error("open(%s): %s (%d)", filename, strerror(-err), -err);
 		goto fail;
 	}
 
@@ -432,11 +433,13 @@
 
 	len = os->driver->read(os->object, os->buf, os->tx_mtu);
 	if (len < 0) {
-		gint err = errno;
-		error("read(): %s (%d)", strerror(err), err);
+		error("read(): %s (%d)", strerror(-len), -len);
+		if (len == -EAGAIN)
+			return len;
+
 		g_free(os->buf);
 		os->buf = NULL;
-		return -err;
+		return len;
 	}
 
 	ptr = os->buf;
@@ -465,13 +468,14 @@
 {
 	gchar *path;
 	gint len;
+	int err;
 
 	path = g_build_filename(os->current_folder, os->name, NULL);
 	os->object = os->driver->open(path, O_WRONLY | O_CREAT | O_TRUNC, 0600,
 					os->size != OBJECT_SIZE_UNKNOWN ?
-					(size_t *) &os->size : NULL);
+					(size_t *) &os->size : NULL, &err);
 	if (os->object == NULL) {
-		error("open(%s): %s (%d)", path, strerror(errno), errno);
+		error("open(%s): %s (%d)", path, strerror(-err), -err);
 		g_free(path);
 		return -EPERM;
 	}
@@ -489,13 +493,11 @@
 
 		w = os->driver->write(os->object, os->buf + len, os->offset - len);
 		if (w < 0) {
-			gint err = errno;
-			error("write(%s): %s (%d)", path, strerror(errno),
-									errno);
-			if (err == EINTR)
+			error("write(%s): %s (%d)", path, strerror(-w), -w);
+			if (w == -EINTR)
 				continue;
 			else
-				return -err;
+				return w;
 		}
 
 		len += w;
@@ -544,11 +546,10 @@
 
 		w = os->driver->write(os->object, buffer + len, size - len);
 		if (w < 0) {
-			gint err = errno;
-			if (err == EINTR)
+			if (w == -EINTR)
 				continue;
 			else
-				return -err;
+				return w;
 		}
 
 		len += w;
@@ -559,6 +560,44 @@
 	return 0;
 }
 
+static gboolean handle_async_io(gpointer object, int flags, int err,
+				gpointer user_data)
+{
+	struct obex_session *os = user_data;
+	int ret = 0;
+
+	if (err < 0) {
+		ret = err;
+		goto proceed;
+	}
+
+	if (flags & (G_IO_IN | G_IO_PRI))
+		ret = obex_write_stream(os, os->obex, os->obj);
+	else if (flags & G_IO_OUT)
+		ret = obex_read_stream(os, os->obex, os->obj);
+
+proceed:
+	switch (ret) {
+	case -EINVAL:
+		OBEX_ObjectSetRsp(os->obj, OBEX_RSP_BAD_REQUEST,
+				OBEX_RSP_BAD_REQUEST);
+	case -EPERM:
+		OBEX_ObjectSetRsp(os->obj, OBEX_RSP_FORBIDDEN,
+					OBEX_RSP_FORBIDDEN);
+		break;
+	default:
+		if (ret < 0)
+			OBEX_ObjectSetRsp(os->obj,
+					OBEX_RSP_INTERNAL_SERVER_ERROR,
+					OBEX_RSP_INTERNAL_SERVER_ERROR);
+		break;
+	}
+
+	OBEX_ResumeRequest(os->obex);
+
+	return FALSE;
+}
+
 static gboolean check_put(obex_t *obex, obex_object_t *obj)
 {
 	struct obex_session *os;
@@ -645,7 +684,7 @@
 		}
 	}
 
-	if (!os->service || !os->service->chkput)
+	if (!os->service->chkput)
 		goto done;
 
 	ret = os->service->chkput(obex, obj);
@@ -659,6 +698,11 @@
 	case -EPERM:
 		OBEX_ObjectSetRsp(obj, OBEX_RSP_FORBIDDEN, OBEX_RSP_FORBIDDEN);
 		return FALSE;
+	case -EAGAIN:
+		OBEX_SuspendRequest(obex, obj);
+		os->obj = obj;
+		os->driver->set_io_watch(os->object, handle_async_io, os);
+		return TRUE;
 	default:
 		debug("Unhandled chkput error: %d", ret);
 		OBEX_ObjectSetRsp(obj, OBEX_RSP_INTERNAL_SERVER_ERROR,
@@ -727,13 +771,12 @@
 		case OBEX_CMD_PUT:
 		case OBEX_CMD_GET:
 		case OBEX_CMD_SETPATH:
+		default:
 			os_session_mark_aborted(os);
 			if (os->service->reset)
 				os->service->reset(obex);
 			os_reset_session(os);
 			break;
-		default:
-			break;
 		}
 		break;
 	case OBEX_EV_REQHINT:
@@ -758,7 +801,7 @@
 	case OBEX_EV_REQCHECK:
 		switch (cmd) {
 		case OBEX_CMD_PUT:
-			if (os->service && os->service->put)
+			if (os->service)
 				check_put(obex, obj);
 			break;
 		default:
@@ -796,6 +839,11 @@
 			OBEX_ObjectSetRsp(obj,
 				OBEX_RSP_FORBIDDEN, OBEX_RSP_FORBIDDEN);
 			break;
+		case -EAGAIN:
+			OBEX_SuspendRequest(obex, obj);
+			os->obj = obj;
+			os->driver->set_io_watch(os->object, handle_async_io, os);
+			break;
 		default:
 			OBEX_ObjectSetRsp(obj,
 				OBEX_RSP_INTERNAL_SERVER_ERROR,
@@ -805,7 +853,21 @@
 
 		break;
 	case OBEX_EV_STREAMEMPTY:
-		obex_write_stream(os, obex, obj);
+		switch (obex_write_stream(os, obex, obj)) {
+		case -EPERM:
+			OBEX_ObjectSetRsp(obj,
+				OBEX_RSP_FORBIDDEN, OBEX_RSP_FORBIDDEN);
+			break;
+		case -EAGAIN:
+			OBEX_SuspendRequest(obex, obj);
+			os->obj = obj;
+			os->driver->set_io_watch(os->object, handle_async_io,
+							os);
+			break;
+		default:
+			break;
+		}
+
 		break;
 	case OBEX_EV_LINKERR:
 		break;

=== modified file 'src/obex.h'
--- src/obex.h	2010-01-10 10:46:58 +0000
+++ src/obex.h	2010-04-28 20:38:30 +0000
@@ -2,9 +2,8 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2007-2008  Nokia Corporation
- *  Copyright (C) 2007-2008  Instituto Nokia de Tecnologia (INdT)
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Nokia Corporation
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -78,6 +77,7 @@
 	struct server *server;
 	gboolean	checked;
 	obex_t		*obex;
+	obex_object_t	*obj;
 	struct obex_mime_type_driver *driver;
 	gboolean	finished;
 };

=== modified file 'src/obexd.h'
--- src/obexd.h	2009-07-27 19:02:30 +0000
+++ src/obexd.h	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -21,6 +21,8 @@
  *
  */
 
+#include <dbus/dbus.h>
+
 #define OPENOBEX_SERVICE  "org.openobex"
 
 #define OPENOBEX_MANAGER_PATH		"/"
@@ -34,3 +36,5 @@
 
 gboolean plugin_init(void);
 void plugin_cleanup(void);
+
+DBusConnection *obex_dbus_get_connection(void);

=== modified file 'src/plugin.c'
--- src/plugin.c	2010-01-10 10:46:58 +0000
+++ src/plugin.c	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify

=== modified file 'src/plugin.h'
--- src/plugin.h	2010-01-10 10:46:58 +0000
+++ src/plugin.h	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify

=== modified file 'src/service.c'
--- src/service.c	2010-01-10 10:46:58 +0000
+++ src/service.c	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -49,8 +49,8 @@
 		struct obex_service_driver *driver = l->data;
 
 		if (driver->who && who &&
-				driver->who_size == who_size &&
-				memcmp(driver->who, who, who_size) != 0)
+				(driver->who_size != who_size ||
+				memcmp(driver->who, who, who_size) != 0))
 			continue;
 
 		if (driver->target == NULL && target == NULL)
@@ -97,7 +97,11 @@
 
 	debug("driver %p service %s registered", driver, driver->name);
 
-	drivers = g_slist_append(drivers, driver);
+	/* Drivers that support who has priority */
+	if (driver->who)
+		drivers = g_slist_prepend(drivers, driver);
+	else
+		drivers = g_slist_append(drivers, driver);
 
 	return 0;
 }

=== modified file 'src/service.h'
--- src/service.h	2010-01-10 10:46:58 +0000
+++ src/service.h	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  OBEX Server
  *
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify

=== modified file 'test/ftp-client'
--- test/ftp-client	2009-07-27 19:02:30 +0000
+++ test/ftp-client	2010-04-28 20:38:30 +0000
@@ -15,6 +15,11 @@
         self.verbose = verbose
 
     @dbus.service.method("org.openobex.Agent",
+                    in_signature="o", out_signature="s")
+    def Request(self, path):
+        return ""
+
+    @dbus.service.method("org.openobex.Agent",
                     in_signature="ot", out_signature="")
     def Progress(self, path, transferred):
         if self.verbose:
@@ -55,6 +60,11 @@
 
     return parser.parse_args()
 
+def error(err):
+    print err
+
+def void_reply():
+    pass
 
 def change_folder(session, new_dir):
     for node in new_dir.split("/"):
@@ -69,11 +79,15 @@
 
 def put_file(session, filename):
     session.PutFile(os.path.abspath(filename),
-                    os.path.basename(filename))
+                    os.path.basename(filename),
+                    reply_handler=void_reply,
+                    error_handler=error)
 
 def get_file(session, filename):
     session.GetFile(os.path.abspath(filename),
-                    os.path.basename(filename))
+                    os.path.basename(filename),
+                    reply_handler=void_reply,
+                    error_handler=error)
 
 
 if  __name__ == '__main__':
@@ -91,8 +105,6 @@
     bus = dbus.SessionBus()
     mainloop = gobject.MainLoop()
 
-    need_mainloop = False
-
     path = "/test/agent"
     agent = Agent(bus, path, options.verbose)
 
@@ -117,12 +129,9 @@
         list_folder(ftp)
 
     if options.get_file:
-        need_mainloop = True
         get_file(ftp, options.get_file)
 
     if options.put_file:
-        need_mainloop = True
         put_file(ftp, options.put_file)
 
-    if need_mainloop:
-        mainloop.run()
+    mainloop.run()

=== modified file 'test/main.c'
--- test/main.c	2009-07-27 19:02:30 +0000
+++ test/main.c	2010-04-28 20:38:30 +0000
@@ -2,7 +2,7 @@
  *
  *  OBEX Test
  *
- *  Copyright (C) 2007-2009  Marcel Holtmann <[e-mail]>
+ *  Copyright (C) 2007-2010  Marcel Holtmann <[e-mail]>
  *
  *
  *  This program is free software; you can redistribute it and/or modify