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

[Baptiste Mille-Mathias]

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

8. By Baptiste Mille-Mathias on 2010-06-15

* New upstream release.
  - version 0.28:
    + Fix broken assumption about contacts.
    + Fix issue with exporting empty contacts.
    + Fix issue with not always including the TEL header.
    + Fix wrong response code for PBAP PUT operation.
    + Fix handling of Tracker optional parameters.
    + Fix queries for incoming and outgoing folders.
    + Fix ordering during folder listing.
    + Fix complex logic discovering the type of call.
    + Add support for the X-IRMC-CALL-DATETIME field.

=== modified file 'ChangeLog'
--- ChangeLog	2010-04-27 04:17:15 +0000
+++ ChangeLog	2010-06-15 19:18:33 +0000
@@ -1,3 +1,48 @@
+ver 0.28:
+	Fix broken assumption about contacts.
+	Fix issue with exporting empty contacts.
+	Fix issue with not always including the TEL header.
+	Fix wrong response code for PBAP PUT operation.
+	Fix handling of Tracker optional parameters.
+	Fix queries for incoming and outgoing folders.
+	Fix ordering during folder listing.
+	Fix complex logic discovering the type of call.
+	Add support for the X-IRMC-CALL-DATETIME field.
+
+ver 0.27:
+	Fix GET name handling with FTP service.
+	Fix service driver matching when who is not specified.
+	Fix object name not being updated when agent changes it.
+	Fix inconsistency when using vCard version 2.1.
+	Fix wrong response code to PUT requests for PBAP.
+	Fix crash on PBAP SetPhoneBook function.
+	Add support for transport drivers.
+	Add support for Nokia backup plugin.
+
+ver 0.26:
+	Fix the order of the calls handles.
+	Fix crash when receiving small objects.
+	Fix invalid memory access when removing a file.
+	Fix inverting the list with wrong search attribute.
+	Fix wrong response code for dummy PullvCardListing.
+	Fix sending the Not Found response asynchronously.
+	Fix not resetting buffered data count when resetting the session.
+	Add support for multiple telephone numbers.
+	Add support for the ADR filter.
+
+ver 0.25:
+	Fix issue with missing phonebook-tracker.c file.
+
+ver 0.24:
+	Fix bug when creating directories.
+	Fix error code when removing non-empty directory.
+	Fix PullBusinessCard not return transfer errors.
+	Fix MaxListCount handling for PBAP PullPhoneBook function.
+	Fix mimetype driver selection and default fallback.
+	Add support to the WHO header in mimetype drivers.
+	Add support for PBAP operations to the back-ends.
+	Add support for PBAP Tracker backend.
+
 ver 0.23:
 	Fix unneeded reset of session after a CONNECT.
 	Fix folder and object names with enabled auto accept.
 
=== modified file 'Makefile.am'
--- Makefile.am	2010-04-27 04:17:15 +0000
+++ Makefile.am	2010-06-15 19:18:33 +0000
@@ -29,9 +29,22 @@
 builtin_sources =
 builtin_nodist =
 
+builtin_modules += bluetooth
+builtin_sources += plugins/bluetooth.c
+
+if USB
+builtin_modules += usb
+builtin_sources += plugins/usb.c
+endif
+
 builtin_modules += filesystem
 builtin_sources += plugins/filesystem.c plugins/filesystem.h
 
+if NOKIA_BACKUP
+builtin_modules += backup
+builtin_sources += plugins/nokia-backup.c
+endif
+
 builtin_modules += opp
 builtin_sources += plugins/opp.c
 
@@ -39,7 +52,8 @@
 builtin_sources += plugins/ftp.c
 
 builtin_modules += pbap
-builtin_sources += plugins/pbap.c plugins/phonebook.h
+builtin_sources += plugins/pbap.c plugins/phonebook.h \
+			plugins/vcard.h plugins/vcard.c
 
 builtin_modules += syncevolution
 builtin_sources += plugins/syncevolution.c
@@ -52,13 +66,15 @@
 			src/main.c src/obexd.h src/plugin.h src/plugin.c \
 			src/logging.h src/logging.c src/btio.h src/btio.c \
 			src/dbus.h src/manager.c src/obex.h src/obex.c \
-			src/obex-priv.h src/bluetooth.h src/bluetooth.c \
+			src/obex-priv.h \
 			src/mimetype.h src/mimetype.c \
-			src/service.h src/service.c
+			src/service.h src/service.c \
+			src/transport.h src/transport.c \
+			src/server.h src/server.c
 
 src_obexd_LDADD = @DBUS_LIBS@ @GLIB_LIBS@ @GTHREAD_LIBS@ \
 					@EBOOK_LIBS@ @OPENOBEX_LIBS@ \
-					@BLUEZ_LIBS@ -ldl
+					@BLUEZ_LIBS@ @LIBICAL_LIBS@ -ldl
 
 src_obexd_LDFLAGS = -Wl,--export-dynamic
 
@@ -102,6 +118,7 @@
 
 AM_CFLAGS = @OPENOBEX_CFLAGS@ @BLUEZ_CFLAGS@ @EBOOK_CFLAGS@ \
 			@GTHREAD_CFLAGS@ @GLIB_CFLAGS@ @DBUS_CFLAGS@ \
+			@LIBICAL_CFLAGS@ \
 			-DOBEX_PLUGIN_BUILTIN -DPLUGINDIR=\""$(plugindir)"\"
 
 INCLUDES = -I$(builddir)/src -I$(srcdir)/src -I$(srcdir)/plugins \
@@ -111,16 +128,17 @@
 
 EXTRA_DIST = src/genbuiltin $(doc_files) $(test_files) src/obex.conf \
 			src/obexd.service.in client/obex-client.service.in \
-			plugins/phonebook-dummy.c plugins/phonebook-ebook.c
+			plugins/phonebook-dummy.c plugins/phonebook-ebook.c \
+			plugins/phonebook-tracker.c
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-client --enable-server
 
 MAINTAINERCLEANFILES = Makefile.in \
 	aclocal.m4 configure config.h.in config.sub config.guess \
-	ltmain.sh depcomp missing install-sh mkinstalldirs
+	ltmain.sh depcomp compile missing install-sh mkinstalldirs
 
 %.service: %.service.in config.log
 	$(AM_V_GEN)$(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
 plugins/phonebook.c: plugins/@PHONEBOOK_DRIVER@
-	$(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@
+	$(AM_V_GEN)$(LN_S) @abs_top_srcdir@/$< $@
 
=== modified file 'Makefile.in'
--- Makefile.in	2010-04-27 04:17:15 +0000
+++ Makefile.in	2010-06-15 19:18:33 +0000
@@ -38,15 +38,20 @@
 host_triplet = @host@
 libexec_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
 @SERVER_TRUE@am__append_1 = src/obexd.service.in
-@SERVER_TRUE@am__append_2 = src/obexd
+@SERVER_TRUE@@USB_TRUE@am__append_2 = usb
+@SERVER_TRUE@@USB_TRUE@am__append_3 = plugins/usb.c
+@NOKIA_BACKUP_TRUE@@SERVER_TRUE@am__append_4 = backup
+@NOKIA_BACKUP_TRUE@@SERVER_TRUE@am__append_5 = plugins/nokia-backup.c
+@SERVER_TRUE@am__append_6 = src/obexd
 @SERVER_TRUE@noinst_PROGRAMS = test/obex-test$(EXEEXT)
-@CLIENT_TRUE@am__append_3 = client/obex-client.service.in
-@CLIENT_TRUE@am__append_4 = client/obex-client
+@CLIENT_TRUE@am__append_7 = client/obex-client.service.in
+@CLIENT_TRUE@am__append_8 = client/obex-client
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	config.guess config.sub depcomp install-sh ltmain.sh missing
+	compile config.guess config.sub depcomp install-sh ltmain.sh \
+	missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -108,27 +113,33 @@
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
 am__src_obexd_SOURCES_DIST = gdbus/gdbus.h gdbus/mainloop.c \
-	gdbus/object.c gdbus/watch.c plugins/filesystem.c \
-	plugins/filesystem.h plugins/opp.c plugins/ftp.c \
-	plugins/pbap.c plugins/phonebook.h plugins/syncevolution.c \
-	src/main.c src/obexd.h src/plugin.h src/plugin.c src/logging.h \
-	src/logging.c src/btio.h src/btio.c src/dbus.h src/manager.c \
-	src/obex.h src/obex.c src/obex-priv.h src/bluetooth.h \
-	src/bluetooth.c src/mimetype.h src/mimetype.c src/service.h \
-	src/service.c
-@SERVER_TRUE@am__objects_3 = plugins/filesystem.$(OBJEXT) \
-@SERVER_TRUE@	plugins/opp.$(OBJEXT) plugins/ftp.$(OBJEXT) \
-@SERVER_TRUE@	plugins/pbap.$(OBJEXT) \
+	gdbus/object.c gdbus/watch.c plugins/bluetooth.c plugins/usb.c \
+	plugins/filesystem.c plugins/filesystem.h \
+	plugins/nokia-backup.c plugins/opp.c plugins/ftp.c \
+	plugins/pbap.c plugins/phonebook.h plugins/vcard.h \
+	plugins/vcard.c plugins/syncevolution.c src/main.c src/obexd.h \
+	src/plugin.h src/plugin.c src/logging.h src/logging.c \
+	src/btio.h src/btio.c src/dbus.h src/manager.c src/obex.h \
+	src/obex.c src/obex-priv.h src/mimetype.h src/mimetype.c \
+	src/service.h src/service.c src/transport.h src/transport.c \
+	src/server.h src/server.c
+@SERVER_TRUE@@USB_TRUE@am__objects_3 = plugins/usb.$(OBJEXT)
+@NOKIA_BACKUP_TRUE@@SERVER_TRUE@am__objects_4 = plugins/nokia-backup.$(OBJEXT)
+@SERVER_TRUE@am__objects_5 = plugins/bluetooth.$(OBJEXT) \
+@SERVER_TRUE@	$(am__objects_3) plugins/filesystem.$(OBJEXT) \
+@SERVER_TRUE@	$(am__objects_4) plugins/opp.$(OBJEXT) \
+@SERVER_TRUE@	plugins/ftp.$(OBJEXT) plugins/pbap.$(OBJEXT) \
+@SERVER_TRUE@	plugins/vcard.$(OBJEXT) \
 @SERVER_TRUE@	plugins/syncevolution.$(OBJEXT)
-@SERVER_TRUE@am_src_obexd_OBJECTS = $(am__objects_1) $(am__objects_3) \
+@SERVER_TRUE@am_src_obexd_OBJECTS = $(am__objects_1) $(am__objects_5) \
 @SERVER_TRUE@	src/main.$(OBJEXT) src/plugin.$(OBJEXT) \
 @SERVER_TRUE@	src/logging.$(OBJEXT) src/btio.$(OBJEXT) \
 @SERVER_TRUE@	src/manager.$(OBJEXT) src/obex.$(OBJEXT) \
-@SERVER_TRUE@	src/bluetooth.$(OBJEXT) src/mimetype.$(OBJEXT) \
-@SERVER_TRUE@	src/service.$(OBJEXT)
-@SERVER_TRUE@am__objects_4 = plugins/phonebook.$(OBJEXT)
-@SERVER_TRUE@am__objects_5 = $(am__objects_4)
-@SERVER_TRUE@nodist_src_obexd_OBJECTS = $(am__objects_5)
+@SERVER_TRUE@	src/mimetype.$(OBJEXT) src/service.$(OBJEXT) \
+@SERVER_TRUE@	src/transport.$(OBJEXT) src/server.$(OBJEXT)
+@SERVER_TRUE@am__objects_6 = plugins/phonebook.$(OBJEXT)
+@SERVER_TRUE@am__objects_7 = $(am__objects_6)
+@SERVER_TRUE@nodist_src_obexd_OBJECTS = $(am__objects_7)
 src_obexd_OBJECTS = $(am_src_obexd_OBJECTS) \
 	$(nodist_src_obexd_OBJECTS)
 src_obexd_DEPENDENCIES =
@@ -230,6 +241,8 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBICAL_CFLAGS = @LIBICAL_CFLAGS@
+LIBICAL_LIBS = @LIBICAL_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -316,7 +329,7 @@
 top_srcdir = @top_srcdir@
 AM_MAKEFLAGS = --no-print-directory
 servicedir = $(datarootdir)/dbus-1/services
-service_in_files = $(am__append_1) $(am__append_3)
+service_in_files = $(am__append_1) $(am__append_7)
 doc_files = doc/obexd-api.txt doc/agent-api.txt doc/client-api.txt
 test_files = test/simple-agent test/send-files \
 		test/pull-business-card test/exchange-business-cards \
@@ -329,23 +342,28 @@
 			gwobex/utils.h gwobex/utils.c gwobex/log.h
 
 @SERVER_TRUE@confdir = $(sysconfdir)/obex
-@SERVER_TRUE@builtin_modules = filesystem opp ftp pbap syncevolution
-@SERVER_TRUE@builtin_sources = plugins/filesystem.c \
-@SERVER_TRUE@	plugins/filesystem.h plugins/opp.c plugins/ftp.c \
+@SERVER_TRUE@builtin_modules = bluetooth $(am__append_2) filesystem \
+@SERVER_TRUE@	$(am__append_4) opp ftp pbap syncevolution
+@SERVER_TRUE@builtin_sources = plugins/bluetooth.c $(am__append_3) \
+@SERVER_TRUE@	plugins/filesystem.c plugins/filesystem.h \
+@SERVER_TRUE@	$(am__append_5) plugins/opp.c plugins/ftp.c \
 @SERVER_TRUE@	plugins/pbap.c plugins/phonebook.h \
+@SERVER_TRUE@	plugins/vcard.h plugins/vcard.c \
 @SERVER_TRUE@	plugins/syncevolution.c
 @SERVER_TRUE@builtin_nodist = plugins/phonebook.c
 @SERVER_TRUE@src_obexd_SOURCES = $(gdbus_sources) $(builtin_sources) \
 @SERVER_TRUE@			src/main.c src/obexd.h src/plugin.h src/plugin.c \
 @SERVER_TRUE@			src/logging.h src/logging.c src/btio.h src/btio.c \
 @SERVER_TRUE@			src/dbus.h src/manager.c src/obex.h src/obex.c \
-@SERVER_TRUE@			src/obex-priv.h src/bluetooth.h src/bluetooth.c \
+@SERVER_TRUE@			src/obex-priv.h \
 @SERVER_TRUE@			src/mimetype.h src/mimetype.c \
-@SERVER_TRUE@			src/service.h src/service.c
+@SERVER_TRUE@			src/service.h src/service.c \
+@SERVER_TRUE@			src/transport.h src/transport.c \
+@SERVER_TRUE@			src/server.h src/server.c
 
 @SERVER_TRUE@src_obexd_LDADD = @DBUS_LIBS@ @GLIB_LIBS@ @GTHREAD_LIBS@ \
 @SERVER_TRUE@					@EBOOK_LIBS@ @OPENOBEX_LIBS@ \
-@SERVER_TRUE@					@BLUEZ_LIBS@ -ldl
+@SERVER_TRUE@					@BLUEZ_LIBS@ @LIBICAL_LIBS@ -ldl
 
 @SERVER_TRUE@src_obexd_LDFLAGS = -Wl,--export-dynamic
 @SERVER_TRUE@builtin_files = src/builtin.h $(builtin_nodist)
@@ -365,6 +383,7 @@
 service_DATA = $(service_in_files:.service.in=.service)
 AM_CFLAGS = @OPENOBEX_CFLAGS@ @BLUEZ_CFLAGS@ @EBOOK_CFLAGS@ \
 			@GTHREAD_CFLAGS@ @GLIB_CFLAGS@ @DBUS_CFLAGS@ \
+			@LIBICAL_CFLAGS@ \
 			-DOBEX_PLUGIN_BUILTIN -DPLUGINDIR=\""$(plugindir)"\"
 
 INCLUDES = -I$(builddir)/src -I$(srcdir)/src -I$(srcdir)/plugins \
@@ -373,12 +392,13 @@
 CLEANFILES = $(service_DATA) $(builtin_files)
 EXTRA_DIST = src/genbuiltin $(doc_files) $(test_files) src/obex.conf \
 			src/obexd.service.in client/obex-client.service.in \
-			plugins/phonebook-dummy.c plugins/phonebook-ebook.c
+			plugins/phonebook-dummy.c plugins/phonebook-ebook.c \
+			plugins/phonebook-tracker.c
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-client --enable-server
 MAINTAINERCLEANFILES = Makefile.in \
 	aclocal.m4 configure config.h.in config.sub config.guess \
-	ltmain.sh depcomp missing install-sh mkinstalldirs
+	ltmain.sh depcomp compile missing install-sh mkinstalldirs
 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -578,14 +598,22 @@
 plugins/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) plugins/$(DEPDIR)
 	@: > plugins/$(DEPDIR)/$(am__dirstamp)
+plugins/bluetooth.$(OBJEXT): plugins/$(am__dirstamp) \
+	plugins/$(DEPDIR)/$(am__dirstamp)
+plugins/usb.$(OBJEXT): plugins/$(am__dirstamp) \
+	plugins/$(DEPDIR)/$(am__dirstamp)
 plugins/filesystem.$(OBJEXT): plugins/$(am__dirstamp) \
 	plugins/$(DEPDIR)/$(am__dirstamp)
+plugins/nokia-backup.$(OBJEXT): plugins/$(am__dirstamp) \
+	plugins/$(DEPDIR)/$(am__dirstamp)
 plugins/opp.$(OBJEXT): plugins/$(am__dirstamp) \
 	plugins/$(DEPDIR)/$(am__dirstamp)
 plugins/ftp.$(OBJEXT): plugins/$(am__dirstamp) \
 	plugins/$(DEPDIR)/$(am__dirstamp)
 plugins/pbap.$(OBJEXT): plugins/$(am__dirstamp) \
 	plugins/$(DEPDIR)/$(am__dirstamp)
+plugins/vcard.$(OBJEXT): plugins/$(am__dirstamp) \
+	plugins/$(DEPDIR)/$(am__dirstamp)
 plugins/syncevolution.$(OBJEXT): plugins/$(am__dirstamp) \
 	plugins/$(DEPDIR)/$(am__dirstamp)
 src/main.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
@@ -595,12 +623,14 @@
 src/manager.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/obex.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/bluetooth.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
 src/mimetype.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/service.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/transport.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/server.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 plugins/phonebook.$(OBJEXT): plugins/$(am__dirstamp) \
 	plugins/$(DEPDIR)/$(am__dirstamp)
 src/obexd$(EXEEXT): $(src_obexd_OBJECTS) $(src_obexd_DEPENDENCIES) src/$(am__dirstamp)
@@ -632,13 +662,16 @@
 	-rm -f gwobex/obex-priv.$(OBJEXT)
 	-rm -f gwobex/obex-xfer.$(OBJEXT)
 	-rm -f gwobex/utils.$(OBJEXT)
+	-rm -f plugins/bluetooth.$(OBJEXT)
 	-rm -f plugins/filesystem.$(OBJEXT)
 	-rm -f plugins/ftp.$(OBJEXT)
+	-rm -f plugins/nokia-backup.$(OBJEXT)
 	-rm -f plugins/opp.$(OBJEXT)
 	-rm -f plugins/pbap.$(OBJEXT)
 	-rm -f plugins/phonebook.$(OBJEXT)
 	-rm -f plugins/syncevolution.$(OBJEXT)
-	-rm -f src/bluetooth.$(OBJEXT)
+	-rm -f plugins/usb.$(OBJEXT)
+	-rm -f plugins/vcard.$(OBJEXT)
 	-rm -f src/btio.$(OBJEXT)
 	-rm -f src/logging.$(OBJEXT)
 	-rm -f src/main.$(OBJEXT)
@@ -646,7 +679,9 @@
 	-rm -f src/mimetype.$(OBJEXT)
 	-rm -f src/obex.$(OBJEXT)
 	-rm -f src/plugin.$(OBJEXT)
+	-rm -f src/server.$(OBJEXT)
 	-rm -f src/service.$(OBJEXT)
+	-rm -f src/transport.$(OBJEXT)
 	-rm -f test/main.$(OBJEXT)
 
 distclean-compile:
@@ -664,13 +699,16 @@
 @AMDEP_TRUE@@am__include@ @am__quote@gwobex/$(DEPDIR)/obex-priv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gwobex/$(DEPDIR)/obex-xfer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gwobex/$(DEPDIR)/utils.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/bluetooth.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/filesystem.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/ftp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/nokia-backup.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/opp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/pbap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/phonebook.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/syncevolution.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/bluetooth.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/usb.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/vcard.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/btio.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/logging.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/main.Po@am__quote@
@@ -678,7 +716,9 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/mimetype.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/obex.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/plugin.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/server.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/service.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/transport.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@test/$(DEPDIR)/main.Po@am__quote@
 
 .c.o:
@@ -1092,7 +1132,7 @@
 	$(AM_V_GEN)$(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
 plugins/phonebook.c: plugins/@PHONEBOOK_DRIVER@
-	$(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@
+	$(AM_V_GEN)$(LN_S) @abs_top_srcdir@/$< $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 
=== modified file 'aclocal.m4'
--- aclocal.m4	2010-03-15 20:43:06 +0000
+++ aclocal.m4	2010-06-15 19:18:33 +0000
@@ -8796,6 +8796,41 @@
 rm -f confinc confmf
 ])
 
+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 6
+
+# AM_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
+AC_DEFUN([AM_PROG_CC_C_O],
+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+dnl Make sure AC_PROG_CC is never called again, or it will override our
+dnl setting of CC.
+m4_define([AC_PROG_CC],
+          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
+])
+
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
 # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
 
=== modified file 'client/main.c'
--- client/main.c	2010-04-27 04:17:15 +0000
+++ client/main.c	2010-06-15 19:18:33 +0000
@@ -48,6 +48,7 @@
 	DBusMessage *message;
 	gchar *sender;
 	gchar *agent;
+	char *filename;
 	GPtrArray *files;
 };
 
@@ -232,12 +233,25 @@
 							void *user_data)
 {
 	struct send_data *data = user_data;
+	struct transfer_data *transfer = session->pending->data;
+
+	if (transfer->err != 0) {
+		DBusMessage *error = g_dbus_create_error(data->message,
+					"org.openobex.Error.Failed",
+					transfer->err > 0 ?
+					OBEX_ResponseToString(transfer->err) :
+					strerror(-transfer->err));
+		g_dbus_send_message(data->connection, error);
+		goto done;
+	}
 
 	g_dbus_send_reply(data->connection, data->message, DBUS_TYPE_INVALID);
 
+done:
 	shutdown_session(session);
 	dbus_message_unref(data->message);
 	dbus_connection_unref(data->connection);
+	g_free(data->filename);
 	g_free(data->sender);
 	g_free(data);
 }
@@ -256,9 +270,8 @@
 	}
 
 	session_set_owner(session, data->sender, owner_exit);
-	g_dbus_send_reply(data->connection, data->message, DBUS_TYPE_INVALID);
 
-	session_pull(session, "text/x-vcard", "/tmp/x.vcf",
+	session_pull(session, "text/x-vcard", data->filename,
 						pull_complete_callback, data);
 
 	return;
@@ -266,6 +279,7 @@
 done:
 	dbus_message_unref(data->message);
 	dbus_connection_unref(data->connection);
+	g_free(data->filename);
 	g_free(data->sender);
 	g_free(data);
 }
@@ -277,6 +291,7 @@
 	struct session_data *session;
 	struct send_data *data;
 	const char *source = NULL, *dest = NULL, *target = NULL;
+	const char *name = NULL;
 	uint8_t channel = 0;
 
 	dbus_message_iter_init(message, &iter);
@@ -287,6 +302,14 @@
 		return g_dbus_create_error(message,
 				"org.openobex.Error.InvalidArguments", NULL);
 
+	dbus_message_iter_next(&iter);
+
+	if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
+		return g_dbus_create_error(message,
+				"org.openobex.Error.InvalidArguments", NULL);
+
+	dbus_message_iter_get_basic(&iter, &name);
+
 	data = g_try_malloc0(sizeof(*data));
 	if (data == NULL)
 		return g_dbus_create_error(message,
@@ -295,6 +318,7 @@
 	data->connection = dbus_connection_ref(connection);
 	data->message = dbus_message_ref(message);
 	data->sender = g_strdup(dbus_message_get_sender(message));
+	data->filename = g_strdup(name);
 
 	session = session_create(source, dest, "OPP", channel,
 					pull_session_callback, data);
@@ -306,6 +330,7 @@
 	dbus_message_unref(data->message);
 	dbus_connection_unref(data->connection);
 	g_free(data->sender);
+	g_free(data->filename);
 	g_free(data);
 
 	return g_dbus_create_error(message, "org.openobex.Error.Failed", NULL);
@@ -379,7 +404,7 @@
 	const gchar *sender, *path;
 
 	if (dbus_message_get_args(message, NULL,
-			DBUS_TYPE_STRING, &path,
+			DBUS_TYPE_OBJECT_PATH, &path,
 			DBUS_TYPE_INVALID) == FALSE)
 		return g_dbus_create_error(message,
 				"org.openobex.Error.InvalidArguments", NULL);
 
=== modified file 'client/session.c'
--- client/session.c	2010-04-27 04:17:15 +0000
+++ client/session.c	2010-06-15 19:18:33 +0000
@@ -1278,7 +1278,7 @@
 	if (session->obex == NULL)
 		return -ENOTCONN;
 
-	transfer = transfer_register(session, NULL, NULL, type, NULL);
+	transfer = transfer_register(session, NULL, filename, type, NULL);
 	if (transfer == NULL) {
 		return -EIO;
 	}
 
=== modified file 'client/transfer.c'
--- client/transfer.c	2010-04-27 04:17:15 +0000
+++ client/transfer.c	2010-06-15 19:18:33 +0000
@@ -406,17 +406,20 @@
 	if (transfer->xfer != NULL)
 		return -EALREADY;
 
-	if (transfer->type == NULL) {
+	if (g_strcmp0(transfer->type, "x-bt/vcard-listing") == 0 ||
+			g_strcmp0(transfer->type, "x-obex/folder-listing") == 0)
+		cb = get_xfer_listing_progress;
+	else {
 		int fd = open(transfer->name ? : transfer->filename,
 				O_WRONLY | O_CREAT, 0600);
+
 		if (transfer->fd < 0) {
 			error("open(): %s(%d)", strerror(errno), errno);
 			return -errno;
 		}
 		transfer->fd = fd;
 		cb = get_xfer_progress;
-	} else
-		cb = get_xfer_listing_progress;
+	}
 
 	if (transfer->params != NULL)
 		transfer->xfer = gw_obex_get_async_with_apparam(session->obex,
 
=== added file 'compile'
--- compile	1970-01-01 00:00:00 +0000
+++ compile	2010-06-15 19:18:33 +0000
@@ -0,0 +1,143 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
+
+scriptversion=2009-10-06.20; # UTC
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
+# Foundation, Inc.
+# Written by Tom Tromey <[e-mail]>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <[e-mail]> or send patches to
+# <[e-mail]>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to <[e-mail]>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+esac
+
+ofile=
+cfile=
+eat=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as `compile cc -o foo foo.c'.
+	# So we strip `-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no `-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # `.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use `[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
 
=== modified file 'config.h.in'
--- config.h.in	2010-03-15 20:43:06 +0000
+++ config.h.in	2010-06-15 19:18:33 +0000
@@ -52,6 +52,9 @@
 /* Define if threading support is required */
 #undef NEED_THREADS
 
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
 /* Name of package */
 #undef PACKAGE
 
 
=== modified file 'configure'
--- configure	2010-04-27 04:17:15 +0000
+++ configure	2010-06-15 19:18:33 +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.23.
+# Generated by GNU Autoconf 2.63 for obexd 0.28.
 #
 # 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.23'
-PACKAGE_STRING='obexd 0.23'
+PACKAGE_VERSION='0.28'
+PACKAGE_STRING='obexd 0.28'
 PACKAGE_BUGREPORT=''
 
 ac_default_prefix=/usr/local
@@ -790,6 +790,10 @@
 LIBOBJS
 CLIENT_FALSE
 CLIENT_TRUE
+NOKIA_BACKUP_FALSE
+NOKIA_BACKUP_TRUE
+USB_FALSE
+USB_TRUE
 SERVER_FALSE
 SERVER_TRUE
 PHONEBOOK_DRIVER
@@ -797,6 +801,8 @@
 GTHREAD_CFLAGS
 EBOOK_LIBS
 EBOOK_CFLAGS
+LIBICAL_LIBS
+LIBICAL_CFLAGS
 BLUEZ_LIBS
 BLUEZ_CFLAGS
 OPENOBEX_LIBS
@@ -931,6 +937,8 @@
 enable_debug
 with_phonebook
 enable_server
+enable_usb
+enable_nokia_backup
 enable_client
 '
       ac_precious_vars='build_alias
@@ -951,6 +959,8 @@
 OPENOBEX_LIBS
 BLUEZ_CFLAGS
 BLUEZ_LIBS
+LIBICAL_CFLAGS
+LIBICAL_LIBS
 EBOOK_CFLAGS
 EBOOK_LIBS
 GTHREAD_CFLAGS
@@ -1507,7 +1517,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.23 to adapt to many kinds of systems.
+\`configure' configures obexd 0.28 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1577,7 +1587,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of obexd 0.23:";;
+     short | recursive ) echo "Configuration of obexd 0.28:";;
    esac
   cat <<\_ACEOF
 
@@ -1599,6 +1609,8 @@
   --disable-optimization  disable code optimization through compiler
   --enable-debug          enable compiling with debugging information
   --disable-server        disable compilation of OBEX server
+  --enable-usb            enable usb plugin
+  --enable-nokia-backup   enable nokia-backup plugin
   --disable-client        disable compilation of OBEX client
 
 Optional Packages:
@@ -1630,6 +1642,10 @@
   BLUEZ_CFLAGS
               C compiler flags for BLUEZ, overriding pkg-config
   BLUEZ_LIBS  linker flags for BLUEZ, overriding pkg-config
+  LIBICAL_CFLAGS
+              C compiler flags for LIBICAL, overriding pkg-config
+  LIBICAL_LIBS
+              linker flags for LIBICAL, overriding pkg-config
   EBOOK_CFLAGS
               C compiler flags for EBOOK, overriding pkg-config
   EBOOK_LIBS  linker flags for EBOOK, overriding pkg-config
@@ -1703,7 +1719,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-obexd configure 0.23
+obexd configure 0.28
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1717,7 +1733,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.23, which was
+It was created by obexd $as_me 0.28, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2567,7 +2583,7 @@
 
 # Define the identity of the package.
  PACKAGE='obexd'
- VERSION='0.23'
+ VERSION='0.28'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3811,6 +3827,138 @@
 fi
 
 
+if test "x$CC" != xcc; then
+  { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
+else
+  { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
+fi
+set dummy $CC; ac_cc=`$as_echo "$2" |
+		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+# Make sure it works both with $CC and with simple cc.
+# We do the test twice because some compilers refuse to overwrite an
+# existing .o file with -o, though they will create one.
+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+rm -f conftest2.*
+if { (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_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+   test -f conftest2.$ac_objext && { (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_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); };
+then
+  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+  if test "x$CC" != xcc; then
+    # Test first that cc exists at all.
+    if { ac_try='cc -c conftest.$ac_ext >&5'
+  { (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_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+      rm -f conftest2.*
+      if { (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_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 test -f conftest2.$ac_objext && { (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_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); };
+      then
+	# cc works too.
+	:
+      else
+	# cc exists but doesn't like -o.
+	eval ac_cv_prog_cc_${ac_cc}_c_o=no
+      fi
+    fi
+  fi
+else
+  eval ac_cv_prog_cc_${ac_cc}_c_o=no
+fi
+rm -f core conftest*
+
+fi
+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_MINUS_C_MINUS_O 1
+_ACEOF
+
+fi
+
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+
+
 
 	{ $as_echo "$as_me:$LINENO: checking whether ${CC-cc} accepts -fPIE" >&5
 $as_echo_n "checking whether ${CC-cc} accepts -fPIE... " >&6; }
@@ -4731,13 +4879,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4734: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4882: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4737: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4885: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4740: output\"" >&5)
+  (eval echo "\"\$as_me:4888: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5943,7 +6091,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5946 "configure"' > conftest.$ac_ext
+  echo '#line 6094 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7766,11 +7914,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7769: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7917: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7773: \$? = $ac_status" >&5
+   echo "$as_me:7921: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8105,11 +8253,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8108: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8256: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8112: \$? = $ac_status" >&5
+   echo "$as_me:8260: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8210,11 +8358,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8213: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8361: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8217: \$? = $ac_status" >&5
+   echo "$as_me:8365: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8265,11 +8413,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8268: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8416: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8272: \$? = $ac_status" >&5
+   echo "$as_me:8420: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11068,7 +11216,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11071 "configure"
+#line 11219 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11164,7 +11312,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11167 "configure"
+#line 11315 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12188,6 +12336,82 @@
 fi
 
 
+if (test "${phonebook_driver}" = "dummy"); then
+
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for LIBICAL" >&5
+$as_echo_n "checking for LIBICAL... " >&6; }
+
+if test -n "$LIBICAL_CFLAGS"; then
+    pkg_cv_LIBICAL_CFLAGS="$LIBICAL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libical\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libical") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_LIBICAL_CFLAGS=`$PKG_CONFIG --cflags "libical" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBICAL_LIBS"; then
+    pkg_cv_LIBICAL_LIBS="$LIBICAL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libical\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libical") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_LIBICAL_LIBS=`$PKG_CONFIG --libs "libical" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBICAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libical" 2>&1`
+        else
+	        LIBICAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libical" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBICAL_PKG_ERRORS" >&5
+
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+                { { $as_echo "$as_me:$LINENO: error: libical is required" >&5
+$as_echo "$as_me: error: libical is required" >&2;}
+   { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+	{ { $as_echo "$as_me:$LINENO: error: libical is required" >&5
+$as_echo "$as_me: error: libical is required" >&2;}
+   { (exit 1); exit 1; }; }
+else
+	LIBICAL_CFLAGS=$pkg_cv_LIBICAL_CFLAGS
+	LIBICAL_LIBS=$pkg_cv_LIBICAL_LIBS
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	dummy=yes
+fi
+
+
+fi
+
 if (test "${phonebook_driver}" = "ebook"); then
 
 cat >>confdefs.h <<\_ACEOF
@@ -12363,6 +12587,40 @@
 fi
 
 
+# Check whether --enable-usb was given.
+if test "${enable_usb+set}" = set; then
+  enableval=$enable_usb;
+	enable_usb=${enableval}
+
+fi
+
+ if test "${enable_usb}" = "yes" &&
+				test "${enable_server}" != "no"; then
+  USB_TRUE=
+  USB_FALSE='#'
+else
+  USB_TRUE='#'
+  USB_FALSE=
+fi
+
+
+# Check whether --enable-nokia_backup was given.
+if test "${enable_nokia_backup+set}" = set; then
+  enableval=$enable_nokia_backup;
+	enable_nokia_backup=${enableval}
+
+fi
+
+ if test "${enable_nokia_backup}" = "yes" &&
+				test "${enable_server}" != "no"; then
+  NOKIA_BACKUP_TRUE=
+  NOKIA_BACKUP_FALSE='#'
+else
+  NOKIA_BACKUP_TRUE='#'
+  NOKIA_BACKUP_FALSE=
+fi
+
+
 # Check whether --enable-client was given.
 if test "${enable_client+set}" = set; then
   enableval=$enable_client;
@@ -12514,6 +12772,20 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${USB_TRUE}" && test -z "${USB_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USB\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"USB\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${NOKIA_BACKUP_TRUE}" && test -z "${NOKIA_BACKUP_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"NOKIA_BACKUP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"NOKIA_BACKUP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${CLIENT_TRUE}" && test -z "${CLIENT_FALSE}"; then
   { { $as_echo "$as_me:$LINENO: error: conditional \"CLIENT\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -12843,7 +13115,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.23, which was
+This file was extended by obexd $as_me 0.28, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12906,7 +13178,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-obexd config.status 0.23
+obexd config.status 0.28
 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-04-27 04:17:15 +0000
+++ configure.ac	2010-06-15 19:18:33 +0000
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(obexd, 0.23)
+AC_INIT(obexd, 0.28)
 
 AM_INIT_AUTOMAKE([foreign subdir-objects])
 AM_CONFIG_HEADER(config.h)
@@ -30,6 +30,7 @@
 AC_LANG_C
 
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_CC_PIE
 AC_PROG_INSTALL
 AC_PROG_SED
@@ -114,6 +115,13 @@
 	fi
 ])
 
+if (test "${phonebook_driver}" = "dummy"); then
+	PKG_CHECK_MODULES(LIBICAL, libical, dummy=yes,
+					AC_MSG_ERROR(libical is required))
+	AC_SUBST(LIBICAL_CFLAGS)
+	AC_SUBST(LIBICAL_LIBS)
+fi
+
 if (test "${phonebook_driver}" = "ebook"); then
 	AC_DEFINE(NEED_THREADS, 1, [Define if threading support is required])
 
@@ -136,6 +144,20 @@
 ])
 AM_CONDITIONAL(SERVER, test "${enable_server}" != "no")
 
+AC_ARG_ENABLE(usb, AC_HELP_STRING([--enable-usb],
+				[enable usb plugin]), [
+	enable_usb=${enableval}
+])
+AM_CONDITIONAL(USB, test "${enable_usb}" = "yes" &&
+				test "${enable_server}" != "no")
+
+AC_ARG_ENABLE(nokia_backup, AC_HELP_STRING([--enable-nokia-backup],
+				[enable nokia-backup plugin]), [
+	enable_nokia_backup=${enableval}
+])
+AM_CONDITIONAL(NOKIA_BACKUP, test "${enable_nokia_backup}" = "yes" &&
+				test "${enable_server}" != "no")
+
 AC_ARG_ENABLE(client, AC_HELP_STRING([--disable-client],
 				[disable compilation of OBEX client]), [
 	enable_client=${enableval}
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-04-27 04:17:15 +0000
+++ debian/changelog	2010-06-15 19:18:33 +0000
@@ -1,3 +1,43 @@
+obexd (0.28-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - version 0.28:
+      + Fix broken assumption about contacts.
+      + Fix issue with exporting empty contacts.
+      + Fix issue with not always including the TEL header.
+      + Fix wrong response code for PBAP PUT operation.
+      + Fix handling of Tracker optional parameters.
+      + Fix queries for incoming and outgoing folders.
+      + Fix ordering during folder listing.
+      + Fix complex logic discovering the type of call.
+      + Add support for the X-IRMC-CALL-DATETIME field.
+    - version 0.27:
+      + Fix GET name handling with FTP service.
+      + Fix service driver matching when who is not specified.
+      + Fix object name not being updated when agent changes it.
+      + Fix inconsistency when using vCard version 2.1.
+      + Fix wrong response code to PUT requests for PBAP.
+      + Fix crash on PBAP SetPhoneBook function.
+      + Add support for transport drivers.
+      + Add support for Nokia backup plugin.
+    - version 0.26:
+      + Fix the order of the calls handles.
+      + Fix crash when receiving small objects.
+      + Fix invalid memory access when removing a file.
+      + Fix inverting the list with wrong search attribute.
+      + Fix wrong response code for dummy PullvCardListing.
+      + Fix sending the Not Found response asynchronously.
+      + Fix not resetting buffered data count when resetting the session.
+      + Add support for multiple telephone numbers.
+      + Add support for the ADR filter.
+    - version 0.25:
+      + Fix issue with missing phonebook-tracker.c file.
+  * debian/rules:
+    - enable usb and enable-nokia-backup plugins
+  * New upstream release.
+
+ -- Baptiste Mille-Mathias <[e-mail]>  Tue, 15 Jun 2010 20:48:39 +0200
+
 obexd (0.23-1) unstable; urgency=low
 
   * New upstream release (Closes: #558710).
 
=== modified file 'debian/control'
--- debian/control	2010-04-27 04:17:15 +0000
+++ debian/control	2010-06-15 19:18:33 +0000
@@ -7,7 +7,8 @@
                libglib2.0-dev,
                libdbus-1-dev,
                libopenobex1-dev,
-               libbluetooth-dev (>= 4)
+               libbluetooth-dev (>= 4),
+               libical-dev
 Vcs-Svn: svn://svn.debian.org/svn/pkg-bluetooth/packages/obexd
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-bluetooth/packages/obexd
 Homepage: http://www.bluez.org
 
=== modified file 'debian/rules'
--- debian/rules	2009-07-27 19:02:30 +0000
+++ debian/rules	2010-06-15 19:18:33 +0000
@@ -3,3 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/autotools.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS += \
+			--enable-usb \
+			--enable-nokia-backup
 
=== modified file 'gdbus/object.c'
--- gdbus/object.c	2010-03-15 20:43:06 +0000
+++ gdbus/object.c	2010-06-15 19:18:33 +0000
@@ -308,8 +308,10 @@
 		goto done;
 
 	if (!dbus_connection_get_object_path_data(conn, parent_path,
-							(void *) &data))
+							(void *) &data)) {
+		invalidate_parent_data(conn, parent_path);
 		goto done;
+	}
 
 	if (!data)
 		goto done;
@@ -514,8 +516,10 @@
 	if (data == NULL)
 		return FALSE;
 
-	if (find_interface(data->interfaces, name))
+	if (find_interface(data->interfaces, name)) {
+		object_path_unref(connection, path);
 		return FALSE;
+	}
 
 	add_interface(data, name, methods, signals,
 			properties, user_data, destroy);
 
=== added file 'plugins/bluetooth.c'
--- plugins/bluetooth.c	1970-01-01 00:00:00 +0000
+++ plugins/bluetooth.c	2010-06-15 19:18:33 +0000
@@ -0,0 +1,609 @@
+/*
+ *
+ *  OBEX Server
+ *
+ *  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
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <errno.h>
+#include <string.h>
+
+#include <openobex/obex.h>
+#include <openobex/obex_const.h>
+
+#include <glib.h>
+#include <gdbus.h>
+
+#include "plugin.h"
+#include "server.h"
+#include "obex.h"
+#include "transport.h"
+#include "service.h"
+#include "logging.h"
+#include "btio.h"
+
+#define BT_RX_MTU 32767
+#define BT_TX_MTU 32767
+
+#define TIMEOUT 60*1000 /* Timeout for user response (miliseconds) */
+
+struct pending_request {
+	DBusPendingCall *call;
+	struct bluetooth_service *service;
+	char *adapter_path;
+	char address[18];
+	unsigned int watch;
+	GIOChannel *io;
+};
+
+struct bluetooth_service {
+	struct obex_server *server;
+	struct obex_service_driver *driver;
+	uint32_t handle;
+};
+
+struct adapter_any {
+	char *path;		/* Adapter ANY path */
+	GSList *services;	/* List of services to register records */
+};
+
+static DBusConnection *connection = NULL;
+static struct adapter_any *any = NULL;
+
+static void add_record_reply(DBusPendingCall *call, void *user_data)
+{
+	struct bluetooth_service *service = user_data;
+	DBusMessage *reply = dbus_pending_call_steal_reply(call);
+	DBusError derr;
+	uint32_t handle;
+
+	dbus_error_init(&derr);
+	if (dbus_set_error_from_message(&derr, reply)) {
+		error("bluetooth: Replied with an error: %s, %s",
+				derr.name, derr.message);
+		dbus_error_free(&derr);
+		handle = 0;
+	} else {
+		dbus_message_get_args(reply, NULL,
+				DBUS_TYPE_UINT32, &handle,
+				DBUS_TYPE_INVALID);
+
+		service->handle = handle;
+
+		debug("bluetooth: Registered: %s, handle: 0x%x",
+				service->driver->name, service->handle);
+	}
+
+	dbus_message_unref(reply);
+}
+
+static int add_record(const char *path, const char *xml,
+			struct bluetooth_service *service)
+{
+	DBusMessage *msg;
+	DBusPendingCall *call;
+	int ret = 0;
+
+	msg = dbus_message_new_method_call("org.bluez", path,
+					"org.bluez.Service", "AddRecord");
+
+	dbus_message_append_args(msg, DBUS_TYPE_STRING, &xml,
+			DBUS_TYPE_INVALID);
+
+	if (dbus_connection_send_with_reply(connection,
+				msg, &call, -1) == FALSE) {
+		ret = -1;
+		goto failed;
+	}
+
+	dbus_pending_call_set_notify(call, add_record_reply, service, NULL);
+	dbus_pending_call_unref(call);
+
+failed:
+	dbus_message_unref(msg);
+	return ret;
+}
+
+static struct bluetooth_service *find_service(
+					struct obex_service_driver *driver,
+					uint8_t channel)
+{
+	GSList *l;
+
+	for (l = any->services; l; l = l->next) {
+		struct bluetooth_service *service = l->data;
+
+		if (driver != NULL && service->driver != driver)
+			continue;
+
+		if (channel != 0 && service->driver->channel != channel)
+			continue;
+
+		return service;
+	}
+
+	return NULL;
+}
+
+static void register_record(struct obex_server *server)
+{
+	const GSList *l;
+
+	if (connection == NULL)
+		return;
+
+	for (l = server->drivers; l; l = l->next) {
+		struct obex_service_driver *driver = l->data;
+		struct bluetooth_service *service;
+		char *xml;
+
+		service = find_service(driver, 0);
+		if (service == NULL) {
+			service = g_new0(struct bluetooth_service, 1);
+			service->driver = driver;
+			service->server = server;
+			any->services = g_slist_append(any->services, service);
+		}
+
+		/* Service already has a record registered */
+		if (service->handle != 0)
+			continue;
+
+		/* Adapter ANY is not available yet: Add record later */
+		if (any->path == NULL)
+			continue;
+
+		xml = g_markup_printf_escaped(driver->record, driver->channel,
+						driver->name);
+		add_record(any->path, xml, service);
+		g_free(xml);
+	}
+}
+
+static void find_adapter_any_reply(DBusPendingCall *call, void *user_data)
+{
+	DBusMessage *reply = dbus_pending_call_steal_reply(call);
+	const char *path;
+	GSList *l;
+	DBusError derr;
+
+	dbus_error_init(&derr);
+	if (dbus_set_error_from_message(&derr, reply)) {
+		error("bluetooth: Replied with an error: %s, %s",
+				derr.name, derr.message);
+		dbus_error_free(&derr);
+		goto done;
+	}
+
+	dbus_message_get_args(reply, NULL,
+			DBUS_TYPE_OBJECT_PATH, &path,
+			DBUS_TYPE_INVALID);
+	any->path = g_strdup(path);
+
+	for (l = any->services; l; l = l->next) {
+		struct bluetooth_service *service = l->data;
+		char *xml;
+
+		xml = g_markup_printf_escaped(service->driver->record,
+						service->driver->channel,
+						service->driver->name);
+		add_record(any->path, xml, service);
+		g_free(xml);
+	}
+
+done:
+	dbus_message_unref(reply);
+}
+
+static DBusPendingCall *find_adapter(const char *pattern,
+				DBusPendingCallNotifyFunction function,
+				void *user_data)
+{
+	DBusMessage *msg;
+	DBusPendingCall *call;
+
+	debug("bluetooth: FindAdapter(%s)", pattern);
+
+	msg = dbus_message_new_method_call("org.bluez", "/",
+					"org.bluez.Manager", "FindAdapter");
+	if (!msg)
+		return NULL;
+
+	dbus_message_append_args(msg, DBUS_TYPE_STRING, &pattern,
+			DBUS_TYPE_INVALID);
+
+	if (!dbus_connection_send_with_reply(connection, msg, &call, -1)) {
+		dbus_message_unref(msg);
+		return NULL;
+	}
+
+	dbus_pending_call_set_notify(call, function, user_data, NULL);
+
+	dbus_message_unref(msg);
+
+	return call;
+}
+
+static void name_acquired(DBusConnection *conn, void *user_data)
+{
+	DBusPendingCall *call;
+
+	call = find_adapter("any", find_adapter_any_reply, NULL);
+	if (call)
+		dbus_pending_call_unref(call);
+}
+
+static void name_released(DBusConnection *conn, void *user_data)
+{
+	GSList *l;
+
+	/* reset handles so the services got register next time */
+	for (l = any->services; l; l = l->next) {
+		struct bluetooth_service *service = l->data;
+
+		service->handle = 0;
+	}
+
+	g_free(any->path);
+	any->path = NULL;
+
+}
+
+static void service_cancel(struct pending_request *pending)
+{
+	DBusMessage *msg;
+
+	msg = dbus_message_new_method_call("org.bluez",
+					pending->adapter_path,
+					"org.bluez.Service",
+					"CancelAuthorization");
+
+	g_dbus_send_message(connection, msg);
+}
+
+static void pending_request_free(struct pending_request *pending)
+{
+	if (pending->call)
+		dbus_pending_call_unref(pending->call);
+	g_io_channel_unref(pending->io);
+	g_free(pending->adapter_path);
+	g_free(pending);
+}
+
+static void connect_event(GIOChannel *io, GError *err, void *user_data)
+{
+	struct bluetooth_service *service = user_data;
+	struct obex_server *server = service->server;
+
+	if (err)
+		goto drop;
+
+	if (obex_server_new_connection(server, io, BT_TX_MTU, BT_RX_MTU) < 0)
+		g_io_channel_shutdown(io, TRUE, NULL);
+
+	return;
+
+drop:
+	error("%s", err->message);
+	g_io_channel_shutdown(io, TRUE, NULL);
+	return;
+}
+
+static void service_reply(DBusPendingCall *call, void *user_data)
+{
+	struct pending_request *pending = user_data;
+	GIOChannel *io = pending->io;
+	struct bluetooth_service *service = pending->service;
+	DBusMessage *reply = dbus_pending_call_steal_reply(call);
+	DBusError derr;
+	GError *err = NULL;
+
+	dbus_error_init(&derr);
+	if (dbus_set_error_from_message(&derr, reply)) {
+		error("bluetooth: RequestAuthorization error: %s, %s",
+				derr.name, derr.message);
+
+		if (dbus_error_has_name(&derr, DBUS_ERROR_NO_REPLY))
+			service_cancel(pending);
+
+		dbus_error_free(&derr);
+		g_io_channel_shutdown(io, TRUE, NULL);
+		goto done;
+	}
+
+	debug("bluetooth: RequestAuthorization succeeded");
+
+	if (!bt_io_accept(io, connect_event, service, NULL, &err)) {
+		error("%s", err->message);
+		g_error_free(err);
+		g_io_channel_shutdown(io, TRUE, NULL);
+	}
+
+done:
+	g_source_remove(pending->watch);
+	pending_request_free(pending);
+	dbus_message_unref(reply);
+}
+
+static gboolean service_error(GIOChannel *io, GIOCondition cond,
+			void *user_data)
+{
+	struct pending_request *pending = user_data;
+
+	service_cancel(pending);
+
+	dbus_pending_call_cancel(pending->call);
+
+	pending_request_free(pending);
+
+	return FALSE;
+}
+
+static void find_adapter_reply(DBusPendingCall *call, void *user_data)
+{
+	struct pending_request *pending = user_data;
+	DBusMessage *reply = dbus_pending_call_steal_reply(call);
+	DBusMessage *msg;
+	DBusPendingCall *pcall;
+	const char *path, *paddr = pending->address;
+	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 failed;
+	}
+
+	dbus_message_get_args(reply, NULL,
+			DBUS_TYPE_OBJECT_PATH, &path,
+			DBUS_TYPE_INVALID);
+
+	debug("bluetooth: FindAdapter -> %s", path);
+	pending->adapter_path = g_strdup(path);
+	dbus_message_unref(reply);
+
+	msg = dbus_message_new_method_call("org.bluez", path,
+			"org.bluez.Service", "RequestAuthorization");
+
+	dbus_message_append_args(msg, DBUS_TYPE_STRING, &paddr,
+			DBUS_TYPE_UINT32, &pending->service->handle,
+			DBUS_TYPE_INVALID);
+
+	if (!dbus_connection_send_with_reply(connection,
+					msg, &pcall, TIMEOUT)) {
+		dbus_message_unref(msg);
+		goto failed;
+	}
+
+	dbus_message_unref(msg);
+
+	debug("bluetooth: RequestAuthorization(%s, %x)", paddr,
+			pending->service->handle);
+
+	if (!dbus_pending_call_set_notify(pcall, service_reply, pending,
+								NULL)) {
+		dbus_pending_call_unref(pcall);
+		goto failed;
+	}
+
+	dbus_pending_call_unref(pending->call);
+	pending->call = pcall;
+
+	/* Catches errors before authorization response comes */
+	pending->watch = g_io_add_watch(pending->io,
+					G_IO_HUP | G_IO_ERR | G_IO_NVAL,
+					service_error, pending);
+
+	return;
+
+failed:
+	g_io_channel_shutdown(pending->io, TRUE, NULL);
+	pending_request_free(pending);
+}
+
+static int request_service_authorization(struct bluetooth_service *service,
+					GIOChannel *io, const char *address)
+{
+	struct pending_request *pending;
+	char source[18];
+	GError *err = NULL;
+
+	if (connection == NULL || any->path == NULL)
+		return -1;
+
+	bt_io_get(io, BT_IO_RFCOMM, &err,
+			BT_IO_OPT_SOURCE, source,
+			BT_IO_OPT_INVALID);
+	if (err) {
+		error("%s", err->message);
+		g_error_free(err);
+		return -EINVAL;
+	}
+
+	pending = g_new0(struct pending_request, 1);
+	pending->call = find_adapter(source, find_adapter_reply, pending);
+	if (!pending->call) {
+		g_free(pending);
+		return -ENOMEM;
+	}
+
+	pending->service = service;
+	pending->io = g_io_channel_ref(io);
+	memcpy(pending->address, address, sizeof(pending->address));
+
+	return 0;
+}
+
+static void confirm_event(GIOChannel *io, void *user_data)
+{
+	struct bluetooth_service *service;
+	GError *err = NULL;
+	char address[18];
+	uint8_t channel;
+
+	bt_io_get(io, BT_IO_RFCOMM, &err,
+			BT_IO_OPT_DEST, address,
+			BT_IO_OPT_CHANNEL, &channel,
+			BT_IO_OPT_INVALID);
+	if (err) {
+		error("%s", err->message);
+		g_error_free(err);
+		goto drop;
+	}
+
+	info("bluetooth: New connection from: %s, channel %u", address,
+			channel);
+
+	service = find_service(NULL, channel);
+	if (service == NULL) {
+		error("bluetooth: Unable to find service");
+		goto drop;
+	}
+
+	if (service->driver->service != OBEX_OPP) {
+		if (request_service_authorization(service, io, address) < 0)
+			goto drop;
+
+		return;
+	}
+
+	if (!bt_io_accept(io, connect_event, service, NULL, &err)) {
+		error("%s", err->message);
+		g_error_free(err);
+		goto drop;
+	}
+
+	return;
+
+drop:
+	g_io_channel_shutdown(io, TRUE, NULL);
+}
+
+static GIOChannel *start(struct obex_server *server,
+				struct obex_service_driver *service,
+				BtIOSecLevel sec_level)
+{
+	GIOChannel *io;
+	GError *err = NULL;
+
+	io = bt_io_listen(BT_IO_RFCOMM, NULL, confirm_event,
+				server, NULL, &err,
+				BT_IO_OPT_CHANNEL, service->channel,
+				BT_IO_OPT_SEC_LEVEL, sec_level,
+				BT_IO_OPT_INVALID);
+	if (io == NULL) {
+		error("bluetooth: unable to listen in channel %d: %s",
+				service->channel, err->message);
+		g_error_free(err);
+	} else
+		debug("bluetooth: listening on channel %d", service->channel);
+
+	return io;
+}
+
+static void *bluetooth_start(struct obex_server *server, int *err)
+{
+	BtIOSecLevel sec_level;
+	GSList *ios = NULL;
+	const GSList *l;
+
+	if (server->secure == TRUE)
+		sec_level = BT_IO_SEC_MEDIUM;
+	else
+		sec_level = BT_IO_SEC_LOW;
+
+	for (l = server->drivers; l; l = l->next) {
+		struct obex_service_driver *service = l->data;
+		GIOChannel *io;
+
+		io = start(server, service, sec_level);
+		if (io == NULL)
+			continue;
+
+		ios = g_slist_prepend(ios, io);
+	}
+
+	register_record(server);
+
+	return ios;
+}
+
+static void stop(gpointer data, gpointer user_data)
+{
+	GIOChannel *io = data;
+
+	g_io_channel_shutdown(io, TRUE, NULL);
+	g_io_channel_unref(io);
+}
+
+static void bluetooth_stop(void *data)
+{
+	GSList *ios = data;
+
+	g_slist_foreach(ios, stop, NULL);
+	g_slist_free(ios);
+}
+
+static struct obex_transport_driver driver = {
+	.name = "bluetooth",
+	.start = bluetooth_start,
+	.stop = bluetooth_stop
+};
+
+static unsigned int listener_id = 0;
+
+static int bluetooth_init(void)
+{
+	any = g_new0(struct adapter_any, 1);
+
+	connection = g_dbus_setup_private(DBUS_BUS_SYSTEM, NULL, NULL);
+	if (connection == NULL)
+		return -EPERM;
+
+	listener_id = g_dbus_add_service_watch(connection, "org.bluez",
+				name_acquired, name_released, NULL, NULL);
+
+	return obex_transport_driver_register(&driver);
+}
+
+static void bluetooth_exit(void)
+{
+	g_dbus_remove_watch(connection, listener_id);
+
+	if (any) {
+		g_slist_foreach(any->services, (GFunc) g_free, NULL);
+		g_slist_free(any->services);
+		g_free(any->path);
+		g_free(any);
+	}
+
+	if (connection)
+		dbus_connection_unref(connection);
+
+	obex_transport_driver_unregister(&driver);
+}
+
+OBEX_PLUGIN_DEFINE(bluetooth, bluetooth_init, bluetooth_exit)
 
=== modified file 'plugins/filesystem.c'
--- plugins/filesystem.c	2010-04-27 04:17:15 +0000
+++ plugins/filesystem.c	2010-06-15 19:18:33 +0000
@@ -58,7 +58,7 @@
 #define FL_TYPE "<!DOCTYPE folder-listing SYSTEM \"obex-folder-listing.dtd\">" EOL_CHARS
 
 #define FL_TYPE_PCSUITE "<!DOCTYPE folder-listing SYSTEM \"obex-folder-listing.dtd\"" EOL_CHARS \
-                        "  [ <!ATTLIST folder mem-type CDATA #IMPLIED> ]>" EOL_CHARS
+			"  [ <!ATTLIST folder mem-type CDATA #IMPLIED> ]>" EOL_CHARS
 
 #define FL_BODY_BEGIN "<folder-listing version=\"1.0\">" EOL_CHARS
 
@@ -77,16 +77,22 @@
 			" modified=\"%s\" mem-type=\"DEV\"" \
 			" created=\"%s\"/>" EOL_CHARS
 
-static const guint8 FTP_TARGET[TARGET_SIZE] = {
+static const uint8_t FTP_TARGET[TARGET_SIZE] = {
 			0xF9, 0xEC, 0x7B, 0xC4,  0x95, 0x3C, 0x11, 0xD2,
 			0x98, 0x4E, 0x52, 0x54,  0x00, 0xDC, 0x9E, 0x09  };
 
-static gchar *file_stat_line(gchar *filename, struct stat *fstat,
-				struct stat *dstat, gboolean root,
-				gboolean pcsuite)
+#define PCSUITE_WHO_SIZE 8
+
+static const uint8_t PCSUITE_WHO[PCSUITE_WHO_SIZE] = {
+			'P','C',' ','S','u','i','t','e' };
+
+
+static char *file_stat_line(char *filename, struct stat *fstat,
+					struct stat *dstat, gboolean root,
+					gboolean pcsuite)
 {
-	gchar perm[51], atime[18], ctime[18], mtime[18];
-	gchar *escaped, *ret = NULL;
+	char perm[51], atime[18], ctime[18], mtime[18];
+	char *escaped, *ret = NULL;
 
 	snprintf(perm, 50, "user-perm=\"%s%s%s\" group-perm=\"%s%s%s\" "
 			"other-perm=\"%s%s%s\"",
@@ -113,22 +119,26 @@
 						mtime, ctime);
 		else
 			ret = g_strdup_printf(FL_FOLDER_ELEMENT, escaped, perm,
-						atime, mtime, ctime);
+							atime, mtime, ctime);
 	} else if (S_ISREG(fstat->st_mode))
 		ret = g_strdup_printf(FL_FILE_ELEMENT, escaped, fstat->st_size,
-					perm, atime, mtime, ctime);
+						perm, atime, mtime, ctime);
 
 	g_free(escaped);
 
 	return ret;
 }
 
-static gpointer filesystem_open(const char *name, int oflag, mode_t mode,
-		gpointer context, size_t *size, int *err)
+static void *filesystem_open(const char *name, int oflag, mode_t mode,
+					void *context, size_t *size, int *err)
 {
 	struct stat stats;
 	struct statvfs buf;
+	const char *root_folder;
+	char *folder;
+	gboolean root;
 	int fd = open(name, oflag, mode);
+	uint64_t avail;
 
 	if (fd < 0) {
 		if (err)
@@ -142,6 +152,21 @@
 		goto failed;
 	}
 
+	root_folder = obex_option_root_folder();
+	folder = g_path_get_dirname(name);
+	root = g_strcmp0(folder, root_folder);
+
+	g_free(folder);
+
+	if (!root || obex_option_symlinks()) {
+		if (S_ISLNK(stats.st_mode)) {
+			if (err)
+				*err = -EPERM;
+			goto failed;
+		}
+
+	}
+
 	if (oflag == O_RDONLY) {
 		if (size)
 			*size = stats.st_size;
@@ -157,7 +182,8 @@
 	if (size == NULL)
 		goto done;
 
-	if (buf.f_bsize * buf.f_bavail < *size) {
+	avail = (uint64_t) buf.f_bsize * buf.f_bavail;
+	if (avail < *size) {
 		if (err)
 			*err = -ENOSPC;
 		goto failed;
@@ -174,7 +200,7 @@
 	return NULL;
 }
 
-static int filesystem_close(gpointer object)
+static int filesystem_close(void *object)
 {
 	if (close(GPOINTER_TO_INT(object)) < 0)
 		return -errno;
@@ -182,7 +208,8 @@
 	return 0;
 }
 
-static ssize_t filesystem_read(gpointer object, void *buf, size_t count)
+static ssize_t filesystem_read(void *object, void *buf, size_t count,
+								uint8_t *hi)
 {
 	ssize_t ret;
 
@@ -190,10 +217,12 @@
 	if (ret < 0)
 		return -errno;
 
+	*hi = OBEX_HDR_BODY;
+
 	return ret;
 }
 
-static ssize_t filesystem_write(gpointer object, const void *buf, size_t count)
+static ssize_t filesystem_write(void *object, const void *buf, size_t count)
 {
 	ssize_t ret;
 
@@ -208,11 +237,11 @@
 	int pid;
 	int output;
 	int err;
-	guint watch;
+	unsigned int watch;
 	GString *buffer;
 };
 
-static void script_exited(GPid pid, gint status, gpointer data)
+static void script_exited(GPid pid, int status, void *data)
 {
 	struct capability_object *object = data;
 	char buf[128];
@@ -246,11 +275,11 @@
 	return pid;
 }
 
-static gpointer capability_open(const char *name, int oflag, mode_t mode,
-		gpointer context, size_t *size, int *err)
+static void *capability_open(const char *name, int oflag, mode_t mode,
+					void *context, size_t *size, int *err)
 {
 	struct capability_object *object = NULL;
-	gchar *buf;
+	char *buf;
 	const char *argv[2];
 
 	if (oflag != O_RDONLY)
@@ -306,25 +335,26 @@
 	return NULL;
 }
 
-static gpointer folder_open(const char *name, int oflag, mode_t mode,
-		 gpointer context, size_t *size, int *err)
-{
-	struct obex_session *os = context;
+static GString *append_pcsuite_preamble(GString *object)
+{
+	return g_string_append(object, FL_TYPE_PCSUITE);
+}
+
+static GString *append_folder_preamble(GString *object)
+{
+	return g_string_append(object, FL_TYPE);
+}
+
+static GString *append_listing(GString *object, const char *name,
+				gboolean pcsuite, size_t *size, int *err)
+{
 	struct stat fstat, dstat;
 	struct dirent *ep;
-	GString *object;
 	DIR *dp;
-	gboolean root, pcsuite, symlinks;
-	gint ret;
-
-	pcsuite = obex_get_service(os) & OBEX_PCSUITE ? TRUE : FALSE;
-
-	object = g_string_new(FL_VERSION);
-	object = g_string_append(object, pcsuite ? FL_TYPE_PCSUITE : FL_TYPE);
-
-	object = g_string_append(object, FL_BODY_BEGIN);
-
-	root = g_str_equal(name, obex_get_root_folder(os));
+	gboolean root, symlinks;
+	int ret;
+
+	root = g_str_equal(name, obex_option_root_folder());
 
 	dp = opendir(name);
 	if (dp == NULL) {
@@ -333,7 +363,7 @@
 		goto failed;
 	}
 
-	symlinks = obex_get_symlinks(os);
+	symlinks = obex_option_symlinks();
 	if (root && symlinks)
 		ret = stat(name, &dstat);
 	else {
@@ -348,9 +378,9 @@
 	}
 
 	while ((ep = readdir(dp))) {
-		gchar *filename;
-		gchar *fullname;
-		gchar *line;
+		char *filename;
+		char *fullname;
+		char *line;
 
 		if (ep->d_name[0] == '.')
 			continue;
@@ -378,7 +408,7 @@
 
 		g_free(fullname);
 
-		line = file_stat_line(filename, &fstat, &dstat, root, pcsuite);
+		line = file_stat_line(filename, &fstat, &dstat, root, FALSE);
 		if (line == NULL) {
 			g_free(filename);
 			continue;
@@ -409,7 +439,31 @@
 	return NULL;
 }
 
-int string_free(gpointer object)
+static void *folder_open(const char *name, int oflag, mode_t mode,
+					void *context, size_t *size, int *err)
+{
+	GString *object;
+
+	object = g_string_new(FL_VERSION);
+	object = append_folder_preamble(object);
+	object = g_string_append(object, FL_BODY_BEGIN);
+
+	return append_listing(object, name, FALSE, size, err);
+}
+
+static void *pcsuite_open(const char *name, int oflag, mode_t mode,
+					void *context, size_t *size, int *err)
+{
+	GString *object;
+
+	object = g_string_new(FL_VERSION);
+	object = append_pcsuite_preamble(object);
+	object = g_string_append(object, FL_BODY_BEGIN);
+
+	return append_listing(object, name, TRUE, size, err);
+}
+
+int string_free(void *object)
 {
 	GString *string = object;
 
@@ -418,7 +472,7 @@
 	return 0;
 }
 
-ssize_t string_read(gpointer object, void *buf, size_t count)
+ssize_t string_read(void *object, void *buf, size_t count)
 {
 	GString *string = object;
 	ssize_t len;
@@ -433,10 +487,19 @@
 	return len;
 }
 
-static ssize_t capability_read(gpointer object, void *buf, size_t count)
+static ssize_t folder_read(void *object, void *buf, size_t count, uint8_t *hi)
+{
+	*hi = OBEX_HDR_BODY;
+	return string_read(object, buf, count);
+}
+
+static ssize_t capability_read(void *object, void *buf, size_t count,
+								uint8_t *hi)
 {
 	struct capability_object *obj = object;
 
+	*hi = OBEX_HDR_BODY;
+
 	if (obj->buffer)
 		return string_read(obj->buffer, buf, count);
 
@@ -446,7 +509,7 @@
 	return read(obj->output, buf, count);
 }
 
-static int capability_close(gpointer object)
+static int capability_close(void *object)
 {
 	struct capability_object *obj = object;
 
@@ -464,7 +527,7 @@
 	return 0;
 }
 
-struct obex_mime_type_driver file = {
+static struct obex_mime_type_driver file = {
 	.open = filesystem_open,
 	.close = filesystem_close,
 	.read = filesystem_read,
@@ -472,7 +535,7 @@
 	.remove = remove,
 };
 
-struct obex_mime_type_driver capability = {
+static struct obex_mime_type_driver capability = {
 	.target = FTP_TARGET,
 	.mimetype = "x-obex/capability",
 	.open = capability_open,
@@ -480,12 +543,22 @@
 	.read = capability_read,
 };
 
-struct obex_mime_type_driver folder = {
+static struct obex_mime_type_driver folder = {
 	.target = FTP_TARGET,
 	.mimetype = "x-obex/folder-listing",
 	.open = folder_open,
 	.close = string_free,
-	.read = string_read,
+	.read = folder_read,
+};
+
+static struct obex_mime_type_driver pcsuite = {
+	.target = FTP_TARGET,
+	.who = PCSUITE_WHO,
+	.who_size = PCSUITE_WHO_SIZE,
+	.mimetype = "x-obex/folder-listing",
+	.open = pcsuite_open,
+	.close = string_free,
+	.read = folder_read,
 };
 
 static int filesystem_init(void)
@@ -500,6 +573,10 @@
 	if (err < 0)
 		return err;
 
+	err = obex_mime_type_driver_register(&pcsuite);
+	if (err < 0)
+		return err;
+
 	return obex_mime_type_driver_register(&file);
 }
 
 
=== modified file 'plugins/filesystem.h'
--- plugins/filesystem.h	2010-04-27 04:17:15 +0000
+++ plugins/filesystem.h	2010-06-15 19:18:33 +0000
@@ -21,5 +21,5 @@
  *
  */
 
-int string_free(gpointer object);
-ssize_t string_read(gpointer object, void *buf, size_t count);
+int string_free(void *object);
+ssize_t string_read(void *object, void *buf, size_t count);
 
=== modified file 'plugins/ftp.c'
--- plugins/ftp.c	2010-04-27 04:17:15 +0000
+++ plugins/ftp.c	2010-06-15 19:18:33 +0000
@@ -54,99 +54,100 @@
 #define LST_TYPE "x-obex/folder-listing"
 #define CAP_TYPE "x-obex/capability"
 
-#define FTP_CHANNEL    10
-#define FTP_RECORD "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>        \
-<record>                                                                       \
-  <attribute id=\"0x0001\">                                                    \
-    <sequence>                                                                 \
-      <uuid value=\"0x1106\"/>                                                 \
-    </sequence>                                                                        \
-  </attribute>                                                                 \
-                                                                               \
-  <attribute id=\"0x0004\">                                                    \
-    <sequence>                                                                 \
-      <sequence>                                                               \
-        <uuid value=\"0x0100\"/>                                               \
-      </sequence>                                                              \
-      <sequence>                                                               \
-        <uuid value=\"0x0003\"/>                                               \
-        <uint8 value=\"%u\" name=\"channel\"/>                                 \
-      </sequence>                                                              \
-      <sequence>                                                               \
-        <uuid value=\"0x0008\"/>                                               \
-      </sequence>                                                              \
-    </sequence>                                                                        \
-  </attribute>                                                                 \
-                                                                               \
-  <attribute id=\"0x0009\">                                                    \
-    <sequence>                                                                 \
-      <sequence>                                                               \
-        <uuid value=\"0x1106\"/>                                               \
-        <uint16 value=\"0x0100\" name=\"version\"/>                            \
-      </sequence>                                                              \
-    </sequence>                                                                        \
-  </attribute>                                                                 \
-                                                                               \
-  <attribute id=\"0x0100\">                                                    \
-    <text value=\"%s\" name=\"name\"/>                                         \
-  </attribute>                                                                 \
+#define FTP_CHANNEL 10
+#define FTP_RECORD "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>		\
+<record>								\
+  <attribute id=\"0x0001\">						\
+    <sequence>								\
+      <uuid value=\"0x1106\"/>						\
+    </sequence>								\
+  </attribute>								\
+									\
+  <attribute id=\"0x0004\">						\
+    <sequence>								\
+      <sequence>							\
+        <uuid value=\"0x0100\"/>					\
+      </sequence>							\
+      <sequence>							\
+        <uuid value=\"0x0003\"/>					\
+        <uint8 value=\"%u\" name=\"channel\"/>				\
+      </sequence>							\
+      <sequence>							\
+        <uuid value=\"0x0008\"/>					\
+      </sequence>							\
+    </sequence>								\
+  </attribute>								\
+									\
+  <attribute id=\"0x0009\">						\
+    <sequence>								\
+      <sequence>							\
+        <uuid value=\"0x1106\"/>					\
+        <uint16 value=\"0x0100\" name=\"version\"/>			\
+      </sequence>							\
+    </sequence>								\
+  </attribute>								\
+									\
+  <attribute id=\"0x0100\">						\
+    <text value=\"%s\" name=\"name\"/>					\
+  </attribute>								\
 </record>"
 
-#define PCSUITE_CHANNEL        24
+#define PCSUITE_CHANNEL 24
 #define PCSUITE_WHO_SIZE 8
-#define PCSUITE_RECORD "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>                                    \
-<record>                                                                       \
-  <attribute id=\"0x0001\">                                                    \
-    <sequence>                                                                 \
-      <uuid value=\"00005005-0000-1000-8000-0002ee000001\"/>                   \
-    </sequence>                                                                        \
-  </attribute>                                                                 \
-                                                                               \
-  <attribute id=\"0x0004\">                                                    \
-    <sequence>                                                                 \
-      <sequence>                                                               \
-        <uuid value=\"0x0100\"/>                                               \
-      </sequence>                                                              \
-      <sequence>                                                               \
-        <uuid value=\"0x0003\"/>                                               \
-        <uint8 value=\"%u\" name=\"channel\"/>                                 \
-      </sequence>                                                              \
-      <sequence>                                                               \
-        <uuid value=\"0x0008\"/>                                               \
-      </sequence>                                                              \
-    </sequence>                                                                        \
-  </attribute>                                                                 \
-                                                                               \
-  <attribute id=\"0x0005\">                                                    \
-    <sequence>                                                                 \
-      <uuid value=\"0x1002\"/>                                                 \
-    </sequence>                                                                        \
-  </attribute>                                                                 \
-                                                                               \
-  <attribute id=\"0x0009\">                                                    \
-    <sequence>                                                                 \
-      <sequence>                                                               \
-        <uuid value=\"00005005-0000-1000-8000-0002ee000001\"/>                         \
-        <uint16 value=\"0x0100\" name=\"version\"/>                            \
-      </sequence>                                                              \
-    </sequence>                                                                        \
-  </attribute>                                                                 \
-                                                                               \
-  <attribute id=\"0x0100\">                                                    \
-    <text value=\"%s\" name=\"name\"/>                                         \
-  </attribute>                                                                 \
+
+#define PCSUITE_RECORD "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>	\
+<record>								\
+  <attribute id=\"0x0001\">						\
+    <sequence>								\
+      <uuid value=\"00005005-0000-1000-8000-0002ee000001\"/>		\
+    </sequence>								\
+  </attribute>								\
+									\
+  <attribute id=\"0x0004\">						\
+    <sequence>								\
+      <sequence>							\
+        <uuid value=\"0x0100\"/>					\
+      </sequence>							\
+      <sequence>							\
+        <uuid value=\"0x0003\"/>					\
+        <uint8 value=\"%u\" name=\"channel\"/>				\
+      </sequence>							\
+      <sequence>							\
+        <uuid value=\"0x0008\"/>					\
+      </sequence>							\
+    </sequence>								\
+  </attribute>								\
+									\
+  <attribute id=\"0x0005\">						\
+    <sequence>								\
+      <uuid value=\"0x1002\"/>						\
+    </sequence>								\
+  </attribute>								\
+									\
+  <attribute id=\"0x0009\">						\
+    <sequence>								\
+      <sequence>							\
+        <uuid value=\"00005005-0000-1000-8000-0002ee000001\"/>		\
+        <uint16 value=\"0x0100\" name=\"version\"/>			\
+      </sequence>							\
+    </sequence>								\
+  </attribute>								\
+									\
+  <attribute id=\"0x0100\">						\
+    <text value=\"%s\" name=\"name\"/>					\
+  </attribute>								\
 </record>"
 
-static const guint8 FTP_TARGET[TARGET_SIZE] = {
-			0xF9, 0xEC, 0x7B, 0xC4,  0x95, 0x3C, 0x11, 0xD2,
-			0x98, 0x4E, 0x52, 0x54,  0x00, 0xDC, 0x9E, 0x09  };
+static const uint8_t FTP_TARGET[TARGET_SIZE] = {
+			0xF9, 0xEC, 0x7B, 0xC4, 0x95, 0x3C, 0x11, 0xD2,
+			0x98, 0x4E, 0x52, 0x54, 0x00, 0xDC, 0x9E, 0x09 };
 
-static const guint8 PCSUITE_WHO[PCSUITE_WHO_SIZE] = {
+static const uint8_t PCSUITE_WHO[PCSUITE_WHO_SIZE] = {
 			'P','C',' ','S','u','i','t','e' };
 
 struct ftp_session {
 	struct obex_session *os;
-	gchar *folder;
+	char *folder;
 };
 
 static void set_folder(struct ftp_session *ftp, const char *new_folder)
@@ -156,49 +157,32 @@
 	ftp->folder = new_folder ? g_strdup(new_folder) : NULL;
 }
 
-static gint get_by_type(struct ftp_session *ftp, const gchar *type)
+static int get_by_type(struct ftp_session *ftp, const char *type)
 {
 	struct obex_session *os = ftp->os;
 	const char *capability = obex_get_capability_path(os);
-
-	if (type == NULL)
-		return -ENOENT;
-
-	if (g_str_equal(type, CAP_TYPE))
-		return obex_stream_start(os, capability, NULL);
-
-	if (g_str_equal(type, LST_TYPE))
-		return obex_stream_start(os, ftp->folder, os);
-
-	return -ENOENT;
-}
-
-static gint ftp_prepare_get(struct ftp_session *ftp, gchar *file)
-{
-	struct obex_session *os = ftp->os;
-	const char *root_folder = obex_get_root_folder(os);
-	gboolean root;
-
-	root = g_str_equal(root_folder, ftp->folder);
-
-	if (!root || !obex_get_symlinks(os)) {
-		struct stat dstat;
-		gint err;
-
-		if (lstat(file, &dstat) < 0) {
-			err = -errno;
-			debug("lstat: %s(%d)", strerror(errno), errno);
-			return err;
-		}
-
-		if (S_ISLNK(dstat.st_mode))
-			return -EPERM;
-	}
-
-	return obex_stream_start(os, file, NULL);
-}
-
-static gpointer ftp_connect(struct obex_session *os, int *err)
+	const char *name = obex_get_name(os);
+	char *path;
+	int err;
+
+	if (type == NULL && name == NULL)
+		return -EBADR;
+
+	if (g_strcmp0(type, CAP_TYPE) == 0)
+		return obex_get_stream_start(os, capability);
+
+	if (g_strcmp0(type, LST_TYPE) == 0)
+		return obex_get_stream_start(os, ftp->folder);
+
+	path = g_build_filename(ftp->folder, name, NULL);
+	err = obex_get_stream_start(os, path);
+
+	g_free(path);
+
+	return err;
+}
+
+static void *ftp_connect(struct obex_session *os, int *err)
 {
 	struct ftp_session *ftp;
 	const char *root_folder;
@@ -218,43 +202,28 @@
 }
 
 static int ftp_get(struct obex_session *os, obex_object_t *obj,
-		gpointer user_data)
+					gboolean *stream, void *user_data)
 {
 	struct ftp_session *ftp = user_data;
 	const char *type = obex_get_type(os);
-	const char *name = obex_get_name(os);
-	gint err;
-	gchar *path;
-
-	if (ftp->folder == NULL) {
-		err = -ENOENT;
-		goto fail;
-	}
-
-	err = get_by_type(ftp, type);
-	if (err < 0) {
-		if (!name)
-			goto fail;
-
-		path = g_build_filename(ftp->folder, name, NULL);
-
-		err = ftp_prepare_get(ftp, path);
-
-		g_free(path);
-
-		if (err < 0)
-			goto fail;
-	}
+	int ret;
+
+	if (ftp->folder == NULL)
+		return -ENOENT;
+
+	ret = get_by_type(ftp, type);
+	if (ret < 0)
+		return ret;
+
+	if (stream)
+		*stream = TRUE;
 
 	return 0;
-
-fail:
-	return err;
 }
 
-static gint ftp_delete(struct ftp_session *ftp, const char *name)
+static int ftp_delete(struct ftp_session *ftp, const char *name)
 {
-	gchar *path;
+	char *path;
 	int ret = 0;
 
 	if (!(ftp->folder && name))
@@ -270,26 +239,29 @@
 	return ret;
 }
 
-static gint ftp_chkput(struct obex_session *os, gpointer user_data)
+static int ftp_chkput(struct obex_session *os, void *user_data)
 {
 	struct ftp_session *ftp = user_data;
-	const gchar *name = obex_get_name(os);
-	gchar *path;
+	const char *name = obex_get_name(os);
+	char *path;
 	int ret;
 
+	if (name == NULL)
+		return -EBADR;
+
 	if (obex_get_size(os) == OBJECT_SIZE_DELETE)
 		return 0;
 
 	path = g_build_filename(ftp->folder, name, NULL);
 
-	ret = obex_prepare_put(os, path);
+	ret = obex_put_stream_start(os, path);
 
 	g_free(path);
 
 	return ret;
 }
 
-static int ftp_put(struct obex_session *os, gpointer user_data)
+static int ftp_put(struct obex_session *os, void *user_data)
 {
 	struct ftp_session *ftp = user_data;
 	const char *name = obex_get_name(os);
@@ -308,12 +280,12 @@
 }
 
 static int ftp_setpath(struct obex_session *os, obex_object_t *obj,
-		gpointer user_data)
+							void *user_data)
 {
 	struct ftp_session *ftp = user_data;
-	const gchar *root_folder, *name;
-	guint8 *nonhdr;
-	gchar *fullname;
+	const char *root_folder, *name;
+	uint8_t *nonhdr;
+	char *fullname;
 	struct stat dstat;
 	gboolean root;
 	int err;
@@ -370,11 +342,13 @@
 		err = lstat(fullname, &dstat);
 
 	if (err < 0) {
-		int err = errno;
+		err = -errno;
+
+		if (err == -ENOENT)
+			goto not_found;
+
 		debug("%s: %s(%d)", root ? "stat" : "lstat",
-				strerror(err), err);
-		if (err == ENOENT)
-			goto not_found;
+				strerror(-err), -err);
 
 		goto done;
 	}
@@ -395,10 +369,12 @@
 	}
 
 	if (mkdir(fullname, 0755) <  0) {
-		err = -EPERM;
+		err = -errno;
+		debug("mkdir: %s(%d)", strerror(-err), -err);
 		goto done;
 	}
 
+	err = 0;
 	set_folder(ftp, fullname);
 
 done:
@@ -406,7 +382,7 @@
 	return err;
 }
 
-static void ftp_disconnect(struct obex_session *os, gpointer user_data)
+static void ftp_disconnect(struct obex_session *os, void *user_data)
 {
 	struct ftp_session *ftp = user_data;
 
@@ -416,7 +392,7 @@
 	g_free(ftp);
 }
 
-struct obex_service_driver pcsuite = {
+static struct obex_service_driver pcsuite = {
 	.name = "Nokia OBEX PC Suite Services",
 	.service = OBEX_PCSUITE,
 	.channel = PCSUITE_CHANNEL,
@@ -433,7 +409,7 @@
 	.disconnect = ftp_disconnect
 };
 
-struct obex_service_driver ftp = {
+static struct obex_service_driver ftp = {
 	.name = "File Transfer server",
 	.service = OBEX_FTP,
 	.channel = FTP_CHANNEL,
 
=== added file 'plugins/nokia-backup.c'
--- plugins/nokia-backup.c	1970-01-01 00:00:00 +0000
+++ plugins/nokia-backup.c	2010-06-15 19:18:33 +0000
@@ -0,0 +1,295 @@
+/*
+ *
+ *  OBEX Server
+ *
+ *  Copyright (C) 2010  Nokia Corporation
+ *  Copyright (C) 2010  Marcel Holtmann <[e-mail]>
+ *
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+#include <fcntl.h>
+#include <wait.h>
+
+#include <glib.h>
+#include "gdbus.h"
+
+
+#include <openobex/obex.h>
+#include <openobex/obex_const.h>
+
+#include "plugin.h"
+#include "logging.h"
+#include "obex.h"
+#include "mimetype.h"
+#include "service.h"
+
+#define BACKUP_BUS_NAME		"com.nokia.backup.plugin"
+#define BACKUP_PATH		"/com/nokia/backup"
+#define BACKUP_PLUGIN_INTERFACE	"com.nokia.backup.plugin"
+#define BACKUP_DBUS_TIMEOUT	(1000 * 60 * 15)
+
+static const uint8_t FTP_TARGET[TARGET_SIZE] = {
+	0xF9, 0xEC, 0x7B, 0xC4,  0x95, 0x3C, 0x11, 0xD2,
+	0x98, 0x4E, 0x52, 0x54,  0x00, 0xDC, 0x9E, 0x09  };
+
+struct backup_object{
+	gchar *cmd;
+	int fd;
+	int oflag;
+	int error_code;
+	mode_t mode;
+	DBusPendingCall *pending_call;
+	DBusConnection *conn;
+};
+
+static void on_backup_dbus_notify(DBusPendingCall *pending_call,
+					void *user_data)
+{
+	struct backup_object *obj = user_data;
+	DBusMessage *reply;
+	const char *filename;
+	int error_code;
+
+	debug("backup: Notification received for pending call - %s", obj->cmd);
+
+	reply = dbus_pending_call_steal_reply(pending_call);
+
+	if (reply && dbus_message_get_args(reply, NULL, DBUS_TYPE_INT32,
+					&error_code, DBUS_TYPE_STRING,
+					&filename, DBUS_TYPE_INVALID)) {
+
+		obj->error_code = error_code;
+
+		if (filename) {
+			debug("backup: Notification - file path = %s,"
+					"error_code = %d", filename,
+					error_code);
+			if (error_code == 0)
+				obj->fd = open(filename,obj->oflag,obj->mode);
+		}
+
+	} else
+		debug("backup: Notification timed out or connection got closed");
+
+	if (reply)
+		dbus_message_unref(reply);
+
+	dbus_pending_call_unref(pending_call);
+	obj->pending_call = NULL;
+	dbus_connection_unref(obj->conn);
+	obj->conn = NULL;
+
+	if (obj->fd >= 0) {
+		debug("backup: File opened, setting io flags, cmd = %s",
+				obj->cmd);
+		if (obj->oflag == O_RDONLY)
+			obex_object_set_io_flags(user_data, G_IO_IN, 0);
+		else
+			obex_object_set_io_flags(user_data, G_IO_OUT, 0);
+	} else {
+		debug("backup: File open error, setting io error, cmd = %s",
+				obj->cmd);
+		obex_object_set_io_flags(user_data, G_IO_ERR, -EPERM);
+	}
+}
+
+static gboolean send_backup_dbus_message(const char *oper,
+					struct backup_object *obj,
+					size_t *size)
+{
+	DBusConnection *conn;
+	DBusMessage *msg;
+	DBusPendingCall *pending_call;
+	gboolean ret = FALSE;
+	dbus_uint32_t file_size;
+
+	file_size = size ? *size : 0;
+
+	conn = g_dbus_setup_bus(DBUS_BUS_SESSION, NULL, NULL);
+
+	if (conn == NULL)
+		return FALSE;
+
+	msg = dbus_message_new_method_call(BACKUP_BUS_NAME, BACKUP_PATH,
+						BACKUP_PLUGIN_INTERFACE,
+						"request");
+	if (msg == NULL) {
+		dbus_connection_unref(conn);
+		return FALSE;
+	}
+
+	dbus_message_append_args(msg, DBUS_TYPE_STRING, &oper,
+					DBUS_TYPE_STRING, &obj->cmd,
+					DBUS_TYPE_INT32, &file_size,
+					DBUS_TYPE_INVALID);
+
+	ret = dbus_connection_send_with_reply(conn, msg, &pending_call,
+						BACKUP_DBUS_TIMEOUT);
+
+	dbus_message_unref(msg);
+
+	if (ret && (strcmp(oper, "open") == 0)) {
+		obj->conn = conn;
+		obj->pending_call = pending_call;
+		ret = dbus_pending_call_set_notify(pending_call,
+							on_backup_dbus_notify,
+							obj, NULL);
+	} else {
+		dbus_pending_call_unref(pending_call);
+		dbus_connection_unref(conn);
+	}
+
+	return ret;
+}
+
+static void *backup_open(const char *name, int oflag, mode_t mode,
+				void *context, size_t *size, int *err)
+{
+	struct backup_object *obj = g_new0(struct backup_object, 1);
+
+	debug("backup: open(), cmd = %s", name);
+
+	obj->cmd = g_path_get_basename(name);
+	obj->oflag = oflag;
+	obj->mode = mode;
+	obj->fd = -1;
+	obj->pending_call = NULL;
+	obj->conn = NULL;
+	obj->error_code = 0;
+
+	if (send_backup_dbus_message("open", obj, size) == FALSE) {
+		g_free(obj);
+		obj = NULL;
+	}
+
+	if (err)
+		*err = 0;
+
+	return obj;
+}
+
+static int backup_close(void *object)
+{
+	struct backup_object *obj = object;
+	size_t size = 0;
+
+	debug("backup: close(), cmd = %s", obj->cmd);
+
+	if (obj->fd != -1)
+		close(obj->fd);
+
+	if (obj->pending_call) {
+		dbus_pending_call_cancel(obj->pending_call);
+		dbus_pending_call_unref(obj->pending_call);
+		dbus_connection_unref(obj->conn);
+	}
+
+	send_backup_dbus_message("close", obj, &size);
+
+	g_free(obj->cmd);
+	g_free(obj);
+
+	return 0;
+}
+
+static ssize_t backup_read(void *object, void *buf, size_t count, uint8_t *hi)
+{
+	struct backup_object *obj = object;
+	ssize_t ret = 0;
+
+	*hi = OBEX_HDR_BODY;
+
+	if (obj->pending_call) {
+		debug("backup: read(), cmd = %s, IN WAITING STAGE", obj->cmd);
+		return -EAGAIN;
+	}
+
+	if (obj->fd != -1) {
+		debug("backup: read(), cmd = %s, READING DATA", obj->cmd);
+		ret = read(obj->fd, buf, count);
+		if (ret < 0)
+			ret = -errno;
+	} else {
+		debug("backup: read(), cmd = %s, PERMANENT FAILURE", obj->cmd);
+		ret = obj->error_code?(-obj->error_code):(-ENOENT);
+	}
+
+	return ret;
+}
+
+static ssize_t backup_write(void *object, const void *buf, size_t count)
+{
+	struct backup_object *obj = object;
+	ssize_t ret = 0;
+
+	if (obj->pending_call) {
+		debug("backup: write(), cmd = %s, IN WAITING STAGE", obj->cmd);
+		return -EAGAIN;
+	}
+
+	if (obj->fd != -1) {
+		ret = write(obj->fd, buf, count);
+
+		debug("backup: write(), cmd = %s, WRITTING", obj->cmd);
+
+		if (ret < 0) {
+			debug("backup: write() error, cmd = %s", obj->cmd);
+			ret = -errno;
+		}
+	} else {
+		debug("backup: write() error, cmd = %s", obj->cmd);
+		ret = obj->error_code ? -obj->error_code : -ENOENT;
+	}
+
+	return ret;
+}
+
+static struct obex_mime_type_driver backup = {
+	.target = FTP_TARGET,
+	.mimetype = "application/vnd.nokia-backup",
+	.open = backup_open,
+	.close = backup_close,
+	.read = backup_read,
+	.write = backup_write,
+};
+
+static int backup_init(void)
+{
+	return obex_mime_type_driver_register(&backup);
+}
+
+static void backup_exit(void)
+{
+	obex_mime_type_driver_unregister(&backup);
+}
+
+OBEX_PLUGIN_DEFINE(backup, backup_init, backup_exit)
 
=== modified file 'plugins/opp.c'
--- plugins/opp.c	2010-04-27 04:17:15 +0000
+++ plugins/opp.c	2010-06-15 19:18:33 +0000
@@ -27,6 +27,7 @@
 #endif
 
 #include <errno.h>
+#include <string.h>
 
 #include <openobex/obex.h>
 #include <openobex/obex_const.h>
@@ -44,56 +45,56 @@
 
 #define OPP_CHANNEL	9
 #define OPP_RECORD "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>	\
-<record>									\
-  <attribute id=\"0x0001\">							\
-    <sequence>									\
-      <uuid value=\"0x1105\"/>							\
-    </sequence>									\
-  </attribute>									\
-										\
-  <attribute id=\"0x0004\">							\
-    <sequence>									\
-      <sequence>								\
-        <uuid value=\"0x0100\"/>						\
-      </sequence>								\
-      <sequence>								\
-        <uuid value=\"0x0003\"/>						\
-        <uint8 value=\"%u\" name=\"channel\"/>					\
-      </sequence>								\
-      <sequence>								\
-        <uuid value=\"0x0008\"/>						\
-      </sequence>								\
-    </sequence>									\
-  </attribute>									\
-										\
-  <attribute id=\"0x0009\">							\
-    <sequence>									\
-      <sequence>								\
-        <uuid value=\"0x1105\"/>						\
-        <uint16 value=\"0x0100\" name=\"version\"/>				\
-      </sequence>								\
-    </sequence>									\
-  </attribute>									\
-										\
-  <attribute id=\"0x0100\">							\
-    <text value=\"%s\" name=\"name\"/>						\
-  </attribute>									\
-										\
-  <attribute id=\"0x0303\">							\
-    <sequence>									\
-      <uint8 value=\"0x01\"/>							\
-      <uint8 value=\"0x01\"/>							\
-      <uint8 value=\"0x02\"/>							\
-      <uint8 value=\"0x03\"/>							\
-      <uint8 value=\"0x04\"/>							\
-      <uint8 value=\"0x05\"/>							\
-      <uint8 value=\"0x06\"/>							\
-      <uint8 value=\"0xff\"/>							\
-    </sequence>									\
-  </attribute>									\
+<record>							\
+  <attribute id=\"0x0001\">					\
+    <sequence>							\
+      <uuid value=\"0x1105\"/>					\
+    </sequence>							\
+  </attribute>							\
+								\
+  <attribute id=\"0x0004\">					\
+    <sequence>							\
+      <sequence>						\
+        <uuid value=\"0x0100\"/>				\
+      </sequence>						\
+      <sequence>						\
+        <uuid value=\"0x0003\"/>				\
+        <uint8 value=\"%u\" name=\"channel\"/>			\
+      </sequence>						\
+      <sequence>						\
+        <uuid value=\"0x0008\"/>				\
+      </sequence>						\
+    </sequence>							\
+  </attribute>							\
+								\
+  <attribute id=\"0x0009\">					\
+    <sequence>							\
+      <sequence>						\
+        <uuid value=\"0x1105\"/>				\
+        <uint16 value=\"0x0100\" name=\"version\"/>		\
+      </sequence>						\
+    </sequence>							\
+  </attribute>							\
+								\
+  <attribute id=\"0x0100\">					\
+    <text value=\"%s\" name=\"name\"/>				\
+  </attribute>							\
+								\
+  <attribute id=\"0x0303\">					\
+    <sequence>							\
+      <uint8 value=\"0x01\"/>					\
+      <uint8 value=\"0x01\"/>					\
+      <uint8 value=\"0x02\"/>					\
+      <uint8 value=\"0x03\"/>					\
+      <uint8 value=\"0x04\"/>					\
+      <uint8 value=\"0x05\"/>					\
+      <uint8 value=\"0x06\"/>					\
+      <uint8 value=\"0xff\"/>					\
+    </sequence>							\
+  </attribute>							\
 </record>"
 
-static gpointer opp_connect(struct obex_session *os, int *err)
+static void *opp_connect(struct obex_session *os, int *err)
 {
 	manager_register_transfer(os);
 
@@ -103,17 +104,17 @@
 	return NULL;
 }
 
-static void opp_progress(struct obex_session *os, gpointer user_data)
+static void opp_progress(struct obex_session *os, void *user_data)
 {
 	manager_emit_transfer_progress(os);
 }
 
-static gint opp_chkput(struct obex_session *os, gpointer user_data)
+static int opp_chkput(struct obex_session *os, void *user_data)
 {
-	gchar *folder, *name;
-	gchar *path;
-	gint32 time;
-	gint ret;
+	char *folder, *name;
+	char *path;
+	int32_t time;
+	int ret;
 
 	if (obex_get_size(os) == OBJECT_SIZE_DELETE)
 		return -EINVAL;
@@ -136,11 +137,17 @@
 		name = g_strdup(obex_get_name(os));
 
 skip_auth:
+	if (name == NULL || strlen(name) == 0)
+		return -EBADR;
+
+	if (g_strcmp0(name, obex_get_name(os)) != 0)
+		obex_set_name(os, name);
+
 	path = g_build_filename(folder, name, NULL);
 
 	manager_emit_transfer_started(os);
 
-	ret = obex_prepare_put(os, path);
+	ret = obex_put_stream_start(os, path);
 
 	g_free(path);
 	g_free(folder);
@@ -149,7 +156,7 @@
 	return ret;
 }
 
-static int opp_put(struct obex_session *os, gpointer user_data)
+static int opp_put(struct obex_session *os, void *user_data)
 {
 	const char *name = obex_get_name(os);
 	const char *folder = obex_get_root_folder(os);
@@ -164,7 +171,7 @@
 }
 
 static int opp_get(struct obex_session *os, obex_object_t *obj,
-		gpointer user_data)
+			gboolean *stream, void *user_data)
 {
 	const char *type;
 
@@ -177,26 +184,29 @@
 		return -EPERM;
 
 	if (g_str_equal(type, VCARD_TYPE)) {
-		if (obex_stream_start(os, VCARD_FILE, NULL) < 0)
+		if (obex_get_stream_start(os, VCARD_FILE) < 0)
 			return -ENOENT;
 
 	} else
 		return -EPERM;
 
+	if (stream)
+		*stream = TRUE;
+
 	return 0;
 }
 
-static void opp_disconnect(struct obex_session *os, gpointer user_data)
+static void opp_disconnect(struct obex_session *os, void *user_data)
 {
 	manager_unregister_transfer(os);
 }
 
-static void opp_reset(struct obex_session *os, gpointer user_data)
+static void opp_reset(struct obex_session *os, void *user_data)
 {
 	manager_emit_transfer_completed(os);
 }
 
-struct obex_service_driver driver = {
+static struct obex_service_driver driver = {
 	.name = "Object Push server",
 	.service = OBEX_OPP,
 	.channel = OPP_CHANNEL,
 
=== modified file 'plugins/pbap.c'
--- plugins/pbap.c	2010-04-27 04:17:15 +0000
+++ plugins/pbap.c	2010-06-15 19:18:33 +0000
@@ -26,11 +26,13 @@
 #include <config.h>
 #endif
 
+#include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -71,87 +73,382 @@
 #define PHONEBOOKSIZE_LEN	2
 #define NEWMISSEDCALLS_LEN	1
 
-#define MCH		"telecom/mch.vcf"
-#define SIM1_MCH	"SIM1/telecom/mch.vcf"
-
-#define DEFAULT_COUNT 65535
-
-#define APPARAM_HDR_SIZE 2
-
 #define PBAP_CHANNEL	15
 
 #define PBAP_RECORD "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>	\
-<record>									\
-  <attribute id=\"0x0001\">							\
-    <sequence>									\
-      <uuid value=\"0x112f\"/>							\
-    </sequence>									\
-  </attribute>									\
-										\
-  <attribute id=\"0x0004\">							\
-    <sequence>									\
-      <sequence>								\
-        <uuid value=\"0x0100\"/>						\
-      </sequence>								\
-      <sequence>								\
-        <uuid value=\"0x0003\"/>						\
-        <uint8 value=\"%u\" name=\"channel\"/>					\
-      </sequence>								\
-      <sequence>								\
-        <uuid value=\"0x0008\"/>						\
-      </sequence>								\
-    </sequence>									\
-  </attribute>									\
-										\
-  <attribute id=\"0x0009\">							\
-    <sequence>									\
-      <sequence>								\
-        <uuid value=\"0x1130\"/>						\
-        <uint16 value=\"0x0100\" name=\"version\"/>				\
-      </sequence>								\
-    </sequence>									\
-  </attribute>									\
-										\
-  <attribute id=\"0x0100\">							\
-    <text value=\"%s\" name=\"name\"/>						\
-  </attribute>									\
-										\
-  <attribute id=\"0x0314\">							\
-    <uint8 value=\"0x01\"/>							\
-  </attribute>									\
+<record>								\
+  <attribute id=\"0x0001\">						\
+    <sequence>								\
+      <uuid value=\"0x112f\"/>						\
+    </sequence>								\
+  </attribute>								\
+									\
+  <attribute id=\"0x0004\">						\
+    <sequence>								\
+      <sequence>							\
+        <uuid value=\"0x0100\"/>					\
+      </sequence>							\
+      <sequence>							\
+        <uuid value=\"0x0003\"/>					\
+        <uint8 value=\"%u\" name=\"channel\"/>				\
+      </sequence>							\
+      <sequence>							\
+        <uuid value=\"0x0008\"/>					\
+      </sequence>							\
+    </sequence>								\
+  </attribute>								\
+									\
+  <attribute id=\"0x0009\">						\
+    <sequence>								\
+      <sequence>							\
+        <uuid value=\"0x1130\"/>					\
+        <uint16 value=\"0x0100\" name=\"version\"/>			\
+      </sequence>							\
+    </sequence>								\
+  </attribute>								\
+									\
+  <attribute id=\"0x0100\">						\
+    <text value=\"%s\" name=\"name\"/>					\
+  </attribute>								\
+									\
+  <attribute id=\"0x0314\">						\
+    <uint8 value=\"0x01\"/>						\
+  </attribute>								\
 </record>"
 
 struct aparam_header {
-	uint8_t		tag;
-	uint8_t		len;
-	uint8_t		val[0];
+	uint8_t tag;
+	uint8_t len;
+	uint8_t val[0];
 } __attribute__ ((packed));
 
+struct cache {
+	gboolean valid;
+	uint32_t index;
+	char *folder;
+	GSList *entries;
+};
+
+struct cache_entry {
+	uint32_t handle;
+	char *id;
+	char *name;
+	char *sound;
+	char *tel;
+};
+
 struct pbap_session {
-	struct obex_session *os;
 	struct apparam_field *params;
-	gchar *folder;
+	char *folder;
+	uint32_t find_handle;
 	GString *buffer;
+	struct cache cache;
 };
 
-static const guint8 PBAP_TARGET[TARGET_SIZE] = {
+static const uint8_t PBAP_TARGET[TARGET_SIZE] = {
 			0x79, 0x61, 0x35, 0xF0,  0xF0, 0xC5, 0x11, 0xD8,
 			0x09, 0x66, 0x08, 0x00,  0x20, 0x0C, 0x9A, 0x66  };
 
-static void set_folder(struct pbap_session *pbap, const char *new_folder)
-{
-	g_free(pbap->folder);
-
-	pbap->folder = new_folder ? g_strdup(new_folder) : NULL;
-}
-
-static struct apparam_field *parse_aparam(const guint8 *buffer, guint32 hlen)
+typedef int (*cache_entry_find_f) (const struct cache_entry *entry,
+			const char *value);
+
+static void cache_entry_free(struct cache_entry *entry)
+{
+	g_free(entry->id);
+	g_free(entry->name);
+	g_free(entry->sound);
+	g_free(entry->tel);
+	g_free(entry);
+}
+
+static gboolean entry_name_find(const struct cache_entry *entry,
+		const char *value)
+{
+	char *name;
+	gboolean ret;
+
+	if (!entry->name)
+		return FALSE;
+
+	if (strlen(value) == 0)
+		return TRUE;
+
+	name = g_utf8_strdown(entry->name, -1);
+	ret = (g_strstr_len(name, -1, value) ? TRUE : FALSE);
+	g_free(name);
+
+	return ret;
+}
+
+static gboolean entry_sound_find(const struct cache_entry *entry,
+		const char *value)
+{
+	if (!entry->sound)
+		return FALSE;
+
+	return (g_strstr_len(entry->sound, -1, value) ? TRUE : FALSE);
+}
+
+static gboolean entry_tel_find(const struct cache_entry *entry,
+		const char *value)
+{
+	if (!entry->tel)
+		return FALSE;
+
+	return (g_strstr_len(entry->tel, -1, value) ? TRUE : FALSE);
+}
+
+static const char *cache_find(struct cache *cache, uint32_t handle)
+{
+	GSList *l;
+
+	for (l = cache->entries; l; l = l->next) {
+		struct cache_entry *entry = l->data;
+
+		if (entry->handle == handle)
+			return entry->id;
+	}
+
+	return NULL;
+}
+
+static void cache_clear(struct cache *cache)
+{
+	g_free(cache->folder);
+	g_slist_foreach(cache->entries, (GFunc) cache_entry_free, NULL);
+	g_slist_free(cache->entries);
+	cache->entries = NULL;
+}
+
+static void phonebook_size_result(const char *buffer, size_t bufsize,
+				int vcards, int missed, void *user_data)
+{
+	struct pbap_session *pbap = user_data;
+	char aparam[4];
+	struct aparam_header *hdr = (struct aparam_header *) aparam;
+	uint16_t phonebooksize;
+
+	DBG("vcards %d", vcards);
+
+	phonebooksize = htons(vcards);
+
+	hdr->tag = PHONEBOOKSIZE_TAG;
+	hdr->len = PHONEBOOKSIZE_LEN;
+	memcpy(hdr->val, &phonebooksize, sizeof(phonebooksize));
+
+	pbap->buffer = g_string_new_len(aparam, sizeof(aparam));
+
+	obex_object_set_io_flags(pbap, G_IO_IN, 0);
+}
+
+static void query_result(const char *buffer, size_t bufsize, int vcards,
+					int missed, void *user_data)
+{
+	struct pbap_session *pbap = user_data;
+
+	DBG("");
+
+	if (!pbap->buffer)
+		pbap->buffer = g_string_new_len(buffer, bufsize);
+	else
+		pbap->buffer = g_string_append_len(pbap->buffer, buffer,
+								bufsize);
+
+	obex_object_set_io_flags(pbap, G_IO_IN, 0);
+}
+
+static void cache_entry_notify(const char *id, uint32_t handle,
+					const char *name, const char *sound,
+					const char *tel, void *user_data)
+{
+	struct pbap_session *pbap = user_data;
+	struct cache_entry *entry = g_new0(struct cache_entry, 1);
+	struct cache *cache = &pbap->cache;
+
+	if (handle != PHONEBOOK_INVALID_HANDLE)
+		entry->handle = handle;
+	else
+		entry->handle = ++pbap->cache.index;
+
+	entry->id = g_strdup(id);
+	entry->name = g_strdup(name);
+	entry->sound = g_strdup(sound);
+	entry->tel = g_strdup(tel);
+
+	cache->entries = g_slist_append(cache->entries, entry);
+}
+
+static int alpha_sort(gconstpointer a, gconstpointer b)
+{
+	const struct cache_entry *e1 = a;
+	const struct cache_entry *e2 = b;
+
+	return g_strcmp0(e1->name, e2->name);
+}
+
+static int indexed_sort(gconstpointer a, gconstpointer b)
+{
+	const struct cache_entry *e1 = a;
+	const struct cache_entry *e2 = b;
+
+	return (e1->handle - e2->handle);
+}
+
+static int phonetical_sort(gconstpointer a, gconstpointer b)
+{
+	const struct cache_entry *e1 = a;
+	const struct cache_entry *e2 = b;
+
+	/* SOUND attribute is optional. Use Indexed sort if not present. */
+	if (!e1->sound || !e2->sound)
+		return indexed_sort(a, b);
+
+	return g_strcmp0(e1->sound, e2->sound);
+}
+
+static GSList *sort_entries(GSList *l, uint8_t order, uint8_t search_attrib,
+							const char *value)
+{
+	GSList *sorted = NULL;
+	cache_entry_find_f find;
+	GCompareFunc sort;
+	char *searchval;
+
+	/*
+	 * Default sorter is "Indexed". Some backends doesn't inform the index,
+	 * for this case a sequential internal index is assigned.
+	 * 0x00 = indexed
+	 * 0x01 = alphanumeric
+	 * 0x02 = phonetic
+	 */
+	switch (order) {
+	case 0x01:
+		sort = alpha_sort;
+		break;
+	case 0x02:
+		sort = phonetical_sort;
+		break;
+	default:
+		sort = indexed_sort;
+		break;
+	}
+
+	/*
+	 * This implementation checks if the given field CONTAINS the
+	 * search value(case insensitive). Name is the default field
+	 * when the attribute is not provided.
+	 */
+	switch (search_attrib) {
+		/* Number */
+		case 1:
+			find = entry_tel_find;
+			break;
+		/* Sound */
+		case 2:
+			find = entry_sound_find;
+			break;
+		default:
+			find = entry_name_find;
+			break;
+	}
+
+	searchval = value ? g_utf8_strdown(value, -1) : NULL;
+	for (; l; l = l->next) {
+		struct cache_entry *entry = l->data;
+
+		if (searchval && !find(entry, (const char *) searchval))
+			continue;
+
+		sorted = g_slist_insert_sorted(sorted, entry, sort);
+	}
+
+	g_free(searchval);
+
+	return sorted;
+}
+
+static void cache_ready_notify(void *user_data)
+{
+	struct pbap_session *pbap = user_data;
+	GSList *sorted;
+	GSList *l;
+	uint16_t max = pbap->params->maxlistcount;
+
+	DBG("");
+
+	if (max == 0) {
+		/* Ignore all other parameter and return PhoneBookSize */
+		char aparam[4];
+		struct aparam_header *hdr = (struct aparam_header *) aparam;
+		uint16_t size = htons(g_slist_length(pbap->cache.entries));
+
+		hdr->tag = PHONEBOOKSIZE_TAG;
+		hdr->len = PHONEBOOKSIZE_LEN;
+		memcpy(hdr->val, &size, sizeof(size));
+
+		pbap->buffer = g_string_new_len(aparam, sizeof(aparam));
+		goto done;
+	}
+	/*
+	 * Don't free the sorted list content: this list contains
+	 * only the reference for the "real" cache entry.
+	 */
+	sorted = sort_entries(pbap->cache.entries, pbap->params->order,
+			pbap->params->searchattrib,
+			(const char *) pbap->params->searchval);
+
+	/* Computing offset considering first entry of the phonebook */
+	l = g_slist_nth(sorted, pbap->params->liststartoffset);
+
+	pbap->buffer = g_string_new(VCARD_LISTING_BEGIN);
+	for (; l && max; l = l->next, max--) {
+		const struct cache_entry *entry = l->data;
+
+		g_string_append_printf(pbap->buffer, VCARD_LISTING_ELEMENT,
+						entry->handle, entry->name);
+	}
+
+	pbap->buffer = g_string_append(pbap->buffer, VCARD_LISTING_END);
+
+	g_slist_free(sorted);
+
+done:
+	if (!pbap->cache.valid) {
+		pbap->cache.valid = TRUE;
+		obex_object_set_io_flags(pbap, G_IO_IN, 0);
+	}
+}
+
+static void cache_entry_done(void *user_data)
+{
+	struct pbap_session *pbap = user_data;
+	const char *id;
+	int ret;
+
+	DBG("");
+
+	pbap->cache.valid = TRUE;
+
+	id = cache_find(&pbap->cache, pbap->find_handle);
+	if (id == NULL) {
+		debug("Entry %d not found on cache", pbap->find_handle);
+		obex_object_set_io_flags(pbap, G_IO_ERR, -ENOENT);
+		return;
+	}
+
+	ret = phonebook_get_entry(pbap->folder, id, pbap->params,
+						query_result, pbap);
+	if (ret < 0)
+		obex_object_set_io_flags(pbap, G_IO_ERR, ret);
+}
+
+static struct apparam_field *parse_aparam(const uint8_t *buffer, uint32_t hlen)
 {
 	struct apparam_field *param;
 	struct aparam_header *hdr;
-	guint32 len = 0;
-	guint16 val16;
-	guint64 val64;
+	uint64_t val64;
+	uint32_t len = 0;
+	uint16_t val16;
 
 	param = g_new0(struct apparam_field, 1);
 
@@ -173,6 +470,9 @@
 			param->searchattrib = hdr->val[0];
 			break;
 		case SEARCHVALUE_TAG:
+			if (hdr->len == 0)
+				goto failed;
+
 			param->searchval = g_try_malloc0(hdr->len + 1);
 			if (param->searchval)
 				memcpy(param->searchval, hdr->val, hdr->len);
@@ -212,6 +512,11 @@
 		len += hdr->len + sizeof(struct aparam_header);
 	}
 
+	DBG("o %x sa %x sv %s fil %" G_GINT64_MODIFIER "x for %x max %x off %x",
+			param->order, param->searchattrib, param->searchval,
+			param->filter, param->format, param->maxlistcount,
+			param->liststartoffset);
+
 	return param;
 
 failed:
@@ -220,7 +525,7 @@
 	return NULL;
 }
 
-static gpointer pbap_connect(struct obex_session *os, int *err)
+static void *pbap_connect(struct obex_session *os, int *err)
 {
 	struct pbap_session *pbap;
 
@@ -228,7 +533,7 @@
 
 	pbap = g_new0(struct pbap_session, 1);
 	pbap->folder = g_strdup("/");
-	pbap->os = os;
+	pbap->find_handle = PHONEBOOK_INVALID_HANDLE;
 
 	if (err)
 		*err = 0;
@@ -237,24 +542,42 @@
 }
 
 static int pbap_get(struct obex_session *os, obex_object_t *obj,
-		gpointer user_data)
+					gboolean *stream, void *user_data)
 {
 	struct pbap_session *pbap = user_data;
-	const gchar *type = obex_get_type(os);
-	const gchar *name = obex_get_name(os);
+	const char *type = obex_get_type(os);
+	const char *name = obex_get_name(os);
 	struct apparam_field *params;
-	const guint8 *buffer;
-	gchar *path;
+	const uint8_t *buffer;
+	char *path;
 	ssize_t rsize;
-	gint ret;
+	int ret;
+
+	DBG("name %s type %s pbap %p", name, type, pbap);
 
 	if (type == NULL)
 		return -EBADR;
 
-	if (strcmp(type, PHONEBOOK_TYPE) == 0)
+	rsize = obex_aparam_read(os, obj, &buffer);
+	if (rsize < 0)
+		return -EBADR;
+
+	params = parse_aparam(buffer, rsize);
+	if (params == NULL)
+		return -EBADR;
+
+	if (pbap->params) {
+		g_free(pbap->params->searchval);
+		g_free(pbap->params);
+	}
+
+	pbap->params = params;
+
+	if (strcmp(type, PHONEBOOK_TYPE) == 0) {
 		/* Always contains the absolute path */
 		path = g_strdup(name);
-	else if (strcmp(type, VCARDLISTING_TYPE) == 0)
+		*stream = (params->maxlistcount == 0 ? FALSE : TRUE);
+	} else if (strcmp(type, VCARDLISTING_TYPE) == 0) {
 		/* Always relative */
 		if (!name || strlen(name) == 0)
 			/* Current folder */
@@ -263,47 +586,30 @@
 			/* Current folder + relative path */
 			path = g_build_filename(pbap->folder, name, NULL);
 
-	else if (strcmp(type, VCARDENTRY_TYPE) == 0)
-		/* Always relative */
-		path = g_build_filename(pbap->folder, name, NULL);
-	else
+		*stream = (params->maxlistcount == 0 ? FALSE : TRUE);
+	} else if (strcmp(type, VCARDENTRY_TYPE) == 0) {
+		/* File name only */
+		path = g_strdup(name);
+		*stream = TRUE;
+	} else
 		return -EBADR;
 
-	rsize = obex_aparam_read(os, obj, &buffer);
-	if (rsize < 0) {
-		ret = -EBADR;
-		goto failed;
-	}
-
-	params = parse_aparam(buffer, rsize);
-	if (params == NULL) {
-		ret = -EBADR;
-		goto failed;
-	}
-
-	if (pbap->params) {
-		g_free(pbap->params->searchval);
-		g_free(pbap->params);
-	}
-
 	pbap->params = params;
-	ret = obex_stream_start(os, path, pbap);
+	ret = obex_get_stream_start(os, path);
 
-failed:
 	g_free(path);
 
 	return ret;
 }
 
-
 static int pbap_setpath(struct obex_session *os, obex_object_t *obj,
-		gpointer user_data)
+		void *user_data)
 {
 	struct pbap_session *pbap = user_data;
-	const gchar *name;
-	guint8 *nonhdr;
-	gchar *fullname;
-	int ret;
+	const char *name;
+	uint8_t *nonhdr;
+	char *fullname;
+	int err;
 
 	if (OBEX_ObjectGetNonHdrData(obj, &nonhdr) != 2) {
 		error("Set path failed: flag and constants not found!");
@@ -312,24 +618,27 @@
 
 	name = obex_get_name(os);
 
-	ret = phonebook_set_folder(pbap->folder, name, nonhdr[0]);
-	if (ret < 0)
-		return ret;
-
-	if (!pbap->folder)
-		fullname = g_strdup(name);
-	else
-		fullname = g_build_filename(pbap->folder, name, NULL);
-
-	set_folder(pbap, fullname);
-
-	g_free(fullname);
+	DBG("name %s folder %s nonhdr 0x%x%x", name, pbap->folder,
+							nonhdr[0], nonhdr[1]);
+
+	fullname = phonebook_set_folder(pbap->folder, name, nonhdr[0], &err);
+	if (err < 0)
+		return err;
+
+	g_free(pbap->folder);
+	pbap->folder = fullname;
+
+	/*
+	 * FIXME: Define a criteria to mark the cache as invalid
+	 */
+	pbap->cache.valid = FALSE;
+	pbap->cache.index = 0;
+	cache_clear(&pbap->cache);
 
 	return 0;
 }
 
-static void pbap_disconnect(struct obex_session *os,
-		gpointer user_data)
+static void pbap_disconnect(struct obex_session *os, void *user_data)
 {
 	struct pbap_session *pbap = user_data;
 
@@ -340,18 +649,18 @@
 		g_free(pbap->params);
 	}
 
+	cache_clear(&pbap->cache);
 	g_free(pbap->folder);
 	g_free(pbap);
 }
 
-static gint pbap_chkput(struct obex_session *os,
-		gpointer user_data)
+static int pbap_chkput(struct obex_session *os, void *user_data)
 {
 	/* Rejects all PUTs */
-	return -EINVAL;
+	return -EBADR;
 }
 
-struct obex_service_driver pbap = {
+static struct obex_service_driver pbap = {
 	.name = "Phonebook Access server",
 	.service = OBEX_PBAP,
 	.channel = PBAP_CHANNEL,
@@ -365,57 +674,189 @@
 	.chkput = pbap_chkput
 };
 
-static void query_result(const gchar *buffer, size_t bufsize,
-		gint vcards, gint missed, gpointer user_data)
-{
-	struct pbap_session *pbap = user_data;
-
-	if (!pbap->buffer)
-		pbap->buffer = g_string_new_len(buffer, bufsize);
-	else
-		pbap->buffer = g_string_append_len(pbap->buffer, buffer, bufsize);
-
-	obex_object_set_io_flags(pbap, G_IO_IN, 0);
-}
-
-static gpointer vobject_open(const char *name, int oflag, mode_t mode,
-		gpointer context, size_t *size, int *err)
-{
-	struct pbap_session *pbap = context;
-	int ret;
-
-	if (oflag != O_RDONLY) {
-		ret = -EPERM;
-		goto fail;
-	}
-
-	ret = phonebook_pull(name, pbap->params, query_result, pbap);
-	if (ret < 0)
-		goto fail;
-
-	if (size)
-		*size = OBJECT_SIZE_UNKNOWN;
-
-	return pbap;
-
-fail:
-	if (err)
-		*err = ret;
-
-	return NULL;
-}
-
-static ssize_t vobject_read(gpointer object, void *buf, size_t count)
-{
-	struct pbap_session *pbap = object;
-
-	if (pbap->buffer)
-		return string_read(pbap->buffer, buf, count);
-
-	return -EAGAIN;
-}
-
-static int vobject_close(gpointer object)
+static void *vobject_pull_open(const char *name, int oflag, mode_t mode,
+				void *context, size_t *size, int *err)
+{
+	struct pbap_session *pbap = context;
+	phonebook_cb cb;
+	int ret;
+
+	DBG("name %s context %p maxlistcount %d", name, context,
+						pbap->params->maxlistcount);
+
+	if (oflag != O_RDONLY) {
+		ret = -EPERM;
+		goto fail;
+	}
+
+	if (pbap->params->maxlistcount == 0)
+		cb = phonebook_size_result;
+	else
+		cb = query_result;
+
+	ret = phonebook_pull(name, pbap->params, cb, pbap);
+	if (ret < 0)
+		goto fail;
+
+	if (size)
+		*size = OBJECT_SIZE_UNKNOWN;
+
+	return pbap;
+
+fail:
+	if (err)
+		*err = ret;
+
+	return NULL;
+}
+
+static void *vobject_list_open(const char *name, int oflag, mode_t mode,
+				void *context, size_t *size, int *err)
+{
+	struct pbap_session *pbap = context;
+	int ret;
+
+	DBG("name %s context %p valid %d", name, context, pbap->cache.valid);
+
+	if (oflag != O_RDONLY) {
+		ret = -EPERM;
+		goto fail;
+	}
+
+	/* PullvCardListing always get the contacts from the cache */
+
+	if (pbap->cache.valid) {
+		cache_ready_notify(pbap);
+		goto done;
+	}
+
+	ret = phonebook_create_cache(name,
+		cache_entry_notify, cache_ready_notify, pbap);
+
+	if (ret < 0)
+		goto fail;
+
+done:
+	if (size)
+		*size = OBJECT_SIZE_UNKNOWN;
+
+	return pbap;
+
+fail:
+	if (err)
+		*err = ret;
+
+	return NULL;
+}
+
+static void *vobject_vcard_open(const char *name, int oflag, mode_t mode,
+					void *context, size_t *size, int *err)
+{
+	struct pbap_session *pbap = context;
+	const char *id;
+	uint32_t handle;
+	int ret;
+
+	DBG("name %s context %p valid %d", name, context, pbap->cache.valid);
+
+	if (oflag != O_RDONLY) {
+		ret = -EPERM;
+		goto fail;
+	}
+
+	if (sscanf(name, "%u.vcf", &handle) != 1) {
+		ret = -EBADR;
+		goto fail;
+	}
+
+	if (pbap->cache.valid == FALSE) {
+		pbap->find_handle = handle;
+		ret = phonebook_create_cache(pbap->folder, cache_entry_notify,
+						cache_entry_done, pbap);
+		goto done;
+	}
+
+	id = cache_find(&pbap->cache, handle);
+	if (!id) {
+		ret = -ENOENT;
+		goto fail;
+	}
+
+	ret = phonebook_get_entry(pbap->folder, id, pbap->params, query_result,
+									pbap);
+
+done:
+	if (ret < 0)
+		goto fail;
+
+	if (size)
+		*size = OBJECT_SIZE_UNKNOWN;
+
+	return pbap;
+
+fail:
+	if (err)
+		*err = ret;
+
+	return NULL;
+}
+
+static ssize_t vobject_pull_read(void *object, void *buf, size_t count,
+								uint8_t *hi)
+{
+	struct pbap_session *pbap = object;
+
+	DBG("buffer %p maxlistcount %d", pbap->buffer,
+						pbap->params->maxlistcount);
+
+	if (!pbap->buffer)
+		return -EAGAIN;
+
+	/* PhoneBookSize */
+	if (pbap->params->maxlistcount == 0)
+		*hi = OBEX_HDR_APPARAM;
+	else
+		/* Stream data */
+		*hi = OBEX_HDR_BODY;
+
+	return string_read(pbap->buffer, buf, count);
+}
+
+static ssize_t vobject_list_read(void *object, void *buf, size_t count,
+								uint8_t *hi)
+{
+	struct pbap_session *pbap = object;
+
+	DBG("valid %d maxlistcount %d", pbap->cache.valid,
+						pbap->params->maxlistcount);
+
+	/* Backend still busy reading contacts */
+	if (!pbap->cache.valid)
+		return -EAGAIN;
+
+	if (pbap->params->maxlistcount == 0)
+		*hi = OBEX_HDR_APPARAM;
+	else
+		*hi = OBEX_HDR_BODY;
+
+	return string_read(pbap->buffer, buf, count);
+}
+
+static ssize_t vobject_vcard_read(void *object, void *buf, size_t count,
+								uint8_t *hi)
+{
+	struct pbap_session *pbap = object;
+
+	DBG("buffer %p", pbap->buffer);
+
+	if (!pbap->buffer)
+		return -EAGAIN;
+
+	*hi = OBEX_HDR_BODY;
+	return string_read(pbap->buffer, buf, count);
+}
+
+static int vobject_close(void *object)
 {
 	struct pbap_session *pbap = object;
 
@@ -427,28 +868,28 @@
 	return 0;
 }
 
-struct obex_mime_type_driver mime_pull = {
-	.target		= PBAP_TARGET,
-	.mimetype	= "x-bt/phonebook",
-	.open		= vobject_open,
-	.close		= vobject_close,
-	.read		= vobject_read,
-};
-
-struct obex_mime_type_driver mime_list = {
-	.target		= PBAP_TARGET,
-	.mimetype	= "x-bt/vcard-listing",
-	.open		= vobject_open,
-	.close		= vobject_close,
-	.read		= vobject_read,
-};
-
-struct obex_mime_type_driver mime_vcard = {
-	.target		= PBAP_TARGET,
-	.mimetype	= "x-bt/vcard",
-	.open		= vobject_open,
-	.close		= vobject_close,
-	.read		= vobject_read,
+static struct obex_mime_type_driver mime_pull = {
+	.target = PBAP_TARGET,
+	.mimetype = "x-bt/phonebook",
+	.open = vobject_pull_open,
+	.close = vobject_close,
+	.read = vobject_pull_read,
+};
+
+static struct obex_mime_type_driver mime_list = {
+	.target = PBAP_TARGET,
+	.mimetype = "x-bt/vcard-listing",
+	.open = vobject_list_open,
+	.close = vobject_close,
+	.read = vobject_list_read,
+};
+
+static struct obex_mime_type_driver mime_vcard = {
+	.target = PBAP_TARGET,
+	.mimetype = "x-bt/vcard",
+	.open = vobject_vcard_open,
+	.close = vobject_close,
+	.read = vobject_vcard_read,
 };
 
 static int pbap_init(void)
 
=== modified file 'plugins/phonebook-dummy.c'
--- plugins/phonebook-dummy.c	2010-04-27 04:17:15 +0000
+++ plugins/phonebook-dummy.c	2010-06-15 19:18:33 +0000
@@ -26,61 +26,513 @@
 #include <config.h>
 #endif
 
+#include <dirent.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdint.h>
 #include <string.h>
 #include <glib.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <libical/ical.h>
+#include <libical/vobject.h>
+#include <libical/vcc.h>
 
 #include "logging.h"
 #include "phonebook.h"
 
-#define VCARD0				\
-        "BEGIN:VCARD\n"			\
-        "VERSION:3.0\n"			\
-        "N:Klaus;Santa\n"		\
-        "FN:\n"				\
-        "TEL:[phone]\n"		\
-        "END:VCARD\n"
+typedef void (*vcard_func_t) (const char *file, VObject *vo, void *user_data);
 
 struct dummy_data {
-	phonebook_cb	cb;
-	gpointer	user_data;
+	phonebook_cb cb;
+	void *user_data;
 	const struct apparam_field *apparams;
-};
+	char *folder;
+	int fd;
+};
+
+struct cache_query {
+	phonebook_entry_cb entry_cb;
+	phonebook_cache_ready_cb ready_cb;
+	void *user_data;
+	DIR *dp;
+};
+
+static char *root_folder = NULL;
+
+static void dummy_free(void *user_data)
+{
+	struct dummy_data *dummy = user_data;
+
+	if (dummy->fd >= 0)
+		close(dummy->fd);
+
+	g_free(dummy->folder);
+	g_free(dummy);
+}
+
+static void query_free(void *user_data)
+{
+	struct cache_query *query = user_data;
+
+	if (query->dp)
+		closedir(query->dp);
+
+	g_free(query);
+}
 
 int phonebook_init(void)
 {
+	/* FIXME: It should NOT be hard-coded */
+	root_folder = g_build_filename(getenv("HOME"), "phonebook", NULL);
+
 	return 0;
 }
 
 void phonebook_exit(void)
 {
-}
-
-static gboolean dummy_result(gpointer data)
-{
-	struct dummy_data *dummy = data;
-
-	dummy->cb(VCARD0, strlen(VCARD0), 1, 0, dummy->user_data);
-
-	return FALSE;
-}
-
-int phonebook_set_folder(const gchar *current_folder,
-		const gchar *new_folder, guint8 flags)
-{
-	return 0;
-}
-
-int phonebook_pull(const gchar *name, const struct apparam_field *params,
-		phonebook_cb cb, gpointer user_data)
-{
-	struct dummy_data *dummy;
-
-	dummy = g_new0(struct dummy_data, 1);
-	dummy->cb = cb;
-	dummy->user_data = user_data;
-	dummy->apparams = params;
-
-	g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
-			dummy_result, dummy, g_free);
+	g_free(root_folder);
+}
+
+static int handle_cmp(gconstpointer a, gconstpointer b)
+{
+	const char *f1 = a;
+	const char *f2 = b;
+	unsigned int i1, i2;
+
+	if (sscanf(f1, "%u.vcf", &i1) != 1)
+		return -1;
+
+	if (sscanf(f2, "%u.vcf", &i2) != 1)
+		return -1;
+
+	return (i1 - i2);
+}
+
+static int foreach_vcard(DIR *dp, vcard_func_t func, uint16_t offset,
+			uint16_t maxlistcount, void *user_data, uint16_t *count)
+{
+	struct dirent *ep;
+	GSList *sorted = NULL, *l;
+	VObject *v;
+	FILE *fp;
+	int err, fd, folderfd;
+	uint16_t n = 0;
+
+	folderfd = dirfd(dp);
+	if (folderfd < 0) {
+		err = errno;
+		error("dirfd(): %s(%d)", strerror(err), err);
+		return -err;
+	}
+
+	/*
+	 * Sorting vcards by file name. versionsort is a GNU extension.
+	 * The simple sorting function implemented on handle_cmp address
+	 * vcards handle only(handle is always a number). This sort function
+	 * doesn't address filename started by "0".
+	 */
+	while ((ep = readdir(dp))) {
+		char *filename;
+
+		if (ep->d_name[0] == '.')
+			continue;
+
+		filename = g_filename_to_utf8(ep->d_name, -1, NULL, NULL, NULL);
+		if (filename == NULL) {
+			error("g_filename_to_utf8: invalid filename");
+			continue;
+		}
+
+		if (!g_str_has_suffix(filename, ".vcf")) {
+			g_free(filename);
+			continue;
+		}
+
+		sorted = g_slist_insert_sorted(sorted, filename, handle_cmp);
+	}
+
+	/*
+	 * Filtering only the requested vCards attributes. Offset
+	 * shall be based on the first entry of the phonebook.
+	 */
+	for (l = g_slist_nth(sorted, offset);
+			l && n < maxlistcount; l = l->next) {
+		const char *filename = l->data;
+
+		fd = openat(folderfd, filename, O_RDONLY);
+		if (fd < 0) {
+			err = errno;
+			error("openat(%s): %s(%d)", filename, strerror(err), err);
+			continue;
+		}
+
+		fp = fdopen(fd, "r");
+		v = Parse_MIME_FromFile(fp);
+		if (v != NULL) {
+			func(filename, v, user_data);
+			deleteVObject(v);
+			n++;
+		}
+
+		close(fd);
+	}
+
+	g_slist_foreach(sorted, (GFunc) g_free, NULL);
+	g_slist_free(sorted);
+
+	if (count)
+		*count = n;
+
+	return 0;
+}
+
+static void entry_concat(const char *filename, VObject *v, void *user_data)
+{
+	GString *buffer = user_data;
+	char tmp[1024];
+	int len;
+
+	/*
+	 * VObject API uses len for IN and OUT
+	 * Written bytes is also returned in the len variable
+	 */
+	len = sizeof(tmp);
+	memset(tmp, 0, len);
+
+	writeMemVObject(tmp, &len, v);
+
+	/* FIXME: only the requested fields must be added */
+	g_string_append_len(buffer, tmp, len);
+}
+
+static gboolean read_dir(void *user_data)
+{
+	struct dummy_data *dummy = user_data;
+	GString *buffer;
+	DIR *dp;
+	uint16_t count, max, offset;
+
+	buffer = g_string_new("");
+
+	dp = opendir(dummy->folder);
+	if (dp == NULL) {
+		int err = errno;
+		debug("opendir(): %s(%d)", strerror(err), err);
+		goto done;
+	}
+
+	/*
+	 * For PullPhoneBook function, the decision of returning the size
+	 * or contacts is made in the PBAP core. When MaxListCount is ZERO,
+	 * PCE wants to know the size of a given folder, PSE shall ignore all
+	 * other applicattion parameters that may be present in the request.
+	 */
+	if (dummy->apparams->maxlistcount == 0) {
+		max = 0xffff;
+		offset = 0;
+	} else {
+		max = dummy->apparams->maxlistcount;
+		offset = dummy->apparams->liststartoffset;
+	}
+
+	foreach_vcard(dp, entry_concat, offset, max, buffer, &count);
+
+	closedir(dp);
+done:
+	/* FIXME: Missing vCards fields filtering */
+	dummy->cb(buffer->str, buffer->len, count, 0, dummy->user_data);
+
+	g_string_free(buffer, TRUE);
+
+	return FALSE;
+}
+
+static void entry_notify(const char *filename, VObject *v, void *user_data)
+{
+	struct cache_query *query = user_data;
+	VObject *property, *subproperty;
+	GString *name;
+	const char *tel;
+	long unsigned int handle;
+
+	property = isAPropertyOf(v, VCNameProp);
+	if (!property)
+		return;
+
+	if (sscanf(filename, "%lu.vcf", &handle) != 1)
+		return;
+
+	if (handle > UINT32_MAX)
+		return;
+
+	/* LastName; FirstName; MiddleName; Prefix; Suffix */
+
+	name = g_string_new("");
+	subproperty = isAPropertyOf(property, VCFamilyNameProp);
+	if (subproperty) {
+		g_string_append(name,
+				fakeCString(vObjectUStringZValue(subproperty)));
+	}
+
+	subproperty = isAPropertyOf(property, VCGivenNameProp);
+	if (subproperty)
+		g_string_append_printf(name, ";%s",
+				fakeCString(vObjectUStringZValue(subproperty)));
+
+	subproperty = isAPropertyOf(property, VCAdditionalNamesProp);
+	if (subproperty)
+		g_string_append_printf(name, ";%s",
+				fakeCString(vObjectUStringZValue(subproperty)));
+
+	subproperty = isAPropertyOf(property, VCNamePrefixesProp);
+	if (subproperty)
+		g_string_append_printf(name, ";%s",
+				fakeCString(vObjectUStringZValue(subproperty)));
+
+
+	subproperty = isAPropertyOf(property, VCNameSuffixesProp);
+	if (subproperty)
+		g_string_append_printf(name, ";%s",
+				fakeCString(vObjectUStringZValue(subproperty)));
+
+	property = isAPropertyOf(v, VCTelephoneProp);
+
+	tel = property ? fakeCString(vObjectUStringZValue(property)) : NULL;
+
+	query->entry_cb(filename, handle, name->str, NULL, tel,
+							query->user_data);
+	g_string_free(name, TRUE);
+}
+
+static gboolean create_cache(void *user_data)
+{
+	struct cache_query *query = user_data;
+
+	/*
+	 * MaxListCount and ListStartOffset shall not be used
+	 * when creating the cache. All entries shall be fetched.
+	 * PBAP core is responsible for consider these application
+	 * parameters before reply the entries.
+	 */
+	foreach_vcard(query->dp, entry_notify, 0, 0xffff, query, NULL);
+
+	query->ready_cb(query->user_data);
+
+	return FALSE;
+}
+
+static gboolean read_entry(void *user_data)
+{
+	struct dummy_data *dummy = user_data;
+	char buffer[1024];
+	ssize_t count;
+
+	memset(buffer, 0, sizeof(buffer));
+	count = read(dummy->fd, buffer, sizeof(buffer));
+
+	if (count < 0) {
+		int err = errno;
+		error("read(): %s(%d)", strerror(err), err);
+		count = 0;
+	}
+
+	/* FIXME: Missing vCards fields filtering */
+
+	dummy->cb(buffer, count, 1, 0, dummy->user_data);
+
+	return FALSE;
+}
+
+static gboolean is_dir(const char *dir)
+{
+	struct stat st;
+
+	if (stat(dir, &st) < 0) {
+		int err = errno;
+		error("stat(%s): %s (%d)", dir, strerror(err), err);
+		return FALSE;
+	}
+
+	return S_ISDIR(st.st_mode);
+}
+
+char *phonebook_set_folder(const char *current_folder,
+		const char *new_folder, uint8_t flags, int *err)
+{
+	gboolean root, child;
+	char *tmp1, *tmp2, *base, *absolute, *relative = NULL;
+	int len, ret = 0;
+
+	root = (g_strcmp0("/", current_folder) == 0);
+	child = (new_folder && strlen(new_folder) != 0);
+
+	switch (flags) {
+	case 0x02:
+		/* Go back to root */
+		if (!child) {
+			relative = g_strdup("/");
+			goto done;
+		}
+
+		relative = g_build_filename(current_folder, new_folder, NULL);
+		break;
+	case 0x03:
+		/* Go up 1 level */
+		if (root) {
+			/* Already root */
+			ret = -EBADR;
+			goto done;
+		}
+
+		/*
+		 * Removing one level of the current folder. Current folder
+		 * contains AT LEAST one level since it is not at root folder.
+		 * Use glib utility functions to handle invalid chars in the
+		 * folder path properly.
+		 */
+		tmp1 = g_path_get_basename(current_folder);
+		tmp2 = g_strrstr(current_folder, tmp1);
+		len = tmp2 - (current_folder + 1);
+
+		g_free(tmp1);
+
+		if (len == 0)
+			base = g_strdup("/");
+		else
+			base = g_strndup(current_folder, len);
+
+		/* Return: one level only */
+		if (!child) {
+			relative = base;
+			goto done;
+		}
+
+		relative = g_build_filename(base, new_folder, NULL);
+		g_free(base);
+
+		break;
+	default:
+		ret = -EBADR;
+		break;
+	}
+
+done:
+	if (!relative) {
+		if (err)
+			*err = ret;
+
+		return NULL;
+	}
+
+	absolute = g_build_filename(root_folder, relative, NULL);
+	if (!is_dir(absolute)) {
+		g_free(relative);
+		relative = NULL;
+		ret = -ENOENT;
+	}
+
+	g_free(absolute);
+
+	if (err)
+		*err = ret;
+
+	return relative;
+}
+
+int phonebook_pull(const char *name, const struct apparam_field *params,
+					phonebook_cb cb, void *user_data)
+{
+	struct dummy_data *dummy;
+	char *filename, *folder;
+
+	/*
+	 * Main phonebook objects will be created dinamically based on the
+	 * folder content. All vcards inside the given folder will be appended
+	 * in the "virtual" main phonebook object.
+	 */
+
+	filename = g_build_filename(root_folder, name, NULL);
+
+	if (!g_str_has_suffix(filename, ".vcf")) {
+		g_free(filename);
+		return -EBADR;
+	}
+
+	folder = g_strndup(filename, strlen(filename) - 4);
+	g_free(filename);
+	if (!is_dir(folder)) {
+		g_free(folder);
+		return -ENOENT;
+	}
+
+	dummy = g_new0(struct dummy_data, 1);
+	dummy->cb = cb;
+	dummy->user_data = user_data;
+	dummy->apparams = params;
+	dummy->folder = folder;
+	dummy->fd = -1;
+
+	g_idle_add_full(G_PRIORITY_DEFAULT_IDLE, read_dir, dummy, dummy_free);
+
+	return 0;
+}
+
+int phonebook_get_entry(const char *folder, const char *id,
+					const struct apparam_field *params,
+					phonebook_cb cb, void *user_data)
+{
+	struct dummy_data *dummy;
+	char *filename;
+	int fd;
+
+	filename = g_build_filename(root_folder, folder, id, NULL);
+
+	fd = open(filename, O_RDONLY);
+	if (fd < 0) {
+		int err = errno;
+		debug("open(): %s(%d)", strerror(err), err);
+		return -ENOENT;
+	}
+
+	dummy = g_new0(struct dummy_data, 1);
+	dummy->cb = cb;
+	dummy->user_data = user_data;
+	dummy->apparams = params;
+	dummy->fd = fd;
+
+	g_idle_add_full(G_PRIORITY_DEFAULT_IDLE, read_entry, dummy, dummy_free);
+
+	return 0;
+}
+
+int phonebook_create_cache(const char *name, phonebook_entry_cb entry_cb,
+		phonebook_cache_ready_cb ready_cb, void *user_data)
+{
+	struct cache_query *query;
+	char *foldername;
+	DIR *dp;
+
+	foldername = g_build_filename(root_folder, name, NULL);
+	dp = opendir(foldername);
+	g_free(foldername);
+
+	if (dp == NULL) {
+		int err = errno;
+		debug("opendir(): %s(%d)", strerror(err), err);
+		return -ENOENT;
+	}
+
+	query = g_new0(struct cache_query, 1);
+	query->entry_cb = entry_cb;
+	query->ready_cb = ready_cb;
+	query->user_data = user_data;
+	query->dp = dp;
+
+	g_idle_add_full(G_PRIORITY_DEFAULT_IDLE, create_cache, query,
+								query_free);
 	return 0;
 }
 
=== modified file 'plugins/phonebook-ebook.c'
--- plugins/phonebook-ebook.c	2010-04-27 04:17:15 +0000
+++ plugins/phonebook-ebook.c	2010-06-15 19:18:33 +0000
@@ -41,54 +41,250 @@
 #include "service.h"
 #include "phonebook.h"
 
-#define EOL_CHARS "\n"
-#define VL_VERSION "<?xml version=\"1.0\"?>" EOL_CHARS
-#define VL_TYPE "<!DOCTYPE vcard-listing SYSTEM \"vcard-listing.dtd\">" EOL_CHARS
-#define VL_BODY_BEGIN "<vCard-listing version=\"1.0\">" EOL_CHARS
-#define VL_BODY_END "</vCard-listing>" EOL_CHARS
-#define VL_ELEMENT "<card handle = \"%d.vcf\" name = \"%s\"/>" EOL_CHARS
-
-#define QUERY_FAMILY_NAME "(contains \"family_name\" \"%s\")"
-#define QUERY_GIVEN_NAME "(contains \"given_name\" \"%s\")"
+#define QUERY_FN "(contains \"family_name\" \"%s\")"
+#define QUERY_NAME "(contains \"given_name\" \"%s\")"
 #define QUERY_PHONE "(contains \"phone\" \"%s\")"
 
-struct query_data {
+struct contacts_query {
 	const struct apparam_field *params;
 	phonebook_cb cb;
-	gpointer user_data;
+	void *user_data;
+};
+
+struct cache_query {
+	phonebook_entry_cb entry_cb;
+	phonebook_cache_ready_cb ready_cb;
+	void *user_data;
 };
 
 static EBook *ebook = NULL;
 
-static void ebookpull_cb(EBook *book, EBookStatus status, GList *contacts,
-				gpointer user_data)
-{
-	struct query_data *data = user_data;
+static char *attribute_mask[] = {
+/* 0 */		"VERSION",
+		"FN",
+		"N",
+		"PHOTO",
+		"BDAY",
+		"ADR",
+		"LABEL",
+		"TEL",
+/* 8 */		"EMAIL",
+		"MAILER",
+		"TZ",
+		"GEO",
+		"TITLE",
+		"ROLE",
+		"LOGO",
+		"AGENT",
+/* 16 */	"ORG",
+		"NOTE",
+		"REV",
+		"SOUND",
+		"URL",
+		"UID",
+		"KEY",
+		"NICKNAME",
+/* 24 */	"CATEGORIES",
+		"PROID",
+		"CLASS",
+		"SORT-STRING",
+/* 28 */	"X-IRMC-CALL-DATETIME",
+		NULL
+
+};
+
+static char *evcard_to_string(EVCard *evcard, unsigned int format,
+							uint64_t filter)
+{
+	EVCard *evcard2;
+	char *vcard;
+	unsigned int i;
+
+	if (!filter)
+		return e_vcard_to_string(evcard, format);
+
+	/*
+	 * Mandatory attributes for vCard 2.1 are VERSION ,N and TEL.
+	 * Mandatory attributes for vCard 3.0 are VERSION, N, FN and TEL
+	 */
+	filter = format == EVC_FORMAT_VCARD_30 ? filter | 0x85: filter | 0x87;
+
+	evcard2 = e_vcard_new();
+	for (i = 0; i < 29; i++) {
+		EVCardAttribute *attrib;
+
+		if (!(filter & (1 << i)))
+			continue;
+
+		attrib = e_vcard_get_attribute(evcard, attribute_mask[i]);
+		if (!attrib)