Imported Upstream version 0.8upstream/0.8

77 files changed, 4133 insertions, 4697 deletions

diff --git a/Makefile.in b/Makefile.in
index 56aba1c..4ed7033 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,13 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = org.freedesktop.Gypsy.service Gypsy.conf gypsy.pc
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -63,15 +72,30 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(dbussysdir)" \
 	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(servicedir)"
-dbussysDATA_INSTALL = $(INSTALL_DATA)
-pkgconfigDATA_INSTALL = $(INSTALL_DATA)
-serviceDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dbussys_DATA) $(pkgconfig_DATA) $(service_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -79,15 +103,41 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
+  { test ! -d "$(distdir)" \
+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr "$(distdir)"; }; }
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -114,8 +164,12 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GPSBT_CFLAGS = @GPSBT_CFLAGS@
+GPSBT_LIBS = @GPSBT_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
 GYPSY_CFLAGS = @GYPSY_CFLAGS@
 GYPSY_LIBS = @GYPSY_LIBS@
 HTML_DIR = @HTML_DIR@
@@ -150,6 +204,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -238,15 +294,15 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -262,9 +318,10 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC
 	$(SHELL) ./config.status --recheck
 
 $(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
 
 config.h: stamp-h1
 	@if test ! -f $@; then \
@@ -276,7 +333,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
 $(srcdir)/config.h.in:  $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h1
 	touch $@
 
@@ -300,54 +357,63 @@ distclean-libtool:
 install-dbussysDATA: $(dbussys_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(dbussysdir)" || $(MKDIR_P) "$(DESTDIR)$(dbussysdir)"
-	@list='$(dbussys_DATA)'; for p in $$list; do \
+	@list='$(dbussys_DATA)'; test -n "$(dbussysdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dbussysDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dbussysdir)/$$f'"; \
-	  $(dbussysDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dbussysdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dbussysdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(dbussysdir)" || exit $$?; \
 	done
 
 uninstall-dbussysDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dbussys_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(dbussysdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(dbussysdir)/$$f"; \
-	done
+	@list='$(dbussys_DATA)'; test -n "$(dbussysdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(dbussysdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(dbussysdir)" && rm -f $$files
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
-	@list='$(pkgconfig_DATA)'; for p in $$list; do \
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
 	done
 
 uninstall-pkgconfigDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pkgconfig_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
-	done
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
 install-serviceDATA: $(service_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
-	@list='$(service_DATA)'; for p in $$list; do \
+	@list='$(service_DATA)'; test -n "$(servicedir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
-	  $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(servicedir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(servicedir)" || exit $$?; \
 	done
 
 uninstall-serviceDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(service_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(servicedir)/$$f"; \
-	done
+	@list='$(service_DATA)'; test -n "$(servicedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(servicedir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -356,7 +422,7 @@ uninstall-serviceDATA:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -373,7 +439,7 @@ $(RECURSIVE_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -381,7 +447,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -407,16 +473,16 @@ $(RECURSIVE_CLEAN_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -431,7 +497,7 @@ tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -443,7 +509,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
@@ -452,36 +518,41 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	test -d $(distdir) || mkdir $(distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -497,38 +568,55 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
+	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
@@ -541,6 +629,10 @@ dist-lzma: distdir
 	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
 	$(am__remove_distdir)
 
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -564,15 +656,17 @@ dist dist-all: distdir
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
@@ -580,9 +674,11 @@ distcheck: dist
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
@@ -604,13 +700,15 @@ distcheck: dist
 	  && rm -rf "$$dc_destdir" \
 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
 	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
+	@$(am__cd) '$(distuninstallcheck_dir)' \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
@@ -655,6 +753,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -676,6 +775,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -685,18 +786,28 @@ install-data-am: install-dbussysDATA install-pkgconfigDATA \
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -720,27 +831,29 @@ ps-am:
 uninstall-am: uninstall-dbussysDATA uninstall-pkgconfigDATA \
 	uninstall-serviceDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+	ctags-recursive install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
-	distclean distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dbussysDATA install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkgconfigDATA install-ps \
-	install-ps-am install-serviceDATA install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
+	dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+	distcheck distclean distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dbussysDATA install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkgconfigDATA install-ps install-ps-am \
+	install-serviceDATA install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am uninstall-dbussysDATA \
 	uninstall-pkgconfigDATA uninstall-serviceDATA
 
+
 # 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.
 .NOEXPORT:
diff --git a/aclocal.m4 b/aclocal.m4
index 858496f..ac0bc35 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009  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.
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-[m4_warning([this file was generated for autoconf 2.64.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -29,6 +29,12 @@ AC_DEFUN([GTK_DOC_CHECK],
 [
   AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
   AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+
+  dnl check for tools we added during development
+  AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
+  AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
+  AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
+
   dnl for overriding the documentation installation directory
   AC_ARG_WITH([html-dir],
     AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
@@ -47,16 +53,32 @@ AC_DEFUN([GTK_DOC_CHECK],
       [PKG_CHECK_EXISTS([gtk-doc],,
                         AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
       [PKG_CHECK_EXISTS([gtk-doc >= $1],,
-                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))])
+                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
   fi
 
   AC_MSG_CHECKING([whether to build gtk-doc documentation])
   AC_MSG_RESULT($enable_gtk_doc)
 
-  AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
+  dnl enable/disable output formats
+  AC_ARG_ENABLE([gtk-doc-html],
+    AS_HELP_STRING([--enable-gtk-doc-html],
+                   [build documentation in html format [[default=yes]]]),,
+    [enable_gtk_doc_html=yes])
+    AC_ARG_ENABLE([gtk-doc-pdf],
+      AS_HELP_STRING([--enable-gtk-doc-pdf],
+                     [build documentation in pdf format [[default=no]]]),,
+      [enable_gtk_doc_pdf=no])
+
+  if test -z "$GTKDOC_MKPDF"; then
+    enable_gtk_doc_pdf=no
+  fi
+
 
   AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
+  AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
+  AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
   AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+  AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
 ])
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -2500,7 +2522,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -3139,7 +3161,7 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -3760,7 +3782,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -4044,7 +4066,7 @@ m4_if([$1], [CXX], [
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -4340,6 +4362,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
     fi
     supports_anon_versioning=no
     case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -4431,7 +4454,7 @@ _LT_EOF
       _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    gnu* | linux* | tpf* | k*bsd*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test "$host_os" = linux-dietlibc; then
 	case $cc_basename in
@@ -5911,7 +5934,7 @@ if test "$_lt_caught_CXX_error" != yes; then
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -7918,15 +7941,15 @@ m4_define([lt_dict_filter],
 
 # Generated from ltversion.in.
 
-# serial 3012 ltversion.m4
+# serial 3017 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
-m4_define([LT_PACKAGE_REVISION], [1.3012])
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+m4_define([LT_PACKAGE_REVISION], [1.3017])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6'
-macro_revision='1.3012'
+[macro_version='2.2.6b'
+macro_revision='1.3017'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
@@ -8025,6 +8048,7 @@ m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
 m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
 
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
 # 
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 #
@@ -8052,7 +8076,10 @@ m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
 fi
@@ -8065,7 +8092,6 @@ if test -n "$PKG_CONFIG"; then
 		AC_MSG_RESULT([no])
 		PKG_CONFIG=""
 	fi
-		
 fi[]dnl
 ])# PKG_PROG_PKG_CONFIG
 
@@ -8074,34 +8100,31 @@ fi[]dnl
 # Check to see whether a particular set of modules exists.  Similar
 # to PKG_CHECK_MODULES(), but does not set variables or print errors.
 #
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
 # --------------------------------------------------------------
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
     AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
+  m4_default([$2], [:])
 m4_ifvaln([$3], [else
   $3])dnl
 fi])
 
-
 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
 # ---------------------------------------------
 m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_[]$1="$$1"
-    else
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-    fi
-else
-	pkg_failed=untried
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
 fi[]dnl
 ])# _PKG_CONFIG
 
@@ -8143,16 +8166,17 @@ and $1[]_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.])
 
 if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
-	ifelse([$4], , [AC_MSG_ERROR(dnl
+	m4_default([$4], [AC_MSG_ERROR(
 [Package requirements ($2) were not met:
 
 $$1_PKG_ERRORS
@@ -8160,25 +8184,24 @@ $$1_PKG_ERRORS
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-_PKG_TEXT
-])],
-		[AC_MSG_RESULT([no])
-                $4])
+_PKG_TEXT])dnl
+        ])
 elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
 _PKG_TEXT
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-		[$4])
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
+        ])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
 	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
         AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
+	$3
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
@@ -8194,10 +8217,10 @@ fi[]dnl
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
+[am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10.2], [],
+m4_if([$1], [1.11.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -8213,7 +8236,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.2])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -8273,14 +8296,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 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 8
+# serial 9
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -8293,6 +8316,7 @@ AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
 _AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -8306,14 +8330,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
 # 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 9
+# serial 10
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -8370,6 +8394,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
   fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
   for depmode in $am_compiler_list; do
     # Setup a source with many dependencies, because some compilers
     # like to wrap large dependency lists on column 80 (with \), and
@@ -8387,7 +8421,17 @@ AC_CACHE_CHECK([dependency style of $depcc],
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
     case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
     nosideeffect)
       # after this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested
@@ -8397,19 +8441,23 @@ AC_CACHE_CHECK([dependency style of $depcc],
 	break
       fi
       ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
     none) break ;;
     esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
          >/dev/null 2>conftest.err &&
        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
       # or remarks (even with -Werror).  So we grep stderr for any message
@@ -8473,59 +8521,61 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 4
+#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[# Autoconf 2.62 quotes --file arguments for eval, but not when files
-# are listed without --file.  Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*)   set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
+[{
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
   done
-done
+}
 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
 
@@ -8557,13 +8607,13 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
+# 2005, 2006, 2008, 2009 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 13
+# serial 16
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -8580,7 +8630,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.60])dnl
+[AC_PREREQ([2.62])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -8631,8 +8681,8 @@ AM_MISSING_PROG(AUTOCONF, autoconf)
 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
 AM_MISSING_PROG(AUTOHEADER, autoheader)
 AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -8640,24 +8690,37 @@ AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+		  [_AM_DEPENDENCIES(CC)],
+		  [define([AC_PROG_CC],
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+		  [_AM_DEPENDENCIES(CXX)],
+		  [define([AC_PROG_CXX],
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-                  [_AM_DEPENDENCIES(OBJC)],
-                  [define([AC_PROG_OBJC],
-                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+		  [_AM_DEPENDENCIES(OBJC)],
+		  [define([AC_PROG_OBJC],
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
 ])
 
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
 
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
@@ -8680,7 +8743,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -8691,7 +8754,14 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
 AC_SUBST(install_sh)])
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -8717,13 +8787,13 @@ AC_SUBST([am__leading_dot])])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  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 3
+# serial 4
 
 # AM_MAKE_INCLUDE()
 # -----------------
@@ -8732,7 +8802,7 @@ AC_DEFUN([AM_MAKE_INCLUDE],
 [am_make=${MAKE-make}
 cat > confinc << 'END'
 am__doit:
-	@echo done
+	@echo this is the am__doit target
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
@@ -8742,24 +8812,24 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
 # Now try BSD make style include.
 if test "$am__include" = "#"; then
    echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
 fi
 AC_SUBST([am__include])
 AC_SUBST([am__quote])
@@ -8769,14 +8839,14 @@ rm -f confinc confmf
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 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 5
+# serial 6
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -8793,7 +8863,14 @@ AC_SUBST($1)])
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
@@ -8864,14 +8941,14 @@ AC_DEFUN([_AM_IF_OPTION],
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 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 4
+# serial 5
 
 # AM_SANITY_CHECK
 # ---------------
@@ -8880,16 +8957,29 @@ AC_DEFUN([AM_SANITY_CHECK],
 # Just in case
 sleep 1
 echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
+
 # Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
    if test "$[*]" = "X"; then
       # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
+      set X `ls -t "$srcdir/configure" conftest.file`
    fi
    rm -f conftest.file
    if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -8914,6 +9004,33 @@ Check your system clock])
 fi
 AC_MSG_RESULT(yes)])
 
+# Copyright (C) 2009  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 1
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# (`yes' being less verbose, `no' or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules],
+[  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')])
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -8942,18 +9059,25 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# Copyright (C) 2006, 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 2
+
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
+# AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
 # Check how to create a tarball.                            -*- Autoconf -*-
 
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
diff --git a/config.h.in b/config.h.in
index 982dab2..8a9e58e 100644
--- a/config.h.in
+++ b/config.h.in
@@ -6,6 +6,9 @@
 /* Where the system dir for D-Bus is */
 #undef DBUS_SYS_DIR
 
+/* Define if N810 support is enabled */
+#undef ENABLE_N810
+
 /* Define if we have Bluez */
 #undef HAVE_BLUEZ
 
diff --git a/configure b/configure
index a5f87fc..1a8042b 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,14 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for gypsy 0.7.
+# Generated by GNU Autoconf 2.65 for gypsy 0.8.
 #
 # Report bugs to <http://gypsy.freedesktop.org>.
 #
+#
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+#
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
@@ -676,7 +678,8 @@ fi
 
 
 
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -698,8 +701,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='gypsy'
 PACKAGE_TARNAME='gypsy'
-PACKAGE_VERSION='0.7'
-PACKAGE_STRING='gypsy 0.7'
+PACKAGE_VERSION='0.8'
+PACKAGE_STRING='gypsy 0.8'
 PACKAGE_BUGREPORT='http://gypsy.freedesktop.org'
 PACKAGE_URL=''
 
@@ -740,15 +743,25 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='LTLIBOBJS
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
 LIBOBJS
 XSLT
+GTK_DOC_USE_REBASE_FALSE
+GTK_DOC_USE_REBASE_TRUE
 GTK_DOC_USE_LIBTOOL_FALSE
 GTK_DOC_USE_LIBTOOL_TRUE
+GTK_DOC_BUILD_PDF_FALSE
+GTK_DOC_BUILD_PDF_TRUE
+GTK_DOC_BUILD_HTML_FALSE
+GTK_DOC_BUILD_HTML_TRUE
 ENABLE_GTK_DOC_FALSE
 ENABLE_GTK_DOC_TRUE
-GTKDOC_CHECK
 HTML_DIR
+GTKDOC_MKPDF
+GTKDOC_REBASE
+GTKDOC_CHECK
 DAEMON_USER
 LIBEXECDIR
 DBUS_SERVICES_DIR
@@ -757,6 +770,10 @@ GLIB_GENMARSHAL
 DBUS_BINDING_TOOL
 GYPSY_LIBS
 GYPSY_CFLAGS
+GPSBT_LIBS
+GPSBT_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
 PKG_CONFIG
 CPP
 OTOOL64
@@ -802,6 +819,8 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
 am__untar
 am__tar
 AMTAR
@@ -866,6 +885,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_silent_rules
 enable_dependency_tracking
 enable_shared
 enable_static
@@ -874,9 +894,12 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_bluetooth
+enable_n810
 with_user
 with_html_dir
 enable_gtk_doc
+enable_gtk_doc_html
+enable_gtk_doc_pdf
 '
       ac_precious_vars='build_alias
 host_alias
@@ -888,6 +911,10 @@ LIBS
 CPPFLAGS
 CPP
 PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
+GPSBT_CFLAGS
+GPSBT_LIBS
 GYPSY_CFLAGS
 GYPSY_LIBS'
 
@@ -1431,7 +1458,7 @@ if test "$ac_init_help" = "long"; then
   # 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 gypsy 0.7 to adapt to many kinds of systems.
+\`configure' configures gypsy 0.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1501,7 +1528,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gypsy 0.7:";;
+     short | recursive ) echo "Configuration of gypsy 0.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1509,6 +1536,8 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-shared[=PKGS]  build shared libraries [default=yes]
@@ -1517,7 +1546,10 @@ Optional Features:
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-bluetooth     Enable support for Bluetooth GPS devices
-  --enable-gtk-doc        use gtk-doc to build documentation [default=no]
+  --enable-n810           Enable support for Nokia N810 internal GPS
+  --enable-gtk-doc        use gtk-doc to build documentation [[default=no]]
+  --enable-gtk-doc-html   build documentation in html format [[default=yes]]
+  --enable-gtk-doc-pdf    build documentation in pdf format [[default=no]]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1534,10 +1566,17 @@ Some influential environment variables:
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
+  GPSBT_CFLAGS
+              C compiler flags for GPSBT, overriding pkg-config
+  GPSBT_LIBS  linker flags for GPSBT, overriding pkg-config
   GYPSY_CFLAGS
               C compiler flags for GYPSY, overriding pkg-config
   GYPSY_LIBS  linker flags for GYPSY, overriding pkg-config
@@ -1608,8 +1647,8 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gypsy configure 0.7
-generated by GNU Autoconf 2.64
+gypsy configure 0.8
+generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -1656,7 +1695,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_retval=1
 fi
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
 
@@ -1702,7 +1741,7 @@ fi
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
 
@@ -1770,7 +1809,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
     ac_retval=1
 fi
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
 
@@ -1812,7 +1851,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
 
@@ -1886,8 +1925,8 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gypsy $as_me 0.7, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+It was created by gypsy $as_me 0.8, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
@@ -2140,7 +2179,7 @@ fi
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
@@ -2149,9 +2188,9 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
@@ -2235,7 +2274,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-am__api_version='1.10'
+am__api_version='1.11'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2358,16 +2397,29 @@ $as_echo_n "checking whether build environment is sane... " >&6; }
 # Just in case
 sleep 1
 echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+esac
+
 # Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
    if test "$*" = "X"; then
       # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
+      set X `ls -t "$srcdir/configure" conftest.file`
    fi
    rm -f conftest.file
    if test "$*" != "X $srcdir/configure conftest.file" \
@@ -2405,7 +2457,14 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
 
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
@@ -2415,6 +2474,115 @@ else
 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
@@ -2443,6 +2611,7 @@ IFS=$as_save_IFS
 
 fi
 
+  test -d ./--version && rmdir ./--version
   if test "${ac_cv_path_mkdir+set}" = set; then
     MKDIR_P="$ac_cv_path_mkdir -p"
   else
@@ -2450,7 +2619,6 @@ fi
     # value for MKDIR_P within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
@@ -2567,7 +2735,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gypsy'
- VERSION='0.7'
+ VERSION='0.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2595,108 +2763,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 # Always define AMTAR for backward compatibility.
@@ -2712,6 +2778,19 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 ac_config_headers="$ac_config_headers config.h"
 
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=0;;
+esac
+AM_BACKSLASH='\'
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3034,32 +3113,30 @@ $as_echo "$ac_try_echo"; } >&5
 ... rest of stderr output deleted ...
          10q' conftest.err >conftest.er1
     cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
   fi
+  rm -f conftest.er1 conftest.err
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+
 int
 main ()
 {
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
@@ -3121,10 +3198,10 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
 else
   ac_file=''
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then :
-  $as_echo "$as_me: failed program was:" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -3132,51 +3209,18 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 { as_fn_set_status 77
 as_fn_error "C compiler cannot create executables
 See \`config.log' for more details." "$LINENO" 5; }; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
@@ -3209,13 +3253,72 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." "$LINENO" 5; }
 fi
-rm -f conftest$ac_cv_exeext
+rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then :
@@ -3486,7 +3589,7 @@ ac_config_commands="$ac_config_commands depfiles"
 am_make=${MAKE-make}
 cat > confinc << 'END'
 am__doit:
-	@echo done
+	@echo this is the am__doit target
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
@@ -3497,24 +3600,24 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
 # Now try BSD make style include.
 if test "$am__include" = "#"; then
    echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
 fi
 
 
@@ -3571,6 +3674,11 @@ else
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
   for depmode in $am_compiler_list; do
     # Setup a source with many dependencies, because some compilers
     # like to wrap large dependency lists on column 80 (with \), and
@@ -3588,7 +3696,17 @@ else
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
     case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
     nosideeffect)
       # after this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested
@@ -3598,19 +3716,23 @@ else
 	break
       fi
       ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
     none) break ;;
     esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
          >/dev/null 2>conftest.err &&
        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
       # or remarks (even with -Werror).  So we grep stderr for any message
@@ -3657,8 +3779,8 @@ esac
 
 
 
-macro_version='2.2.6'
-macro_revision='1.3012'
+macro_version='2.2.6b'
+macro_revision='1.3017'
 
 
 
@@ -4329,13 +4451,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4332: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4454: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4335: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4457: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4338: output\"" >&5)
+  (eval echo "\"\$as_me:4460: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -4801,7 +4923,7 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -5541,7 +5663,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5544 "configure"' > conftest.$ac_ext
+  echo '#line 5666 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7067,11 +7189,11 @@ else
    -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:7070: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7192: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7074: \$? = $ac_status" >&5
+   echo "$as_me:7196: \$? = $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.
@@ -7236,7 +7358,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -7406,11 +7528,11 @@ else
    -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:7409: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7531: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7413: \$? = $ac_status" >&5
+   echo "$as_me:7535: \$? = $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.
@@ -7511,11 +7633,11 @@ else
    -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:7514: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7636: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7518: \$? = $ac_status" >&5
+   echo "$as_me:7640: \$? = $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
@@ -7566,11 +7688,11 @@ else
    -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:7569: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7691: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7573: \$? = $ac_status" >&5
+   echo "$as_me:7695: \$? = $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
@@ -7709,6 +7831,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
     fi
     supports_anon_versioning=no
     case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -7800,7 +7923,7 @@ _LT_EOF
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    gnu* | linux* | tpf* | k*bsd*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test "$host_os" = linux-dietlibc; then
 	case $cc_basename in
@@ -9262,7 +9385,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -9949,7 +10072,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 9952 "configure"
+#line 10075 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10045,7 +10168,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10048 "configure"
+#line 10171 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10290,6 +10413,15 @@ $as_echo "#define HAVE_BLUEZ 1" >>confdefs.h
 	GYPSY_PC_MODULES="$GYPSY_PC_MODULES bluez"
 fi
 
+# Check whether --enable-n810 was given.
+if test "${enable_n810+set}" = set; then :
+  enableval=$enable_n810; ENABLE_N810=yes
+fi
+
+
+
+
+
 
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -10404,18 +10536,102 @@ $as_echo "yes" >&6; }
 $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPSBT" >&5
+$as_echo_n "checking for GPSBT... " >&6; }
 
+if test -n "$GPSBT_CFLAGS"; then
+    pkg_cv_GPSBT_CFLAGS="$GPSBT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gpsbt\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GPSBT_CFLAGS=`$PKG_CONFIG --cflags "gpsbt" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
 fi
+if test -n "$GPSBT_LIBS"; then
+    pkg_cv_GPSBT_LIBS="$GPSBT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gpsbt\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GPSBT_LIBS=`$PKG_CONFIG --libs "gpsbt" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+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
+	        GPSBT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gpsbt" 2>&1`
+        else
+	        GPSBT_PKG_ERRORS=`$PKG_CONFIG --print-errors "gpsbt" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GPSBT_PKG_ERRORS" >&5
+
+
+	if test "x$ENABLE_N810" = "xyes"; then
+		as_fn_error "libgpsbt is required for N810 gps support" "$LINENO" 5
+	fi
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+	if test "x$ENABLE_N810" = "xyes"; then
+		as_fn_error "libgpsbt is required for N810 gps support" "$LINENO" 5
+	fi
+
+else
+	GPSBT_CFLAGS=$pkg_cv_GPSBT_CFLAGS
+	GPSBT_LIBS=$pkg_cv_GPSBT_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+	if test "x$ENABLE_N810" = "xyes"; then
+
+$as_echo "#define ENABLE_N810 1" >>confdefs.h
+
+
+
+	fi
+
+fi
+
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GYPSY" >&5
 $as_echo_n "checking for GYPSY... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GYPSY_CFLAGS"; then
-        pkg_cv_GYPSY_CFLAGS="$GYPSY_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GYPSY_CFLAGS"; then
+    pkg_cv_GYPSY_CFLAGS="$GYPSY_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GYPSY_PC_MODULES\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$GYPSY_PC_MODULES") 2>&5
   ac_status=$?
@@ -10425,15 +10641,13 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GYPSY_LIBS"; then
-        pkg_cv_GYPSY_LIBS="$GYPSY_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GYPSY_LIBS"; then
+    pkg_cv_GYPSY_LIBS="$GYPSY_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GYPSY_PC_MODULES\""; } >&5
   ($PKG_CONFIG --exists --print-errors "$GYPSY_PC_MODULES") 2>&5
   ac_status=$?
@@ -10443,14 +10657,15 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -10458,9 +10673,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GYPSY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GYPSY_PC_MODULES"`
+	        GYPSY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GYPSY_PC_MODULES" 2>&1`
         else
-	        GYPSY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GYPSY_PC_MODULES"`
+	        GYPSY_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GYPSY_PC_MODULES" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GYPSY_PKG_ERRORS" >&5
@@ -10474,9 +10689,10 @@ installed software in a non-standard prefix.
 
 Alternatively, you may set the environment variables GYPSY_CFLAGS
 and GYPSY_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
@@ -10494,7 +10710,7 @@ else
 	GYPSY_LIBS=$pkg_cv_GYPSY_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	:
+
 fi
 
 
@@ -10670,54 +10886,58 @@ CFLAGS="$CFLAGS -g -Wall -Werror -Wno-format"
 
 
 
-# Check whether --with-html-dir was given.
-if test "${with_html_dir+set}" = set; then :
-  withval=$with_html_dir;
+    # Extract the first word of "gtkdoc-check", so it can be a program name with args.
+set dummy gtkdoc-check; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  with_html_dir='${datadir}/gtk-doc/html'
-fi
-
-  HTML_DIR="$with_html_dir"
-
+  case $GTKDOC_CHECK in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-    # Check whether --enable-gtk-doc was given.
-if test "${enable_gtk_doc+set}" = set; then :
-  enableval=$enable_gtk_doc;
-else
-  enable_gtk_doc=no
+  ;;
+esac
 fi
-
-
-  if test x$enable_gtk_doc = xyes; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.6\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.6") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  :
+GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
+if test -n "$GTKDOC_CHECK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
+$as_echo "$GTKDOC_CHECK" >&6; }
 else
-  as_fn_error "You need to have gtk-doc >= 1.6 installed to build gtk-doc" "$LINENO" 5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-  fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
-$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
-$as_echo "$enable_gtk_doc" >&6; }
 
-  for ac_prog in gtkdoc-check
+  for ac_prog in gtkdoc-rebase
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
+if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  case $GTKDOC_CHECK in
+  case $GTKDOC_REBASE in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
+  ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10727,7 +10947,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -10738,18 +10958,116 @@ IFS=$as_save_IFS
   ;;
 esac
 fi
-GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
-if test -n "$GTKDOC_CHECK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
-$as_echo "$GTKDOC_CHECK" >&6; }
+GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
+if test -n "$GTKDOC_REBASE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5
+$as_echo "$GTKDOC_REBASE" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$GTKDOC_CHECK" && break
+  test -n "$GTKDOC_REBASE" && break
+done
+test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true"
+
+  # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
+set dummy gtkdoc-mkpdf; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GTKDOC_MKPDF in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
 done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
+if test -n "$GTKDOC_MKPDF"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5
+$as_echo "$GTKDOC_MKPDF" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+# Check whether --with-html-dir was given.
+if test "${with_html_dir+set}" = set; then :
+  withval=$with_html_dir;
+else
+  with_html_dir='${datadir}/gtk-doc/html'
+fi
+
+  HTML_DIR="$with_html_dir"
+
+
+    # Check whether --enable-gtk-doc was given.
+if test "${enable_gtk_doc+set}" = set; then :
+  enableval=$enable_gtk_doc;
+else
+  enable_gtk_doc=no
+fi
+
+
+  if test x$enable_gtk_doc = xyes; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.6\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.6") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  :
+else
+  as_fn_error "You need to have gtk-doc >= 1.6 installed to build $PACKAGE_NAME" "$LINENO" 5
+fi
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
+$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
+$as_echo "$enable_gtk_doc" >&6; }
+
+    # Check whether --enable-gtk-doc-html was given.
+if test "${enable_gtk_doc_html+set}" = set; then :
+  enableval=$enable_gtk_doc_html;
+else
+  enable_gtk_doc_html=yes
+fi
+
+    # Check whether --enable-gtk-doc-pdf was given.
+if test "${enable_gtk_doc_pdf+set}" = set; then :
+  enableval=$enable_gtk_doc_pdf;
+else
+  enable_gtk_doc_pdf=no
+fi
+
+
+  if test -z "$GTKDOC_MKPDF"; then
+    enable_gtk_doc_pdf=no
+  fi
 
 
    if test x$enable_gtk_doc = xyes; then
@@ -10760,6 +11078,22 @@ else
   ENABLE_GTK_DOC_FALSE=
 fi
 
+   if test x$enable_gtk_doc_html = xyes; then
+  GTK_DOC_BUILD_HTML_TRUE=
+  GTK_DOC_BUILD_HTML_FALSE='#'
+else
+  GTK_DOC_BUILD_HTML_TRUE='#'
+  GTK_DOC_BUILD_HTML_FALSE=
+fi
+
+   if test x$enable_gtk_doc_pdf = xyes; then
+  GTK_DOC_BUILD_PDF_TRUE=
+  GTK_DOC_BUILD_PDF_FALSE='#'
+else
+  GTK_DOC_BUILD_PDF_TRUE='#'
+  GTK_DOC_BUILD_PDF_FALSE=
+fi
+
    if test -n "$LIBTOOL"; then
   GTK_DOC_USE_LIBTOOL_TRUE=
   GTK_DOC_USE_LIBTOOL_FALSE='#'
@@ -10768,6 +11102,14 @@ else
   GTK_DOC_USE_LIBTOOL_FALSE=
 fi
 
+   if test -n "$GTKDOC_REBASE"; then
+  GTK_DOC_USE_REBASE_TRUE=
+  GTK_DOC_USE_REBASE_FALSE='#'
+else
+  GTK_DOC_USE_REBASE_TRUE='#'
+  GTK_DOC_USE_REBASE_FALSE=
+fi
+
 
 # TODO: add --with-xsltproc argument to override PATH
 for ac_prog in xsltproc
@@ -10913,6 +11255,14 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   as_fn_error "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -10925,10 +11275,22 @@ if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
   as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
+  as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
+  as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
   as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
+  as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
@@ -11337,8 +11699,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gypsy $as_me 0.7, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+This file was extended by gypsy $as_me 0.8, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -11378,6 +11740,7 @@ Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -11400,10 +11763,11 @@ Report bugs to <http://gypsy.freedesktop.org>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gypsy config.status 0.7
-configured by $0, generated by GNU Autoconf 2.64,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+gypsy config.status 0.8
+configured by $0, generated by GNU Autoconf 2.65,
+  with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
@@ -11441,6 +11805,8 @@ do
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
@@ -11895,7 +12261,7 @@ s/'"$ac_delim"'$//
 t delim
 :nl
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -11909,7 +12275,7 @@ s/.\{148\}//
 t nl
 :delim
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
@@ -12376,27 +12742,28 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
 
   case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
-# are listed without --file.  Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*)   set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-    dirpart=`$as_dirname -- "$mf" ||
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
 	 X"$mf" : 'X\(//\)$' \| \
@@ -12419,28 +12786,28 @@ $as_echo X"$mf" |
 	    q
 	  }
 	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`$as_dirname -- "$file" ||
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
 $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$file" : 'X\(//\)[^/]' \| \
 	 X"$file" : 'X\(//\)$' \| \
@@ -12463,11 +12830,12 @@ $as_echo X"$file" |
 	    q
 	  }
 	  s/.*/./; q'`
-    as_dir=$dirpart/$fdir; as_fn_mkdir_p
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
   done
-done
+}
  ;;
     "libtool":C)
 
diff --git a/configure.ac b/configure.ac
index 65ceb4c..ee67564 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,12 @@
 AC_PREREQ(2.59)
-AC_INIT(gypsy, 0.7, http://gypsy.freedesktop.org)
+AC_INIT(gypsy, 0.8, http://gypsy.freedesktop.org)
 
 AC_CONFIG_SRCDIR(src/main.c)
 AM_INIT_AUTOMAKE([1.9 foreign])
 AM_CONFIG_HEADER(config.h)
 
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
 AC_PROG_CC
 AM_PROG_LIBTOOL
 
@@ -17,6 +19,19 @@ if test x$enable_bluetooth = xyes; then
 	GYPSY_PC_MODULES="$GYPSY_PC_MODULES bluez"
 fi
 
+AC_ARG_ENABLE(n810, AC_HELP_STRING([--enable-n810],[Enable support for Nokia N810 internal GPS]), ENABLE_N810=yes,)
+PKG_CHECK_MODULES(GPSBT, [gpsbt],[
+	if test "x$ENABLE_N810" = "xyes"; then
+		AC_DEFINE(ENABLE_N810,1,[Define if N810 support is enabled])
+		AC_SUBST(GPSBT_LIBS)
+		AC_SUBST(GPSBT_CFLAGS)
+	fi
+],[
+	if test "x$ENABLE_N810" = "xyes"; then
+		AC_MSG_ERROR([libgpsbt is required for N810 gps support])
+	fi
+])
+
 PKG_CHECK_MODULES(GYPSY, $GYPSY_PC_MODULES)
 AC_SUBST(GYPSY_LIBS)
 AC_SUBST(GYPSY_CFLAGS)
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 2e71119..c7103b8 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -41,6 +43,13 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -52,12 +61,41 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -84,8 +122,12 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GPSBT_CFLAGS = @GPSBT_CFLAGS@
+GPSBT_LIBS = @GPSBT_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
 GYPSY_CFLAGS = @GYPSY_CFLAGS@
 GYPSY_LIBS = @GYPSY_LIBS@
 HTML_DIR = @HTML_DIR@
@@ -120,6 +162,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -193,9 +237,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  docs/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  docs/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docs/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign docs/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -213,6 +257,7 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -227,7 +272,7 @@ clean-libtool:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -244,7 +289,7 @@ $(RECURSIVE_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -252,7 +297,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -278,16 +323,16 @@ $(RECURSIVE_CLEAN_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -302,7 +347,7 @@ tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -314,7 +359,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -323,29 +368,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -366,29 +416,44 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -418,6 +483,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -436,6 +502,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -444,18 +512,28 @@ install-data-am:
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -476,8 +554,8 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic clean-libtool \
@@ -493,6 +571,7 @@ uninstall-am:
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am
 
+
 # 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.
 .NOEXPORT:
diff --git a/docs/reference/Makefile.in b/docs/reference/Makefile.in
index eea52ff..0ff014b 100644
--- a/docs/reference/Makefile.in
+++ b/docs/reference/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -21,8 +22,9 @@
 ####################################
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,11 +50,19 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = version.xml
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -79,8 +89,12 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GPSBT_CFLAGS = @GPSBT_CFLAGS@
+GPSBT_LIBS = @GPSBT_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
 GYPSY_CFLAGS = @GYPSY_CFLAGS@
 GYPSY_LIBS = @GYPSY_LIBS@
 HTML_DIR = @HTML_DIR@
@@ -115,6 +129,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -257,10 +273,10 @@ expand_content_files =
 INCLUDES = -I$(top_srcdir) $(GYPSY_CFLAGS)
 GTKDOC_LIBS = $(top_builddir)/gypsy/libgypsy.la $(GYPSY_LIBS)
 @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = 
 @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute
 
 # We set GPATH here; this gives us semantics for GNU make
@@ -279,7 +295,9 @@ EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \
 	$(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \
 	version.xml.in gypsy-design.png
 DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+	pdf-build.stamp \
+	$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
+	$(srcdir)/pdf.stamp
 
 SCANOBJ_FILES = \
 	$(DOC_MODULE).args 	 \
@@ -295,6 +313,10 @@ REPORT_FILES = \
 
 CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \
 	$(dbus_docs)
+@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = 
+@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
+@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = 
+@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
 all: all-am
 
 .SUFFIXES:
@@ -307,9 +329,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/gtk-doc.make $(am__c
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  docs/reference/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  docs/reference/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docs/reference/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign docs/reference/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -327,6 +349,7 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
@@ -358,13 +381,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -396,6 +423,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -414,6 +442,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -422,18 +452,28 @@ install-data-am: install-data-local
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -472,10 +512,10 @@ uninstall-am: uninstall-local
 	uninstall-local
 
 
-@ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
+@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 @ENABLE_GTK_DOC_FALSE@all-local:
 
-docs: html-build.stamp
+docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 
 $(REPORT_FILES): sgml-build.stamp
 
@@ -484,9 +524,12 @@ $(REPORT_FILES): sgml-build.stamp
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	@echo 'gtk-doc: Scanning header files'
 	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	  done ; \
+	  cd $(srcdir) && \
+	  gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	@if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
 	else \
 	    cd $(srcdir) ; \
@@ -494,7 +537,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
                test -f $$i || touch $$i ; \
 	    done \
 	fi
-	touch scan-build.stamp
+	@touch scan-build.stamp
 
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
@@ -504,23 +547,26 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
 tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
 	@echo 'gtk-doc: Rebuilding template files'
 	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	touch tmpl-build.stamp
+	@cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	@touch tmpl-build.stamp
 
 tmpl.stamp: tmpl-build.stamp
 	@true
 
-tmpl/*.sgml:
+$(srcdir)/tmpl/*.sgml:
 	@true
 
 #### xml ####
 
-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
 	@echo 'gtk-doc: Building XML'
 	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
-	touch sgml-build.stamp
+	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	  done ; \
+	  cd $(srcdir) && \
+	  gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
+	@touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
 	@true
@@ -530,18 +576,37 @@ sgml.stamp: sgml-build.stamp
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	@echo 'gtk-doc: Building HTML'
 	@-chmod -R u+w $(srcdir)
-	rm -rf $(srcdir)/html
-	mkdir $(srcdir)/html
-	mkhtml_options=""; \
+	@rm -rf $(srcdir)/html
+	@mkdir $(srcdir)/html
+	@mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
 	if test "$(?)" = "0"; then \
 	  mkhtml_options=--path="$(srcdir)"; \
-	fi
-	cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	fi; \
+	cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
 	@echo 'gtk-doc: Fixing cross-references'
-	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	touch html-build.stamp
+	@cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	@touch html-build.stamp
+
+#### pdf ####
+
+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+	@echo 'gtk-doc: Building PDF'
+	@-chmod -R u+w $(srcdir)
+	@rm -rf $(srcdir)/$(DOC_MODULE).pdf
+	@mkpdf_imgdirs=""; \
+	if test "x$(HTML_IMAGES)" != "x"; then \
+	  for img in $(HTML_IMAGES); do \
+	    part=`dirname $$img`; \
+	    echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
+	    if test $$? != 0; then \
+	      mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
+	    fi; \
+	  done; \
+	fi; \
+	cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+	@touch pdf-build.stamp
 
 ##############
 
@@ -551,14 +616,14 @@ clean-local:
 
 distclean-local:
 	cd $(srcdir) && \
-	  rm -rf xml $(REPORT_FILES) \
+	  rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
 	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 
 maintainer-clean-local: clean
 	cd $(srcdir) && rm -rf xml html
 
 install-data-local:
-	installfiles=`echo $(srcdir)/html/*`; \
+	@installfiles=`echo $(srcdir)/html/*`; \
 	if test "$$installfiles" = '$(srcdir)/html/*'; \
 	then echo '-- Nothing to install' ; \
 	else \
@@ -578,12 +643,11 @@ install-data-local:
 	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
 	  fi; \
-	  ! which gtkdoc-rebase >/dev/null 2>&1 || \
-	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
+	  $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
 	fi
 
 uninstall-local:
-	if test -n "$(DOC_MODULE_VERSION)"; then \
+	@if test -n "$(DOC_MODULE_VERSION)"; then \
 	  installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
 	else \
 	  installdir="$(DESTDIR)$(TARGET_DIR)"; \
@@ -600,21 +664,20 @@ uninstall-local:
 
 dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/xml
 	mkdir $(distdir)/html
 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/xml/*.xml $(distdir)/xml
 	cp $(srcdir)/html/* $(distdir)/html
+	-cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
 	cd $(distdir) && rm -f $(DISTCLEANFILES)
-	! which gtkdoc-rebase >/dev/null 2>&1 || \
-	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs
 
 ref-%.xml: $(top_srcdir)/interfaces/%-full.xml
 	$(XSLT) -o $@ $(top_srcdir)/docs/tools/spec-to-docbook.xsl $<
+
 # 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.
 .NOEXPORT:
diff --git a/docs/reference/gypsy-sections.txt b/docs/reference/gypsy-sections.txt
index cc45cfc..e3e79a4 100644
--- a/docs/reference/gypsy-sections.txt
+++ b/docs/reference/gypsy-sections.txt
@@ -81,6 +81,7 @@ GypsyDeviceFixStatus
 gypsy_device_new
 gypsy_device_get_connection_status
 gypsy_device_get_fix_status
+gypsy_device_set_start_options
 gypsy_device_start
 gypsy_device_stop
 <SUBSECTION Standard>
diff --git a/docs/reference/html/Accuracy.html b/docs/reference/html/Accuracy.html
index d6f7b50..219d96d 100644
--- a/docs/reference/html/Accuracy.html
+++ b/docs/reference/html/Accuracy.html
@@ -8,16 +8,8 @@
 <link rel="up" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
 <link rel="prev" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
 <link rel="next" href="Course.html" title="org.freedesktop.Gypsy.Course">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -30,14 +22,14 @@
 </tr>
 <tr><td colspan="5" class="shortcuts">
 <a href="#Accuracy.synopsis" class="shortcut">Top</a>
-                 | 
-                <a href="#Accuracy.description" class="shortcut">Description</a>
-                 | 
-                <a href="#Accuracy.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
-                 | 
-                <a href="#Accuracy.properties" class="shortcut">Properties</a>
-                 | 
-                <a href="#Accuracy.signals" class="shortcut">Signals</a>
+                   | 
+                  <a href="#Accuracy.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#Accuracy.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
+                   | 
+                  <a href="#Accuracy.properties" class="shortcut">Properties</a>
+                   | 
+                  <a href="#Accuracy.signals" class="shortcut">Signals</a>
 </td></tr>
 </table>
 <div class="refentry" title="org.freedesktop.Gypsy.Accuracy">
@@ -51,37 +43,33 @@
 </tr></table></div>
 <div class="refsynopsisdiv" title="Methods">
 <h2>Methods</h2>
-<pre class="synopsis"><a
-href="/usr/share/gtk-doc/html/gypsy/Accuracy.html#Accuracy.GetAccuracy"
->GetAccuracy</a> (out 'i'fields,
+<pre class="synopsis"><a href="Accuracy.html#Accuracy.GetAccuracy">GetAccuracy</a> (out 'i'fields,
              out 'd'pdop,
              out 'd'hdop,
              out 'd'vdop)
 </pre>
 </div>
 <div class="refsect1" title="Signals">
-<a name="id546757"></a><h2>Signals</h2>
-<pre class="synopsis"><a
-href="/usr/share/gtk-doc/html/gypsy/Accuracy.html#Accuracy::AccuracyChanged"
->AccuracyChanged</a> ('i'fields,
+<a name="id514842"></a><h2>Signals</h2>
+<pre class="synopsis"><a href="Accuracy.html#Accuracy::AccuracyChanged">AccuracyChanged</a> ('i'fields,
                  'd'pdop,
                  'd'hdop,
                  'd'vdop)
 </pre>
 </div>
 <div class="refsect1" title="Implemented Interfaces">
-<a name="id546778"></a><h2>Implemented Interfaces</h2>
+<a name="id514864"></a><h2>Implemented Interfaces</h2>
 <p>org.freedesktop.Gypsy.Accuracy implements
     org.freedesktop.DBus.Introspectable,
     org.freedesktop.DBus.Properties
     </p>
 </div>
 <div class="refsect1" title="Properties">
-<a name="id546795"></a><h2>Properties</h2>
+<a name="id514880"></a><h2>Properties</h2>
 <pre class="synopsis"></pre>
 </div>
 <div class="refsect1" title="Description">
-<a name="id546809"></a><h2>Description</h2>
+<a name="id514895"></a><h2>Description</h2>
 <p>
       </p>
 <p>
@@ -93,9 +81,9 @@ href="/usr/share/gtk-doc/html/gypsy/Accuracy.html#Accuracy::AccuracyChanged"
     </p>
 </div>
 <div class="refsect1" title="Details">
-<a name="id552710"></a><h2>Details</h2>
+<a name="id496741"></a><h2>Details</h2>
 <div class="refsect2" title="GetAccuracy ()">
-<a name="id552721"></a><h3>
+<a name="id496752"></a><h3>
 <a name="Accuracy.GetAccuracy"></a>GetAccuracy ()</h3>
 <pre class="programlisting">GetAccuracy (out 'i' fields,
              out 'd' pdop,
@@ -126,9 +114,9 @@ href="/usr/share/gtk-doc/html/gypsy/Accuracy.html#Accuracy::AccuracyChanged"
 </div>
 </div>
 <div class="refsect1" title="Signal Details">
-<a name="id500244"></a><h2>Signal Details</h2>
+<a name="id449138"></a><h2>Signal Details</h2>
 <div class="refsect2" title="The AccuracyChanged signal">
-<a name="id500255"></a><h3>
+<a name="id449148"></a><h3>
 <a name="Accuracy::AccuracyChanged"></a>The AccuracyChanged signal</h3>
 <pre class="programlisting">AccuracyChanged ('i' fields,
                  'd' pdop,
@@ -159,11 +147,11 @@ href="/usr/share/gtk-doc/html/gypsy/Accuracy.html#Accuracy::AccuracyChanged"
 </div>
 </div>
 <div class="refsect1" title="Property Details">
-<a name="id552207"></a><h2>Property Details</h2>
+<a name="id513352"></a><h2>Property Details</h2>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/Course.html b/docs/reference/html/Course.html
index f53e09c..5c7a681 100644
--- a/docs/reference/html/Course.html
+++ b/docs/reference/html/Course.html
@@ -8,16 +8,8 @@
 <link rel="up" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
 <link rel="prev" href="Accuracy.html" title="org.freedesktop.Gypsy.Accuracy">
 <link rel="next" href="Device.html" title="org.freedesktop.Gypsy.Device">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -30,14 +22,14 @@
 </tr>
 <tr><td colspan="5" class="shortcuts">
 <a href="#Course.synopsis" class="shortcut">Top</a>
-                 | 
-                <a href="#Course.description" class="shortcut">Description</a>
-                 | 
-                <a href="#Course.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
-                 | 
-                <a href="#Course.properties" class="shortcut">Properties</a>
-                 | 
-                <a href="#Course.signals" class="shortcut">Signals</a>
+                   | 
+                  <a href="#Course.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#Course.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
+                   | 
+                  <a href="#Course.properties" class="shortcut">Properties</a>
+                   | 
+                  <a href="#Course.signals" class="shortcut">Signals</a>
 </td></tr>
 </table>
 <div class="refentry" title="org.freedesktop.Gypsy.Course">
@@ -51,9 +43,7 @@
 </tr></table></div>
 <div class="refsynopsisdiv" title="Methods">
 <h2>Methods</h2>
-<pre class="synopsis"><a
-href="/usr/share/gtk-doc/html/gypsy/Course.html#Course.GetCourse"
->GetCourse</a> (out 'i'fields,
+<pre class="synopsis"><a href="Course.html#Course.GetCourse">GetCourse</a> (out 'i'fields,
            out 'i'timestamp,
            out 'd'speed,
            out 'd'direction,
@@ -61,10 +51,8 @@ href="/usr/share/gtk-doc/html/gypsy/Course.html#Course.GetCourse"
 </pre>
 </div>
 <div class="refsect1" title="Signals">
-<a name="id552268"></a><h2>Signals</h2>
-<pre class="synopsis"><a
-href="/usr/share/gtk-doc/html/gypsy/Course.html#Course::CourseChanged"
->CourseChanged</a> ('i'fields,
+<a name="id513412"></a><h2>Signals</h2>
+<pre class="synopsis"><a href="Course.html#Course::CourseChanged">CourseChanged</a> ('i'fields,
                'i'timestamp,
                'd'speed,
                'd'direction,
@@ -72,24 +60,24 @@ href="/usr/share/gtk-doc/html/gypsy/Course.html#Course::CourseChanged"
 </pre>
 </div>
 <div class="refsect1" title="Implemented Interfaces">
-<a name="id552289"></a><h2>Implemented Interfaces</h2>
+<a name="id513433"></a><h2>Implemented Interfaces</h2>
 <p>org.freedesktop.Gypsy.Course implements
     org.freedesktop.DBus.Introspectable,
     org.freedesktop.DBus.Properties
     </p>
 </div>
 <div class="refsect1" title="Properties">
-<a name="id552306"></a><h2>Properties</h2>
+<a name="id513450"></a><h2>Properties</h2>
 <pre class="synopsis"></pre>
 </div>
 <div class="refsect1" title="Description">
-<a name="id552320"></a><h2>Description</h2>
+<a name="id513464"></a><h2>Description</h2>
 <p></p>
 </div>
 <div class="refsect1" title="Details">
-<a name="id552335"></a><h2>Details</h2>
+<a name="id513478"></a><h2>Details</h2>
 <div class="refsect2" title="GetCourse ()">
-<a name="id552345"></a><h3>
+<a name="id502160"></a><h3>
 <a name="Course.GetCourse"></a>GetCourse ()</h3>
 <pre class="programlisting">GetCourse (out 'i' fields,
            out 'i' timestamp,
@@ -124,9 +112,9 @@ href="/usr/share/gtk-doc/html/gypsy/Course.html#Course::CourseChanged"
 </div>
 </div>
 <div class="refsect1" title="Signal Details">
-<a name="id499148"></a><h2>Signal Details</h2>
+<a name="id502277"></a><h2>Signal Details</h2>
 <div class="refsect2" title="The CourseChanged signal">
-<a name="id499158"></a><h3>
+<a name="id502287"></a><h3>
 <a name="Course::CourseChanged"></a>The CourseChanged signal</h3>
 <pre class="programlisting">CourseChanged ('i' fields,
                'i' timestamp,
@@ -161,11 +149,11 @@ href="/usr/share/gtk-doc/html/gypsy/Course.html#Course::CourseChanged"
 </div>
 </div>
 <div class="refsect1" title="Property Details">
-<a name="id499275"></a><h2>Property Details</h2>
+<a name="id512783"></a><h2>Property Details</h2>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/Device.html b/docs/reference/html/Device.html
index 5d4824e..b9b7188 100644
--- a/docs/reference/html/Device.html
+++ b/docs/reference/html/Device.html
@@ -8,16 +8,8 @@
 <link rel="up" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
 <link rel="prev" href="Course.html" title="org.freedesktop.Gypsy.Course">
 <link rel="next" href="Position.html" title="org.freedesktop.Gypsy.Position">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -30,14 +22,14 @@
 </tr>
 <tr><td colspan="5" class="shortcuts">
 <a href="#Device.synopsis" class="shortcut">Top</a>
-                 | 
-                <a href="#Device.description" class="shortcut">Description</a>
-                 | 
-                <a href="#Device.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
-                 | 
-                <a href="#Device.properties" class="shortcut">Properties</a>
-                 | 
-                <a href="#Device.signals" class="shortcut">Signals</a>
+                   | 
+                  <a href="#Device.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#Device.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
+                   | 
+                  <a href="#Device.properties" class="shortcut">Properties</a>
+                   | 
+                  <a href="#Device.signals" class="shortcut">Signals</a>
 </td></tr>
 </table>
 <div class="refentry" title="org.freedesktop.Gypsy.Device">
@@ -51,49 +43,51 @@
 </tr></table></div>
 <div class="refsynopsisdiv" title="Methods">
 <h2>Methods</h2>
-<pre class="synopsis"><a
-href="/usr/share/gtk-doc/html/gypsy/Device.html#Device.Start"
->Start</a>               ()
-<a
-href="/usr/share/gtk-doc/html/gypsy/Device.html#Device.Stop"
->Stop</a>                ()
-<a
-href="/usr/share/gtk-doc/html/gypsy/Device.html#Device.GetFixStatus"
->GetFixStatus</a>        (out 'i'fixtype)
-<a
-href="/usr/share/gtk-doc/html/gypsy/Device.html#Device.GetConnectionStatus"
->GetConnectionStatus</a> (out 'b'connected)
+<pre class="synopsis"><a href="Device.html#Device.SetStartOptions">SetStartOptions</a>     (in  'a{sv}'options)
+<a href="Device.html#Device.Start">Start</a>               ()
+<a href="Device.html#Device.Stop">Stop</a>                ()
+<a href="Device.html#Device.GetFixStatus">GetFixStatus</a>        (out 'i'fixtype)
+<a href="Device.html#Device.GetConnectionStatus">GetConnectionStatus</a> (out 'b'connected)
 </pre>
 </div>
 <div class="refsect1" title="Signals">
-<a name="id562828"></a><h2>Signals</h2>
-<pre class="synopsis"><a
-href="/usr/share/gtk-doc/html/gypsy/Device.html#Device::FixStatusChanged"
->FixStatusChanged</a>        ('i'fixtype)
-<a
-href="/usr/share/gtk-doc/html/gypsy/Device.html#Device::ConnectionStatusChanged"
->ConnectionStatusChanged</a> ('b'connected)
+<a name="id512867"></a><h2>Signals</h2>
+<pre class="synopsis"><a href="Device.html#Device::FixStatusChanged">FixStatusChanged</a>        ('i'fixtype)
+<a href="Device.html#Device::ConnectionStatusChanged">ConnectionStatusChanged</a> ('b'connected)
 </pre>
 </div>
 <div class="refsect1" title="Implemented Interfaces">
-<a name="id562854"></a><h2>Implemented Interfaces</h2>
+<a name="id512894"></a><h2>Implemented Interfaces</h2>
 <p>org.freedesktop.Gypsy.Device implements
     org.freedesktop.DBus.Introspectable,
     org.freedesktop.DBus.Properties
     </p>
 </div>
 <div class="refsect1" title="Properties">
-<a name="id562871"></a><h2>Properties</h2>
+<a name="id512911"></a><h2>Properties</h2>
 <pre class="synopsis"></pre>
 </div>
 <div class="refsect1" title="Description">
-<a name="id562885"></a><h2>Description</h2>
+<a name="id512925"></a><h2>Description</h2>
 <p></p>
 </div>
 <div class="refsect1" title="Details">
-<a name="id562900"></a><h2>Details</h2>
+<a name="id512939"></a><h2>Details</h2>
+<div class="refsect2" title="SetStartOptions ()">
+<a name="id512950"></a><h3>
+<a name="Device.SetStartOptions"></a>SetStartOptions ()</h3>
+<pre class="programlisting">SetStartOptions (in  'a{sv}' options)</pre>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>options</code></em>:</span></p></td>
+<td><p></p></td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
 <div class="refsect2" title="Start ()">
-<a name="id562910"></a><h3>
+<a name="id515855"></a><h3>
 <a name="Device.Start"></a>Start ()</h3>
 <pre class="programlisting">Start ()</pre>
 <div class="variablelist"><table border="0">
@@ -103,7 +97,7 @@ href="/usr/share/gtk-doc/html/gypsy/Device.html#Device::ConnectionStatusChanged"
 </div>
 <hr>
 <div class="refsect2" title="Stop ()">
-<a name="id562943"></a><h3>
+<a name="id515887"></a><h3>
 <a name="Device.Stop"></a>Stop ()</h3>
 <pre class="programlisting">Stop ()</pre>
 <div class="variablelist"><table border="0">
@@ -113,7 +107,7 @@ href="/usr/share/gtk-doc/html/gypsy/Device.html#Device::ConnectionStatusChanged"
 </div>
 <hr>
 <div class="refsect2" title="GetFixStatus ()">
-<a name="id562976"></a><h3>
+<a name="id515920"></a><h3>
 <a name="Device.GetFixStatus"></a>GetFixStatus ()</h3>
 <pre class="programlisting">GetFixStatus (out 'i' fixtype)</pre>
 <div class="variablelist"><table border="0">
@@ -126,7 +120,7 @@ href="/usr/share/gtk-doc/html/gypsy/Device.html#Device::ConnectionStatusChanged"
 </div>
 <hr>
 <div class="refsect2" title="GetConnectionStatus ()">
-<a name="id565883"></a><h3>
+<a name="id515970"></a><h3>
 <a name="Device.GetConnectionStatus"></a>GetConnectionStatus ()</h3>
 <pre class="programlisting">GetConnectionStatus (out 'b' connected)</pre>
 <div class="variablelist"><table border="0">
@@ -139,9 +133,9 @@ href="/usr/share/gtk-doc/html/gypsy/Device.html#Device::ConnectionStatusChanged"
 </div>
 </div>
 <div class="refsect1" title="Signal Details">
-<a name="id565934"></a><h2>Signal Details</h2>
+<a name="id516022"></a><h2>Signal Details</h2>
 <div class="refsect2" title="The FixStatusChanged signal">
-<a name="id565945"></a><h3>
+<a name="id516032"></a><h3>
 <a name="Device::FixStatusChanged"></a>The FixStatusChanged signal</h3>
 <pre class="programlisting">FixStatusChanged ('i' fixtype)</pre>
 <div class="variablelist"><table border="0">
@@ -154,7 +148,7 @@ href="/usr/share/gtk-doc/html/gypsy/Device.html#Device::ConnectionStatusChanged"
 </div>
 <hr>
 <div class="refsect2" title="The ConnectionStatusChanged signal">
-<a name="id565996"></a><h3>
+<a name="id514606"></a><h3>
 <a name="Device::ConnectionStatusChanged"></a>The ConnectionStatusChanged signal</h3>
 <pre class="programlisting">ConnectionStatusChanged ('b' connected)</pre>
 <div class="variablelist"><table border="0">
@@ -167,11 +161,11 @@ href="/usr/share/gtk-doc/html/gypsy/Device.html#Device::ConnectionStatusChanged"
 </div>
 </div>
 <div class="refsect1" title="Property Details">
-<a name="id566047"></a><h2>Property Details</h2>
+<a name="id514657"></a><h2>Property Details</h2>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/GypsyAccuracy.html b/docs/reference/html/GypsyAccuracy.html
index 24cf9b5..e0784e6 100644
--- a/docs/reference/html/GypsyAccuracy.html
+++ b/docs/reference/html/GypsyAccuracy.html
@@ -7,17 +7,9 @@
 <link rel="home" href="index.html" title="Gypsy Reference Manual">
 <link rel="up" href="ch03.html" title="GPS Data Objects">
 <link rel="prev" href="GypsyDevice.html" title="GypsyDevice">
-<link rel="next" href="GypsyCourse.html" title="GypsyCourse">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<link rel="next" href="gypsy-gypsy-course.html" title="GypsyCourse">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -26,18 +18,18 @@
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">Gypsy Reference Manual</th>
-<td><a accesskey="n" href="GypsyCourse.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="gypsy-gypsy-course.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
 <tr><td colspan="5" class="shortcuts">
 <a href="#GypsyAccuracy.synopsis" class="shortcut">Top</a>
-                 | 
-                <a href="#GypsyAccuracy.description" class="shortcut">Description</a>
-                 | 
-                <a href="#GypsyAccuracy.object-hierarchy" class="shortcut">Object Hierarchy</a>
-                 | 
-                <a href="#GypsyAccuracy.properties" class="shortcut">Properties</a>
-                 | 
-                <a href="#GypsyAccuracy.signals" class="shortcut">Signals</a>
+                   | 
+                  <a href="#GypsyAccuracy.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#GypsyAccuracy.object-hierarchy" class="shortcut">Object Hierarchy</a>
+                   | 
+                  <a href="#GypsyAccuracy.properties" class="shortcut">Properties</a>
+                   | 
+                  <a href="#GypsyAccuracy.signals" class="shortcut">Signals</a>
 </td></tr>
 </table>
 <div class="refentry" title="GypsyAccuracy">
@@ -51,36 +43,29 @@
 </tr></table></div>
 <div class="refsynopsisdiv" title="Synopsis">
 <a name="GypsyAccuracy.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-                    <a class="link" href="GypsyAccuracy.html#GypsyAccuracy-struct" title="GypsyAccuracy">GypsyAccuracy</a>;
-#define             <a class="link" href="GypsyAccuracy.html#GYPSY-ACCURACY-DBUS-SERVICE--CAPS" title="GYPSY_ACCURACY_DBUS_SERVICE">GYPSY_ACCURACY_DBUS_SERVICE</a>
-#define             <a class="link" href="GypsyAccuracy.html#GYPSY-ACCURACY-DBUS-INTERFACE--CAPS" title="GYPSY_ACCURACY_DBUS_INTERFACE">GYPSY_ACCURACY_DBUS_INTERFACE</a>
+<pre class="synopsis">                    <a class="link" href="GypsyAccuracy.html#GypsyAccuracy-struct" title="GypsyAccuracy">GypsyAccuracy</a>;
+#define             <a class="link" href="GypsyAccuracy.html#GYPSY-ACCURACY-DBUS-SERVICE:CAPS" title="GYPSY_ACCURACY_DBUS_SERVICE">GYPSY_ACCURACY_DBUS_SERVICE</a>
+#define             <a class="link" href="GypsyAccuracy.html#GYPSY-ACCURACY-DBUS-INTERFACE:CAPS" title="GYPSY_ACCURACY_DBUS_INTERFACE">GYPSY_ACCURACY_DBUS_INTERFACE</a>
 enum                <a class="link" href="GypsyAccuracy.html#GypsyAccuracyFields" title="enum GypsyAccuracyFields">GypsyAccuracyFields</a>;
-<a class="link" href="GypsyAccuracy.html" title="GypsyAccuracy">GypsyAccuracy</a> *     <a class="link" href="GypsyAccuracy.html#gypsy-accuracy-new" title="gypsy_accuracy_new ()">gypsy_accuracy_new</a>                  (const char *object_path);
-<a class="link" href="GypsyAccuracy.html#GypsyAccuracyFields" title="enum GypsyAccuracyFields">GypsyAccuracyFields</a>  <a class="link" href="GypsyAccuracy.html#gypsy-accuracy-get-accuracy" title="gypsy_accuracy_get_accuracy ()">gypsy_accuracy_get_accuracy</a>        (<a class="link" href="GypsyAccuracy.html" title="GypsyAccuracy">GypsyAccuracy</a> *accuracy,
-                                                         double *pdop,
-                                                         double *hdop,
-                                                         double *vdop,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);
+<a class="link" href="GypsyAccuracy.html" title="GypsyAccuracy"><span class="returnvalue">GypsyAccuracy</span></a> *     <a class="link" href="GypsyAccuracy.html#gypsy-accuracy-new" title="gypsy_accuracy_new ()">gypsy_accuracy_new</a>                  (<em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>);
+<a class="link" href="GypsyAccuracy.html#GypsyAccuracyFields" title="enum GypsyAccuracyFields"><span class="returnvalue">GypsyAccuracyFields</span></a>  <a class="link" href="GypsyAccuracy.html#gypsy-accuracy-get-accuracy" title="gypsy_accuracy_get_accuracy ()">gypsy_accuracy_get_accuracy</a>        (<em class="parameter"><code><a class="link" href="GypsyAccuracy.html" title="GypsyAccuracy"><span class="type">GypsyAccuracy</span></a> *accuracy</code></em>,
+                                                         <em class="parameter"><code><span class="type">double</span> *pdop</code></em>,
+                                                         <em class="parameter"><code><span class="type">double</span> *hdop</code></em>,
+                                                         <em class="parameter"><code><span class="type">double</span> *vdop</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Object Hierarchy">
 <a name="GypsyAccuracy.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
-  <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
->GObject</a>
+  <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----GypsyAccuracy
 </pre>
 </div>
 <div class="refsect1" title="Properties">
 <a name="GypsyAccuracy.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
-  "<a class="link" href="GypsyAccuracy.html#GypsyAccuracy--object-path" title='The "object-path" property'>object-path</a>"              <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a>*                : Write / Construct Only
+  "<a class="link" href="GypsyAccuracy.html#GypsyAccuracy--object-path" title='The "object-path" property'>object-path</a>"              <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Write / Construct Only
 </pre>
 </div>
 <div class="refsect1" title="Signals">
@@ -101,7 +86,7 @@ horizontal accuracy (on the latitude/longitude plane) and vertical
 <p>
 A <a class="link" href="GypsyAccuracy.html" title="GypsyAccuracy"><span class="type">GypsyAccuracy</span></a> object is created using <a class="link" href="GypsyAccuracy.html#gypsy-accuracy-new" title="gypsy_accuracy_new ()"><code class="function">gypsy_accuracy_new()</code></a> using the 
 D-Bus path of the GPS device. This path is returned from the 
-<a class="link" href="GypsyControl.html#gypsy-control-create" title="gypsy_control_create ()"><code class="function">gypsy_control_create()</code></a> function. The client can then find out about the
+<a class="link" href="gypsy-gypsy-control.html#gypsy-control-create" title="gypsy_control_create ()"><code class="function">gypsy_control_create()</code></a> function. The client can then find out about the
 course with <a class="link" href="GypsyAccuracy.html#gypsy-accuracy-get-accuracy" title="gypsy_accuracy_get_accuracy ()"><code class="function">gypsy_accuracy_get_accuracy()</code></a>.
 </p>
 <p>
@@ -113,29 +98,57 @@ vertical contains valid information.
 </p>
 <p>
 </p>
-<div class="informalexample"><pre class="programlisting">
-GypsyAccuracy *accuracy;
-GError *error = NULL;
+<div class="informalexample">
+  <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
+    <tbody>
+      <tr>
+        <td class="listing_lines" align="right"><pre>1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21</pre></td>
+        <td class="listing_code"><pre class="programlisting">GypsyAccuracy <span class="symbol">*</span>accuracy<span class="symbol">;</span>
+GError <span class="symbol">*</span>error <span class="symbol">=</span> NULL<span class="symbol">;</span>
+
+<span class="symbol">. . .</span>
 
-. . .
+<span class="symbol">/ *</span> path comes from the <span class="function"><a href="gypsy-gypsy-control.html#gypsy-control-create">gypsy_control_create</a></span><span class="symbol">()</span> function <span class="symbol">* /</span>
+accuracy <span class="symbol">=</span> <span class="function"><a href="GypsyAccuracy.html#gypsy-accuracy-new">gypsy_accuracy_new</a></span> <span class="symbol">(</span>path<span class="symbol">);</span>
+<span class="function"><a href="/usr/share/gtk-doc/html/gobject/gobject-Signals.html#g-signal-connect">g_signal_connect</a></span> <span class="symbol">(</span>accuracy<span class="symbol">,</span> <span class="string">&quot;accuracy-changed&quot;</span><span class="symbol">,</span> <span class="function"><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#G-CALLBACK:CAPS">G_CALLBACK</a></span> <span class="symbol">(</span>accuracy_changed<span class="symbol">),</span> NULL<span class="symbol">);</span>
 
-/ * path comes from the gypsy_control_create() function * /
-accuracy = gypsy_accuracy_new (path);
-g_signal_connect (accuracy, "accuracy-changed", G_CALLBACK (accuracy_changed), NULL);
+<span class="symbol">. . .</span>
 
-. . .
+<span class="gtkdoc kwb">static void</span> 
+<span class="function">accuracy_changed</span> <span class="symbol">(</span>GypsyAccuracy <span class="symbol">*</span>accuracy<span class="symbol">,</span> 
+GypsyAccuracyFields fields<span class="symbol">,</span>
+<span class="gtkdoc kwb">double</span> position<span class="symbol">,</span>
+<span class="gtkdoc kwb">double</span> horizontal<span class="symbol">,</span>
+<span class="gtkdoc kwb">double</span> vertical<span class="symbol">,</span>
+gpointer userdata<span class="symbol">)</span>
+<span class="symbol">{</span>
+  <span class="function"><a href="/usr/share/gtk-doc/html/glib/glib-Warnings-and-Assertions.html#g-print">g_print</a></span> <span class="symbol">(</span><span class="string">&quot;horizontal: %f</span><span class="gtkdoc esc">\n</span><span class="string">&quot;</span><span class="symbol">, (</span>fields <span class="symbol">&amp;</span> GYPSY_ACCURACY_FIELDS_HORIZONTAL<span class="symbol">)</span> ? horizontal <span class="symbol">: -</span><span class="number">1.0</span><span class="symbol">);</span>
+<span class="symbol">}</span></pre></td>
+      </tr>
+    </tbody>
+  </table>
+</div>
 
-static void 
-accuracy_changed (GypsyAccuracy *accuracy, 
-GypsyAccuracyFields fields,
-double position,
-double horizontal,
-double vertical,
-gpointer userdata)
-{
-  g_print ("horizontal: %f\n", (fields &amp; GYPSY_ACCURACY_FIELDS_HORIZONTAL) ? horizontal : -1.0);
-}
-</pre></div>
 <p>
 </p>
 </div>
@@ -145,28 +158,25 @@ gpointer userdata)
 <a name="GypsyAccuracy-struct"></a><h3>GypsyAccuracy</h3>
 <pre class="programlisting">typedef struct _GypsyAccuracy GypsyAccuracy;</pre>
 <p>
-There are no public fields in <a class="link" href="GypsyAccuracy.html" title="GypsyAccuracy"><span class="type">GypsyAccuracy</span></a>.</p>
-<p>
+There are no public fields in <a class="link" href="GypsyAccuracy.html" title="GypsyAccuracy"><span class="type">GypsyAccuracy</span></a>.
 </p>
 </div>
 <hr>
 <div class="refsect2" title="GYPSY_ACCURACY_DBUS_SERVICE">
-<a name="GYPSY-ACCURACY-DBUS-SERVICE--CAPS"></a><h3>GYPSY_ACCURACY_DBUS_SERVICE</h3>
+<a name="GYPSY-ACCURACY-DBUS-SERVICE:CAPS"></a><h3>GYPSY_ACCURACY_DBUS_SERVICE</h3>
 <pre class="programlisting">#define GYPSY_ACCURACY_DBUS_SERVICE "org.freedesktop.Gypsy"
 </pre>
 <p>
-A define containing the address of the Accuracy service</p>
-<p>
+A define containing the address of the Accuracy service
 </p>
 </div>
 <hr>
 <div class="refsect2" title="GYPSY_ACCURACY_DBUS_INTERFACE">
-<a name="GYPSY-ACCURACY-DBUS-INTERFACE--CAPS"></a><h3>GYPSY_ACCURACY_DBUS_INTERFACE</h3>
+<a name="GYPSY-ACCURACY-DBUS-INTERFACE:CAPS"></a><h3>GYPSY_ACCURACY_DBUS_INTERFACE</h3>
 <pre class="programlisting">#define GYPSY_ACCURACY_DBUS_INTERFACE "org.freedesktop.Gypsy.Accuracy"
 </pre>
 <p>
-A define containing the name of the Accuracy interface</p>
-<p>
+A define containing the name of the Accuracy interface
 </p>
 </div>
 <hr>
@@ -180,30 +190,29 @@ A define containing the name of the Accuracy interface</p>
 } GypsyAccuracyFields;
 </pre>
 <p>
-A bitmask telling which fields in the accuracy_changed callback are valid</p>
-<p>
+A bitmask telling which fields in the accuracy_changed callback are valid
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
-<td><p><a name="GYPSY-ACCURACY-FIELDS-NONE--CAPS"></a><span class="term"><code class="literal">GYPSY_ACCURACY_FIELDS_NONE</code></span></p></td>
-<td> None of the fields are valid
+<td><p><a name="GYPSY-ACCURACY-FIELDS-NONE:CAPS"></a><span class="term"><code class="literal">GYPSY_ACCURACY_FIELDS_NONE</code></span></p></td>
+<td>None of the fields are valid
 </td>
 </tr>
 <tr>
-<td><p><a name="GYPSY-ACCURACY-FIELDS-POSITION--CAPS"></a><span class="term"><code class="literal">GYPSY_ACCURACY_FIELDS_POSITION</code></span></p></td>
-<td> The Position (3D) DOP field is valid
+<td><p><a name="GYPSY-ACCURACY-FIELDS-POSITION:CAPS"></a><span class="term"><code class="literal">GYPSY_ACCURACY_FIELDS_POSITION</code></span></p></td>
+<td>The Position (3D) DOP field is valid
 </td>
 </tr>
 <tr>
-<td><p><a name="GYPSY-ACCURACY-FIELDS-HORIZONTAL--CAPS"></a><span class="term"><code class="literal">GYPSY_ACCURACY_FIELDS_HORIZONTAL</code></span></p></td>
-<td> The Horizonal (2D) DOP field is valid
+<td><p><a name="GYPSY-ACCURACY-FIELDS-HORIZONTAL:CAPS"></a><span class="term"><code class="literal">GYPSY_ACCURACY_FIELDS_HORIZONTAL</code></span></p></td>
+<td>The Horizonal (2D) DOP field is valid
 </td>
 </tr>
 <tr>
-<td><p><a name="GYPSY-ACCURACY-FIELDS-VERTICAL--CAPS"></a><span class="term"><code class="literal">GYPSY_ACCURACY_FIELDS_VERTICAL</code></span></p></td>
-<td> The Vertical (altitude) DOP field is valid
+<td><p><a name="GYPSY-ACCURACY-FIELDS-VERTICAL:CAPS"></a><span class="term"><code class="literal">GYPSY_ACCURACY_FIELDS_VERTICAL</code></span></p></td>
+<td>The Vertical (altitude) DOP field is valid
 </td>
 </tr>
 </tbody>
@@ -212,18 +221,17 @@ A bitmask telling which fields in the accuracy_changed callback are valid</p>
 <hr>
 <div class="refsect2" title="gypsy_accuracy_new ()">
 <a name="gypsy-accuracy-new"></a><h3>gypsy_accuracy_new ()</h3>
-<pre class="programlisting"><a class="link" href="GypsyAccuracy.html" title="GypsyAccuracy">GypsyAccuracy</a> *     gypsy_accuracy_new                  (const char *object_path);</pre>
+<pre class="programlisting"><a class="link" href="GypsyAccuracy.html" title="GypsyAccuracy"><span class="returnvalue">GypsyAccuracy</span></a> *     gypsy_accuracy_new                  (<em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>);</pre>
 <p>
 Creates a new <a class="link" href="GypsyAccuracy.html" title="GypsyAccuracy"><span class="type">GypsyAccuracy</span></a> object that listens for accuracy changes
-from the GPS found at <em class="parameter"><code>object_path</code></em>.</p>
-<p>
+from the GPS found at <em class="parameter"><code>object_path</code></em>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>object_path</code></em> :</span></p></td>
-<td> Object path to the GPS device
+<td>Object path to the GPS device
 </td>
 </tr>
 <tr>
@@ -237,48 +245,41 @@ from the GPS found at <em class="parameter"><code>object_path</code></em>.</p>
 <hr>
 <div class="refsect2" title="gypsy_accuracy_get_accuracy ()">
 <a name="gypsy-accuracy-get-accuracy"></a><h3>gypsy_accuracy_get_accuracy ()</h3>
-<pre class="programlisting"><a class="link" href="GypsyAccuracy.html#GypsyAccuracyFields" title="enum GypsyAccuracyFields">GypsyAccuracyFields</a>  gypsy_accuracy_get_accuracy        (<a class="link" href="GypsyAccuracy.html" title="GypsyAccuracy">GypsyAccuracy</a> *accuracy,
-                                                         double *pdop,
-                                                         double *hdop,
-                                                         double *vdop,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);</pre>
+<pre class="programlisting"><a class="link" href="GypsyAccuracy.html#GypsyAccuracyFields" title="enum GypsyAccuracyFields"><span class="returnvalue">GypsyAccuracyFields</span></a>  gypsy_accuracy_get_accuracy        (<em class="parameter"><code><a class="link" href="GypsyAccuracy.html" title="GypsyAccuracy"><span class="type">GypsyAccuracy</span></a> *accuracy</code></em>,
+                                                         <em class="parameter"><code><span class="type">double</span> *pdop</code></em>,
+                                                         <em class="parameter"><code><span class="type">double</span> *hdop</code></em>,
+                                                         <em class="parameter"><code><span class="type">double</span> *vdop</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
 Obtains the current accuracy, if known, from the GPS device.  <em class="parameter"><code>pdop</code></em>, <em class="parameter"><code>hdop</code></em>
-and <em class="parameter"><code>vdop</code></em> can be <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><span class="type">NULL</span></a> if the result is not required.</p>
-<p>
+and <em class="parameter"><code>vdop</code></em> can be <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if the result is not required.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>accuracy</code></em> :</span></p></td>
-<td> A <a class="link" href="GypsyAccuracy.html" title="GypsyAccuracy"><span class="type">GypsyAccuracy</span></a>
+<td>A <a class="link" href="GypsyAccuracy.html" title="GypsyAccuracy"><span class="type">GypsyAccuracy</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>pdop</code></em> :</span></p></td>
-<td> Pointer to store the position DOP
+<td>Pointer to store the position DOP
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>hdop</code></em> :</span></p></td>
-<td> Pointer to store the horizonal DOP
+<td>Pointer to store the horizonal DOP
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>vdop</code></em> :</span></p></td>
-<td> Pointer to store the vertical DOP
+<td>Pointer to store the vertical DOP
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> Pointer to store a <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a>
+<td>Pointer to store a <a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>
 </td>
 </tr>
 <tr>
@@ -294,12 +295,9 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GEr
 <a name="GypsyAccuracy.property-details"></a><h2>Property Details</h2>
 <div class="refsect2" title='The "object-path" property'>
 <a name="GypsyAccuracy--object-path"></a><h3>The <code class="literal">"object-path"</code> property</h3>
-<pre class="programlisting">  "object-path"              <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a>*                : Write / Construct Only</pre>
-<p>
-The path of the Gypsy GPS object</p>
+<pre class="programlisting">  "object-path"              <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Write / Construct Only</pre>
 <p>
+The path of the Gypsy GPS object
 </p>
 <p>Default value: ""</p>
 </div>
@@ -308,50 +306,39 @@ The path of the Gypsy GPS object</p>
 <a name="GypsyAccuracy.signal-details"></a><h2>Signal Details</h2>
 <div class="refsect2" title='The "accuracy-changed" signal'>
 <a name="GypsyAccuracy-accuracy-changed"></a><h3>The <code class="literal">"accuracy-changed"</code> signal</h3>
-<pre class="programlisting">void                user_function                      (<a class="link" href="GypsyAccuracy.html" title="GypsyAccuracy">GypsyAccuracy</a> *fields,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"
->gint</a>           pdop,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"
->gdouble</a>        hdop,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"
->gdouble</a>        vdop,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"
->gdouble</a>        arg4,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a>       user_data)      : Run First / No Recursion</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="GypsyAccuracy.html" title="GypsyAccuracy"><span class="type">GypsyAccuracy</span></a> *fields,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a>           pdop,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a>        hdop,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a>        vdop,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a>        arg4,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>       user_data)      : Run First / No Recursion</pre>
 <p>
 The ::accuracy-changed signal is emitted when the GPS device
 indicates that one or more of the accuracy fields has changed.
 The fields which have changed will be indicated in the <em class="parameter"><code>fields</code></em>
-bitmask.</p>
-<p>
+bitmask.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>fields</code></em> :</span></p></td>
-<td> A bitmask of <a class="link" href="GypsyAccuracy.html#GypsyAccuracyFields" title="enum GypsyAccuracyFields"><span class="type">GypsyAccuracyFields</span></a> indicating which of the following fields are valid
+<td>A bitmask of <a class="link" href="GypsyAccuracy.html#GypsyAccuracyFields" title="enum GypsyAccuracyFields"><span class="type">GypsyAccuracyFields</span></a> indicating which of the following fields are valid
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>pdop</code></em> :</span></p></td>
-<td> The new position DOP
+<td>The new position DOP
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>hdop</code></em> :</span></p></td>
-<td> The new horizonal DOP
+<td>The new horizonal DOP
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>vdop</code></em> :</span></p></td>
-<td> The new vertical DOP
+<td>The new vertical DOP
 </td>
 </tr>
 <tr>
@@ -365,6 +352,6 @@ bitmask.</p>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/GypsyControl.html b/docs/reference/html/GypsyControl.html
deleted file mode 100644
index 2e8d8b3..0000000
--- a/docs/reference/html/GypsyControl.html
+++ /dev/null
@@ -1,255 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GypsyControl</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="Gypsy Reference Manual">
-<link rel="up" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="prev" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="next" href="ch03.html" title="GPS Data Objects">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="ch02.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Gypsy Reference Manual</th>
-<td><a accesskey="n" href="ch03.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#GypsyControl.synopsis" class="shortcut">Top</a>
-                 | 
-                <a href="#GypsyControl.description" class="shortcut">Description</a>
-                 | 
-                <a href="#GypsyControl.object-hierarchy" class="shortcut">Object Hierarchy</a>
-</td></tr>
-</table>
-<div class="refentry" title="GypsyControl">
-<a name="GypsyControl"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="GypsyControl.top_of_page"></a>GypsyControl</span></h2>
-<p>GypsyControl — Control object for gypsy-daemon</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="GypsyControl.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-                    <a class="link" href="GypsyControl.html#GypsyControl-struct" title="GypsyControl">GypsyControl</a>;
-#define             <a class="link" href="GypsyControl.html#GYPSY-CONTROL-DBUS-SERVICE--CAPS" title="GYPSY_CONTROL_DBUS_SERVICE">GYPSY_CONTROL_DBUS_SERVICE</a>
-#define             <a class="link" href="GypsyControl.html#GYPSY-CONTROL-DBUS-PATH--CAPS" title="GYPSY_CONTROL_DBUS_PATH">GYPSY_CONTROL_DBUS_PATH</a>
-#define             <a class="link" href="GypsyControl.html#GYPSY-CONTROL-DBUS-INTERFACE--CAPS" title="GYPSY_CONTROL_DBUS_INTERFACE">GYPSY_CONTROL_DBUS_INTERFACE</a>
-<a class="link" href="GypsyControl.html" title="GypsyControl">GypsyControl</a> *      <a class="link" href="GypsyControl.html#gypsy-control-get-default" title="gypsy_control_get_default ()">gypsy_control_get_default</a>           (void);
-char *              <a class="link" href="GypsyControl.html#gypsy-control-create" title="gypsy_control_create ()">gypsy_control_create</a>                (<a class="link" href="GypsyControl.html" title="GypsyControl">GypsyControl</a> *control,
-                                                         const char *device_name,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);
-</pre>
-</div>
-<div class="refsect1" title="Object Hierarchy">
-<a name="GypsyControl.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="synopsis">
-  <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
->GObject</a>
-   +----GypsyControl
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="GypsyControl.description"></a><h2>Description</h2>
-<p>
-<a class="link" href="GypsyControl.html" title="GypsyControl"><span class="type">GypsyControl</span></a> is the object that controls the gypsy-daemon process. 
-It is a singleton object, meaning that there will only be one instance of it
-per application. Once the object has been created (or referenced if it 
-had already been created for the application) with 
-<a class="link" href="GypsyControl.html#gypsy-control-get-default" title="gypsy_control_get_default ()"><code class="function">gypsy_control_get_default()</code></a>, it can be used to tell gypsy-daemon what GPS
-device to connect to with <a class="link" href="GypsyControl.html#gypsy-control-create" title="gypsy_control_create ()"><code class="function">gypsy_control_create()</code></a>. This call returns the
-D-Bus object path to the GPS object in gypsy-daemon. This object path is then used to 
-create other objects, such as <a class="link" href="GypsyPosition.html" title="GypsyPosition"><span class="type">GypsyPosition</span></a>, or <a class="link" href="GypsyCourse.html" title="GypsyCourse"><span class="type">GypsyCourse</span></a>.
-</p>
-<p>
-As gypsy-daemon is able to connect to multiple GPS devices, the one
-<a class="link" href="GypsyControl.html" title="GypsyControl"><span class="type">GypsyControl</span></a> can be used to create them, returning a different path for each
-GPS device. Gypsy-daemon can connect to both serial port devices which have
-an entry in <code class="filename">/dev</code> and Bluetooth devices natively without
-the need to use rfcomm to set up a <code class="filename">/dev</code> entry. To do
-this you pass either the device path or the Bluetooth address of the device
-to <a class="link" href="GypsyControl.html#gypsy-control-create" title="gypsy_control_create ()"><code class="function">gypsy_control_create()</code></a>.
-</p>
-<p>
-Once the program has finished with the GPS, the <a class="link" href="GypsyControl.html" title="GypsyControl"><span class="type">GypsyControl</span></a> object should
-by unreferenced with <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref"
-><code class="function">g_object_unref()</code></a>.
-</p>
-<p>
-</p>
-<div class="informalexample"><pre class="programlisting">
-. . .
-
-<a class="link" href="GypsyControl.html" title="GypsyControl">GypsyControl</a> *control;
-char *path_bt, *path_dev;
-GError *error = NULL;
-
-. . .
-
-control = gypsy_control_get_default ();
-/ * Use a Bluetooth device * /
-path_bt = gypsy_control_create (control, "aa:bb:cc:dd:ee", &amp;error);
-if (path_bt == NULL) {
-  g_warning ("There was an error creating aa:bb:cc:dd:ee - %s", error-&gt;message);
-  g_error_free (error);
-  error = NULL;
-}
-
-/ * Use a serial port device * /
-path_dev = gypsy_control_create (control, "/dev/gps", &amp;error);
-if (path_dev == NULL) {
-  g_warning ("There was an error creating /dev/gps - %s", error-&gt;message);
-  g_error_free (error);
-  error = NULL;
-}
-
-. . .
-
-/ * Use the paths here to create listener objects * /
-
-. . . 
-
-g_free (path_bt);
-g_free (path_dev);
-
-. . .
-
-/ * The program has finished with Gypsy now, unref the object. * /
-g_object_unref (G_OBJECT (control));
-</pre></div>
-<p>
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="GypsyControl.details"></a><h2>Details</h2>
-<div class="refsect2" title="GypsyControl">
-<a name="GypsyControl-struct"></a><h3>GypsyControl</h3>
-<pre class="programlisting">typedef struct _GypsyControl GypsyControl;</pre>
-<p>
-There are no public fields in <a class="link" href="GypsyControl.html" title="GypsyControl"><span class="type">GypsyControl</span></a>.</p>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="GYPSY_CONTROL_DBUS_SERVICE">
-<a name="GYPSY-CONTROL-DBUS-SERVICE--CAPS"></a><h3>GYPSY_CONTROL_DBUS_SERVICE</h3>
-<pre class="programlisting">#define GYPSY_CONTROL_DBUS_SERVICE "org.freedesktop.Gypsy"
-</pre>
-<p>
-A define containing the service name of the control service</p>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="GYPSY_CONTROL_DBUS_PATH">
-<a name="GYPSY-CONTROL-DBUS-PATH--CAPS"></a><h3>GYPSY_CONTROL_DBUS_PATH</h3>
-<pre class="programlisting">#define GYPSY_CONTROL_DBUS_PATH "/org/freedesktop/Gypsy"
-</pre>
-<p>
-A define containing the object path of the Gypsy object</p>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="GYPSY_CONTROL_DBUS_INTERFACE">
-<a name="GYPSY-CONTROL-DBUS-INTERFACE--CAPS"></a><h3>GYPSY_CONTROL_DBUS_INTERFACE</h3>
-<pre class="programlisting">#define GYPSY_CONTROL_DBUS_INTERFACE "org.freedesktop.Gypsy.Server"
-</pre>
-<p>
-A define containing the name of the Control interface</p>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="gypsy_control_get_default ()">
-<a name="gypsy-control-get-default"></a><h3>gypsy_control_get_default ()</h3>
-<pre class="programlisting"><a class="link" href="GypsyControl.html" title="GypsyControl">GypsyControl</a> *      gypsy_control_get_default           (void);</pre>
-<p>
-Retrieves the default <a class="link" href="GypsyControl.html" title="GypsyControl"><span class="type">GypsyControl</span></a> object.</p>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> A singleton <a class="link" href="GypsyControl.html" title="GypsyControl"><span class="type">GypsyControl</span></a>.  Once the program has finished using
-the <a class="link" href="GypsyControl.html" title="GypsyControl"><span class="type">GypsyControl</span></a>, it should be unreferenced with <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref"
-><code class="function">g_object_unref()</code></a>.
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="gypsy_control_create ()">
-<a name="gypsy-control-create"></a><h3>gypsy_control_create ()</h3>
-<pre class="programlisting">char *              gypsy_control_create                (<a class="link" href="GypsyControl.html" title="GypsyControl">GypsyControl</a> *control,
-                                                         const char *device_name,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);</pre>
-<p>
-Creates a object on the server that refers to the GPS device at <em class="parameter"><code>device_name</code></em>.
-When this object is finalized, the remote object on the server will be
-shutdown after which any calls to the object at the returned path
-are not guaranteed to work.</p>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>control</code></em> :</span></p></td>
-<td> The <a class="link" href="GypsyControl.html" title="GypsyControl"><span class="type">GypsyControl</span></a> device
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>device_name</code></em> :</span></p></td>
-<td> The path to the device file, or Bluetooth address
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> A <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a> to return errors in, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> The path to the created object.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
-          Generated by GTK-Doc V1.11</div>
-</body>
-</html>
diff --git a/docs/reference/html/GypsyCourse.html b/docs/reference/html/GypsyCourse.html
deleted file mode 100644
index 3fe832d..0000000
--- a/docs/reference/html/GypsyCourse.html
+++ /dev/null
@@ -1,386 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GypsyCourse</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="Gypsy Reference Manual">
-<link rel="up" href="ch03.html" title="GPS Data Objects">
-<link rel="prev" href="GypsyAccuracy.html" title="GypsyAccuracy">
-<link rel="next" href="GypsyPosition.html" title="GypsyPosition">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="GypsyAccuracy.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch03.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Gypsy Reference Manual</th>
-<td><a accesskey="n" href="GypsyPosition.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#GypsyCourse.synopsis" class="shortcut">Top</a>
-                 | 
-                <a href="#GypsyCourse.description" class="shortcut">Description</a>
-                 | 
-                <a href="#GypsyCourse.object-hierarchy" class="shortcut">Object Hierarchy</a>
-                 | 
-                <a href="#GypsyCourse.properties" class="shortcut">Properties</a>
-                 | 
-                <a href="#GypsyCourse.signals" class="shortcut">Signals</a>
-</td></tr>
-</table>
-<div class="refentry" title="GypsyCourse">
-<a name="GypsyCourse"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="GypsyCourse.top_of_page"></a>GypsyCourse</span></h2>
-<p>GypsyCourse — Object for obtaining course information</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="GypsyCourse.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-                    <a class="link" href="GypsyCourse.html#GypsyCourse-struct" title="GypsyCourse">GypsyCourse</a>;
-#define             <a class="link" href="GypsyCourse.html#GYPSY-COURSE-DBUS-INTERFACE--CAPS" title="GYPSY_COURSE_DBUS_INTERFACE">GYPSY_COURSE_DBUS_INTERFACE</a>
-#define             <a class="link" href="GypsyCourse.html#GYPSY-COURSE-DBUS-SERVICE--CAPS" title="GYPSY_COURSE_DBUS_SERVICE">GYPSY_COURSE_DBUS_SERVICE</a>
-enum                <a class="link" href="GypsyCourse.html#GypsyCourseFields" title="enum GypsyCourseFields">GypsyCourseFields</a>;
-<a class="link" href="GypsyCourse.html" title="GypsyCourse">GypsyCourse</a> *       <a class="link" href="GypsyCourse.html#gypsy-course-new" title="gypsy_course_new ()">gypsy_course_new</a>                    (const char *object_path);
-<a class="link" href="GypsyCourse.html#GypsyCourseFields" title="enum GypsyCourseFields">GypsyCourseFields</a>   <a class="link" href="GypsyCourse.html#gypsy-course-get-course" title="gypsy_course_get_course ()">gypsy_course_get_course</a>             (<a class="link" href="GypsyCourse.html" title="GypsyCourse">GypsyCourse</a> *course,
-                                                         int *timestamp,
-                                                         double *speed,
-                                                         double *direction,
-                                                         double *climb,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);
-</pre>
-</div>
-<div class="refsect1" title="Object Hierarchy">
-<a name="GypsyCourse.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="synopsis">
-  <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
->GObject</a>
-   +----GypsyCourse
-</pre>
-</div>
-<div class="refsect1" title="Properties">
-<a name="GypsyCourse.properties"></a><h2>Properties</h2>
-<pre class="synopsis">
-  "<a class="link" href="GypsyCourse.html#GypsyCourse--object-path" title='The "object-path" property'>object-path</a>"              <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a>*                : Write / Construct Only
-</pre>
-</div>
-<div class="refsect1" title="Signals">
-<a name="GypsyCourse.signals"></a><h2>Signals</h2>
-<pre class="synopsis">
-  "<a class="link" href="GypsyCourse.html#GypsyCourse-course-changed" title='The "course-changed" signal'>course-changed</a>"                                 : Run First / No Recursion
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="GypsyCourse.description"></a><h2>Description</h2>
-<p>
-<a class="link" href="GypsyCourse.html" title="GypsyCourse"><span class="type">GypsyCourse</span></a> is used whenever the client program wishes to know about
-GPS course changes. It can report the current course, and has a signal
-to notify listeners of changes. The course consists of the speed, direction
-and rate of ascent or descent (called the climb).
-</p>
-<p>
-A <a class="link" href="GypsyCourse.html" title="GypsyCourse"><span class="type">GypsyCourse</span></a> object is created using <a class="link" href="GypsyCourse.html#gypsy-course-new" title="gypsy_course_new ()"><code class="function">gypsy_course_new()</code></a> using the 
-D-Bus path of the GPS device. This path is returned from the 
-<a class="link" href="GypsyControl.html#gypsy-control-create" title="gypsy_control_create ()"><code class="function">gypsy_control_create()</code></a> function. The client can then find out about the
-course with <a class="link" href="GypsyCourse.html#gypsy-course-get-course" title="gypsy_course_get_course ()"><code class="function">gypsy_course_get_course()</code></a>.
-</p>
-<p>
-As the course information changes <a class="link" href="GypsyCourse.html" title="GypsyCourse"><span class="type">GypsyCourse</span></a> will emit the 
-course-changed signal. This signal contains the course information if 
-gypsy-daemon knows it. It has a fields paramater which is a bitmask of
-<a class="link" href="GypsyCourse.html#GypsyCourseFields" title="enum GypsyCourseFields"><span class="type">GypsyCourseFields</span></a> which indicates which of the speed, direction or
-climb contains valid information. The timestamp will always be valid
-if it is greater than 0.
-</p>
-<p>
-</p>
-<div class="informalexample"><pre class="programlisting">
-GypsyCourse *course;
-GError *error = NULL;
-
-. . .
-
-/ * path comes from the gypsy_control_create() function * /
-course = gypsy_course_new (path);
-g_signal_connect (course, "course-changed", G_CALLBACK (course_changed), NULL);
-
-. . .
-
-static void 
-course_changed (GypsyCourse *course, 
-GypsyCourseFields fields,
-int timestamp,
-double speed,
-double direction,
-double climb,
-gpointer userdata)
-{
-  g_print ("speed: %fm/s\n", (fields &amp; GYPSY_COURSE_FIELDS_SPEED) ? speed : -1.0);
-}
-</pre></div>
-<p>
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="GypsyCourse.details"></a><h2>Details</h2>
-<div class="refsect2" title="GypsyCourse">
-<a name="GypsyCourse-struct"></a><h3>GypsyCourse</h3>
-<pre class="programlisting">typedef struct _GypsyCourse GypsyCourse;</pre>
-<p>
-There are no public fields in <a class="link" href="GypsyCourse.html" title="GypsyCourse"><span class="type">GypsyCourse</span></a>.</p>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="GYPSY_COURSE_DBUS_INTERFACE">
-<a name="GYPSY-COURSE-DBUS-INTERFACE--CAPS"></a><h3>GYPSY_COURSE_DBUS_INTERFACE</h3>
-<pre class="programlisting">#define GYPSY_COURSE_DBUS_INTERFACE "org.freedesktop.Gypsy.Course"
-</pre>
-<p>
-A define containing the name of the Course interface</p>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="GYPSY_COURSE_DBUS_SERVICE">
-<a name="GYPSY-COURSE-DBUS-SERVICE--CAPS"></a><h3>GYPSY_COURSE_DBUS_SERVICE</h3>
-<pre class="programlisting">#define GYPSY_COURSE_DBUS_SERVICE "org.freedesktop.Gypsy"
-</pre>
-<p>
-A define containing the address of the Course service</p>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="enum GypsyCourseFields">
-<a name="GypsyCourseFields"></a><h3>enum GypsyCourseFields</h3>
-<pre class="programlisting">typedef enum {
-	GYPSY_COURSE_FIELDS_NONE = 0,
-	GYPSY_COURSE_FIELDS_SPEED = 1 &lt;&lt; 0,
-	GYPSY_COURSE_FIELDS_DIRECTION = 1 &lt;&lt; 1,
-	GYPSY_COURSE_FIELDS_CLIMB = 1 &lt;&lt; 2
-} GypsyCourseFields;
-</pre>
-<p>
-A bitfield telling which fields in the course_changed callback are valid</p>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><a name="GYPSY-COURSE-FIELDS-NONE--CAPS"></a><span class="term"><code class="literal">GYPSY_COURSE_FIELDS_NONE</code></span></p></td>
-<td> None of the fields are valid
-</td>
-</tr>
-<tr>
-<td><p><a name="GYPSY-COURSE-FIELDS-SPEED--CAPS"></a><span class="term"><code class="literal">GYPSY_COURSE_FIELDS_SPEED</code></span></p></td>
-<td> The speed field is valid
-</td>
-</tr>
-<tr>
-<td><p><a name="GYPSY-COURSE-FIELDS-DIRECTION--CAPS"></a><span class="term"><code class="literal">GYPSY_COURSE_FIELDS_DIRECTION</code></span></p></td>
-<td> The direction field is valid
-</td>
-</tr>
-<tr>
-<td><p><a name="GYPSY-COURSE-FIELDS-CLIMB--CAPS"></a><span class="term"><code class="literal">GYPSY_COURSE_FIELDS_CLIMB</code></span></p></td>
-<td> The climb field is valid
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="gypsy_course_new ()">
-<a name="gypsy-course-new"></a><h3>gypsy_course_new ()</h3>
-<pre class="programlisting"><a class="link" href="GypsyCourse.html" title="GypsyCourse">GypsyCourse</a> *       gypsy_course_new                    (const char *object_path);</pre>
-<p>
-Creates a new <a class="link" href="GypsyCourse.html" title="GypsyCourse"><span class="type">GypsyCourse</span></a> object that listens for course changes
-from the GPS device found at <em class="parameter"><code>object_path</code></em>.</p>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>object_path</code></em> :</span></p></td>
-<td> Object path to the GPS device.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> A <a class="link" href="GypsyCourse.html" title="GypsyCourse"><span class="type">GypsyCourse</span></a> object
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="gypsy_course_get_course ()">
-<a name="gypsy-course-get-course"></a><h3>gypsy_course_get_course ()</h3>
-<pre class="programlisting"><a class="link" href="GypsyCourse.html#GypsyCourseFields" title="enum GypsyCourseFields">GypsyCourseFields</a>   gypsy_course_get_course             (<a class="link" href="GypsyCourse.html" title="GypsyCourse">GypsyCourse</a> *course,
-                                                         int *timestamp,
-                                                         double *speed,
-                                                         double *direction,
-                                                         double *climb,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);</pre>
-<p>
-Obtains the course details from <em class="parameter"><code>course</code></em>. <em class="parameter"><code>timestamp</code></em>, <em class="parameter"><code>speed</code></em>, <em class="parameter"><code>direction</code></em> and
-<em class="parameter"><code>climb</code></em> can be <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><span class="type">NULL</span></a> if that detail is not required.</p>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>course</code></em> :</span></p></td>
-<td> A <a class="link" href="GypsyCourse.html" title="GypsyCourse"><span class="type">GypsyCourse</span></a> object
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>timestamp</code></em> :</span></p></td>
-<td> Pointer for the timestamp to be returned
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>speed</code></em> :</span></p></td>
-<td> Pointer for the speed to be returned
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>direction</code></em> :</span></p></td>
-<td> Pointer for the direction to be returned
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>climb</code></em> :</span></p></td>
-<td> Pointer for the climb to be returned
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> A <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a> for error return
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> A bitmask of the fields that are set.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-<div class="refsect1" title="Property Details">
-<a name="GypsyCourse.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "object-path" property'>
-<a name="GypsyCourse--object-path"></a><h3>The <code class="literal">"object-path"</code> property</h3>
-<pre class="programlisting">  "object-path"              <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a>*                : Write / Construct Only</pre>
-<p>
-The path of the Gypsy GPS object</p>
-<p>
-</p>
-<p>Default value: ""</p>
-</div>
-</div>
-<div class="refsect1" title="Signal Details">
-<a name="GypsyCourse.signal-details"></a><h2>Signal Details</h2>
-<div class="refsect2" title='The "course-changed" signal'>
-<a name="GypsyCourse-course-changed"></a><h3>The <code class="literal">"course-changed"</code> signal</h3>
-<pre class="programlisting">void                user_function                      (<a class="link" href="GypsyCourse.html" title="GypsyCourse">GypsyCourse</a> *fields,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"
->gint</a>         timestamp,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"
->gint</a>         speed,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"
->gdouble</a>      direction,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"
->gdouble</a>      climb,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"
->gdouble</a>      arg5,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a>     user_data)      : Run First / No Recursion</pre>
-<p>
-The ::course-changed signal is emitted when the GPS device
-indicates that one or more of the course fields has changed.
-The fields which have changed will be indicated in the <em class="parameter"><code>fields</code></em>
-bitmask.</p>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>fields</code></em> :</span></p></td>
-<td> A bitmask of <a class="link" href="GypsyCourse.html#GypsyCourseFields" title="enum GypsyCourseFields"><span class="type">GypsyCourseFields</span></a> indicating which of the following fields are valid
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>timestamp</code></em> :</span></p></td>
-<td> The time this change occurred
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>speed</code></em> :</span></p></td>
-<td> The new speed
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>direction</code></em> :</span></p></td>
-<td> The new direction
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>climb</code></em> :</span></p></td>
-<td> The new rate of climb
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>user data set when the signal handler was connected.</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
-          Generated by GTK-Doc V1.11</div>
-</body>
-</html>
diff --git a/docs/reference/html/GypsyDevice.html b/docs/reference/html/GypsyDevice.html
index 12b190a..faaec70 100644
--- a/docs/reference/html/GypsyDevice.html
+++ b/docs/reference/html/GypsyDevice.html
@@ -8,16 +8,8 @@
 <link rel="up" href="ch03.html" title="GPS Data Objects">
 <link rel="prev" href="ch03.html" title="GPS Data Objects">
 <link rel="next" href="GypsyAccuracy.html" title="GypsyAccuracy">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -30,14 +22,14 @@
 </tr>
 <tr><td colspan="5" class="shortcuts">
 <a href="#GypsyDevice.synopsis" class="shortcut">Top</a>
-                 | 
-                <a href="#GypsyDevice.description" class="shortcut">Description</a>
-                 | 
-                <a href="#GypsyDevice.object-hierarchy" class="shortcut">Object Hierarchy</a>
-                 | 
-                <a href="#GypsyDevice.properties" class="shortcut">Properties</a>
-                 | 
-                <a href="#GypsyDevice.signals" class="shortcut">Signals</a>
+                   | 
+                  <a href="#GypsyDevice.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#GypsyDevice.object-hierarchy" class="shortcut">Object Hierarchy</a>
+                   | 
+                  <a href="#GypsyDevice.properties" class="shortcut">Properties</a>
+                   | 
+                  <a href="#GypsyDevice.signals" class="shortcut">Signals</a>
 </td></tr>
 </table>
 <div class="refentry" title="GypsyDevice">
@@ -51,51 +43,35 @@
 </tr></table></div>
 <div class="refsynopsisdiv" title="Synopsis">
 <a name="GypsyDevice.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-                    <a class="link" href="GypsyDevice.html#GypsyDevice-struct" title="GypsyDevice">GypsyDevice</a>;
-#define             <a class="link" href="GypsyDevice.html#GYPSY-DEVICE-DBUS-SERVICE--CAPS" title="GYPSY_DEVICE_DBUS_SERVICE">GYPSY_DEVICE_DBUS_SERVICE</a>
-#define             <a class="link" href="GypsyDevice.html#GYPSY-DEVICE-DBUS-INTERFACE--CAPS" title="GYPSY_DEVICE_DBUS_INTERFACE">GYPSY_DEVICE_DBUS_INTERFACE</a>
+<pre class="synopsis">                    <a class="link" href="GypsyDevice.html#GypsyDevice-struct" title="GypsyDevice">GypsyDevice</a>;
+#define             <a class="link" href="GypsyDevice.html#GYPSY-DEVICE-DBUS-SERVICE:CAPS" title="GYPSY_DEVICE_DBUS_SERVICE">GYPSY_DEVICE_DBUS_SERVICE</a>
+#define             <a class="link" href="GypsyDevice.html#GYPSY-DEVICE-DBUS-INTERFACE:CAPS" title="GYPSY_DEVICE_DBUS_INTERFACE">GYPSY_DEVICE_DBUS_INTERFACE</a>
 enum                <a class="link" href="GypsyDevice.html#GypsyDeviceFixStatus" title="enum GypsyDeviceFixStatus">GypsyDeviceFixStatus</a>;
-<a class="link" href="GypsyDevice.html" title="GypsyDevice">GypsyDevice</a> *       <a class="link" href="GypsyDevice.html#gypsy-device-new" title="gypsy_device_new ()">gypsy_device_new</a>                    (const char *object_path);
-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
->gboolean</a>            <a class="link" href="GypsyDevice.html#gypsy-device-get-connection-status" title="gypsy_device_get_connection_status ()">gypsy_device_get_connection_status</a>  (<a class="link" href="GypsyDevice.html" title="GypsyDevice">GypsyDevice</a> *device,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);
-<a class="link" href="GypsyDevice.html#GypsyDeviceFixStatus" title="enum GypsyDeviceFixStatus">GypsyDeviceFixStatus</a>  <a class="link" href="GypsyDevice.html#gypsy-device-get-fix-status" title="gypsy_device_get_fix_status ()">gypsy_device_get_fix_status</a>       (<a class="link" href="GypsyDevice.html" title="GypsyDevice">GypsyDevice</a> *device,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);
-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
->gboolean</a>            <a class="link" href="GypsyDevice.html#gypsy-device-start" title="gypsy_device_start ()">gypsy_device_start</a>                  (<a class="link" href="GypsyDevice.html" title="GypsyDevice">GypsyDevice</a> *device,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);
-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
->gboolean</a>            <a class="link" href="GypsyDevice.html#gypsy-device-stop" title="gypsy_device_stop ()">gypsy_device_stop</a>                   (<a class="link" href="GypsyDevice.html" title="GypsyDevice">GypsyDevice</a> *device,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);
+<a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="returnvalue">GypsyDevice</span></a> *       <a class="link" href="GypsyDevice.html#gypsy-device-new" title="gypsy_device_new ()">gypsy_device_new</a>                    (<em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="GypsyDevice.html#gypsy-device-get-connection-status" title="gypsy_device_get_connection_status ()">gypsy_device_get_connection_status</a>  (<em class="parameter"><code><a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a> *device</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
+<a class="link" href="GypsyDevice.html#GypsyDeviceFixStatus" title="enum GypsyDeviceFixStatus"><span class="returnvalue">GypsyDeviceFixStatus</span></a>  <a class="link" href="GypsyDevice.html#gypsy-device-get-fix-status" title="gypsy_device_get_fix_status ()">gypsy_device_get_fix_status</a>       (<em class="parameter"><code><a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a> *device</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="GypsyDevice.html#gypsy-device-set-start-options" title="gypsy_device_set_start_options ()">gypsy_device_set_start_options</a>      (<em class="parameter"><code><a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a> *device</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *options</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="GypsyDevice.html#gypsy-device-start" title="gypsy_device_start ()">gypsy_device_start</a>                  (<em class="parameter"><code><a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a> *device</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="GypsyDevice.html#gypsy-device-stop" title="gypsy_device_stop ()">gypsy_device_stop</a>                   (<em class="parameter"><code><a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a> *device</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Object Hierarchy">
 <a name="GypsyDevice.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
-  <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
->GObject</a>
+  <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----GypsyDevice
 </pre>
 </div>
 <div class="refsect1" title="Properties">
 <a name="GypsyDevice.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
-  "<a class="link" href="GypsyDevice.html#GypsyDevice--object-path" title='The "object-path" property'>object-path</a>"              <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a>*                : Write / Construct Only
+  "<a class="link" href="GypsyDevice.html#GypsyDevice--object-path" title='The "object-path" property'>object-path</a>"              <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Write / Construct Only
 </pre>
 </div>
 <div class="refsect1" title="Signals">
@@ -115,7 +91,7 @@ sentences from the GPS device.
 </p>
 <p>
 A <a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a> object is created using <a class="link" href="GypsyDevice.html#gypsy-device-new" title="gypsy_device_new ()"><code class="function">gypsy_device_new()</code></a> using the D-Bus path of
-the GPS device. This path is returned from the <a class="link" href="GypsyControl.html#gypsy-control-create" title="gypsy_control_create ()"><code class="function">gypsy_control_create()</code></a> 
+the GPS device. This path is returned from the <a class="link" href="gypsy-gypsy-control.html#gypsy-control-create" title="gypsy_control_create ()"><code class="function">gypsy_control_create()</code></a> 
 function. The client can start the GPS data stream with <a class="link" href="GypsyDevice.html#gypsy-device-start" title="gypsy_device_start ()"><code class="function">gypsy_device_start()</code></a>,
 stop it with <a class="link" href="GypsyDevice.html#gypsy-device-stop" title="gypsy_device_stop ()"><code class="function">gypsy_device_stop()</code></a>, or find out about the status with
 <a class="link" href="GypsyDevice.html#gypsy-device-get-fix-status" title="gypsy_device_get_fix_status ()"><code class="function">gypsy_device_get_fix_status()</code></a> and <a class="link" href="GypsyDevice.html#gypsy-device-get-connection-status" title="gypsy_device_get_connection_status ()"><code class="function">gypsy_device_get_connection_status()</code></a>.
@@ -127,28 +103,55 @@ respectively.
 </p>
 <p>
 </p>
-<div class="informalexample"><pre class="programlisting">
-GypsyDevice *device;
-GError *error = NULL;
+<div class="informalexample">
+  <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
+    <tbody>
+      <tr>
+        <td class="listing_lines" align="right"><pre>1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20</pre></td>
+        <td class="listing_code"><pre class="programlisting">GypsyDevice <span class="symbol">*</span>device<span class="symbol">;</span>
+GError <span class="symbol">*</span>error <span class="symbol">=</span> NULL<span class="symbol">;</span>
+
+<span class="symbol">. . .</span>
 
-. . .
+<span class="comment">/* path comes from the &lt;a class=&quot;link&quot; href=&quot;gypsy-gypsy-control.html#gypsy-control-create&quot; title=&quot;gypsy_control_create ()&quot;&gt;gypsy_control_create&lt;/a&gt;() function */</span>
+device <span class="symbol">= &lt;</span>a <span class="gtkdoc kwc">class</span><span class="symbol">=</span><span class="string">&quot;link&quot;</span> href<span class="symbol">=</span><span class="string">&quot;GypsyDevice.html#gypsy-device-new&quot;</span> title<span class="symbol">=</span><span class="string">&quot;gypsy_device_new ()&quot;</span><span class="symbol">&gt;</span>gypsy_device_new<span class="symbol">&lt;/</span>a<span class="symbol">&gt; (</span>path<span class="symbol">);</span>
+<span class="function"><a href="/usr/share/gtk-doc/html/gobject/gobject-Signals.html#g-signal-connect">g_signal_connect</a></span> <span class="symbol">(</span>device<span class="symbol">,</span> <span class="string">&quot;connection-changed&quot;</span><span class="symbol">,</span> <span class="function"><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#G-CALLBACK:CAPS">G_CALLBACK</a></span> <span class="symbol">(</span>connection_changed<span class="symbol">),</span> NULL<span class="symbol">);</span>
+<span class="symbol">&lt;</span>a <span class="gtkdoc kwc">class</span><span class="symbol">=</span><span class="string">&quot;link&quot;</span> href<span class="symbol">=</span><span class="string">&quot;GypsyDevice.html#gypsy-device-start&quot;</span> title<span class="symbol">=</span><span class="string">&quot;gypsy_device_start ()&quot;</span><span class="symbol">&gt;</span>gypsy_device_start<span class="symbol">&lt;/</span>a<span class="symbol">&gt; (</span>device<span class="symbol">, &amp;</span>error<span class="symbol">);</span>
+<span class="keyword">if</span> <span class="symbol">(</span>error <span class="symbol">!=</span> NULL<span class="symbol">) {</span>
+  <span class="function"><a href="/usr/share/gtk-doc/html/glib/glib-Message-Logging.html#g-warning">g_warning</a></span> <span class="symbol">(</span><span class="string">&quot;Error starting GPS: %s&quot;</span><span class="symbol">,</span> error<span class="symbol">-&gt;</span>message<span class="symbol">);</span>
+  <span class="function"><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#g-error-free">g_error_free</a></span> <span class="symbol">(</span>error<span class="symbol">);</span>
+<span class="symbol">}</span>
 
-/* path comes from the <a class="link" href="GypsyControl.html#gypsy-control-create" title="gypsy_control_create ()">gypsy_control_create</a>() function */
-device = <a class="link" href="GypsyDevice.html#gypsy-device-new" title="gypsy_device_new ()">gypsy_device_new</a> (path);
-g_signal_connect (device, "connection-changed", G_CALLBACK (connection_changed), NULL);
-<a class="link" href="GypsyDevice.html#gypsy-device-start" title="gypsy_device_start ()">gypsy_device_start</a> (device, &amp;error);
-if (error != NULL) {
-  g_warning ("Error starting GPS: %s", error-&gt;message);
-  g_error_free (error);
-}
+<span class="symbol">. . .</span>
 
-. . .
+<span class="gtkdoc kwb">static void</span> <span class="function">connection_changed</span> <span class="symbol">(</span>GypsyDevice <span class="symbol">*</span>device<span class="symbol">,</span> gboolean connected<span class="symbol">,</span> gpointer data<span class="symbol">)</span>
+<span class="symbol">{</span>
+  <span class="function"><a href="/usr/share/gtk-doc/html/glib/glib-Warnings-and-Assertions.html#g-print">g_print</a></span> <span class="symbol">(</span><span class="string">&quot;Connection status: %s</span><span class="gtkdoc esc">\n</span><span class="string">&quot;</span><span class="symbol">,</span> connected ? <span class="string">&quot;Connected&quot;</span> <span class="symbol">:</span> <span class="string">&quot;Disconnected&quot;</span><span class="symbol">);</span>
+<span class="symbol">}</span></pre></td>
+      </tr>
+    </tbody>
+  </table>
+</div>
 
-static void connection_changed (GypsyDevice *device, gboolean connected, gpointer data)
-{
-  g_print ("Connection status: %s\n", connected ? "Connected" : "Disconnected");
-}
-</pre></div>
 <p>
 </p>
 </div>
@@ -158,28 +161,25 @@ static void connection_changed (GypsyDevice *device, gboolean connected, gpointe
 <a name="GypsyDevice-struct"></a><h3>GypsyDevice</h3>
 <pre class="programlisting">typedef struct _GypsyDevice GypsyDevice;</pre>
 <p>
-There are no public fields in <a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a>.</p>
-<p>
+There are no public fields in <a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a>.
 </p>
 </div>
 <hr>
 <div class="refsect2" title="GYPSY_DEVICE_DBUS_SERVICE">
-<a name="GYPSY-DEVICE-DBUS-SERVICE--CAPS"></a><h3>GYPSY_DEVICE_DBUS_SERVICE</h3>
+<a name="GYPSY-DEVICE-DBUS-SERVICE:CAPS"></a><h3>GYPSY_DEVICE_DBUS_SERVICE</h3>
 <pre class="programlisting">#define GYPSY_DEVICE_DBUS_SERVICE "org.freedesktop.Gypsy"
 </pre>
 <p>
-A define containing the name of the Device service</p>
-<p>
+A define containing the name of the Device service
 </p>
 </div>
 <hr>
 <div class="refsect2" title="GYPSY_DEVICE_DBUS_INTERFACE">
-<a name="GYPSY-DEVICE-DBUS-INTERFACE--CAPS"></a><h3>GYPSY_DEVICE_DBUS_INTERFACE</h3>
+<a name="GYPSY-DEVICE-DBUS-INTERFACE:CAPS"></a><h3>GYPSY_DEVICE_DBUS_INTERFACE</h3>
 <pre class="programlisting">#define GYPSY_DEVICE_DBUS_INTERFACE "org.freedesktop.Gypsy.Device"
 </pre>
 <p>
-A define containing the name of the Device interface</p>
-<p>
+A define containing the name of the Device interface
 </p>
 </div>
 <hr>
@@ -193,30 +193,29 @@ A define containing the name of the Device interface</p>
 } GypsyDeviceFixStatus;
 </pre>
 <p>
-An enumeration representing the various fix states that a GPS device can be in.</p>
-<p>
+An enumeration representing the various fix states that a GPS device can be in.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
-<td><p><a name="GYPSY-DEVICE-FIX-STATUS-INVALID--CAPS"></a><span class="term"><code class="literal">GYPSY_DEVICE_FIX_STATUS_INVALID</code></span></p></td>
-<td> The fix is invalid
+<td><p><a name="GYPSY-DEVICE-FIX-STATUS-INVALID:CAPS"></a><span class="term"><code class="literal">GYPSY_DEVICE_FIX_STATUS_INVALID</code></span></p></td>
+<td>The fix is invalid
 </td>
 </tr>
 <tr>
-<td><p><a name="GYPSY-DEVICE-FIX-STATUS-NONE--CAPS"></a><span class="term"><code class="literal">GYPSY_DEVICE_FIX_STATUS_NONE</code></span></p></td>
-<td> A fix has not yet been obtained
+<td><p><a name="GYPSY-DEVICE-FIX-STATUS-NONE:CAPS"></a><span class="term"><code class="literal">GYPSY_DEVICE_FIX_STATUS_NONE</code></span></p></td>
+<td>A fix has not yet been obtained
 </td>
 </tr>
 <tr>
-<td><p><a name="GYPSY-DEVICE-FIX-STATUS-2D--CAPS"></a><span class="term"><code class="literal">GYPSY_DEVICE_FIX_STATUS_2D</code></span></p></td>
-<td> A fix with latitude and longitude has been obtained
+<td><p><a name="GYPSY-DEVICE-FIX-STATUS-2D:CAPS"></a><span class="term"><code class="literal">GYPSY_DEVICE_FIX_STATUS_2D</code></span></p></td>
+<td>A fix with latitude and longitude has been obtained
 </td>
 </tr>
 <tr>
-<td><p><a name="GYPSY-DEVICE-FIX-STATUS-3D--CAPS"></a><span class="term"><code class="literal">GYPSY_DEVICE_FIX_STATUS_3D</code></span></p></td>
-<td> A fix with latitude, longitude and altitude has been obtained
+<td><p><a name="GYPSY-DEVICE-FIX-STATUS-3D:CAPS"></a><span class="term"><code class="literal">GYPSY_DEVICE_FIX_STATUS_3D</code></span></p></td>
+<td>A fix with latitude, longitude and altitude has been obtained
 </td>
 </tr>
 </tbody>
@@ -225,17 +224,16 @@ An enumeration representing the various fix states that a GPS device can be in.<
 <hr>
 <div class="refsect2" title="gypsy_device_new ()">
 <a name="gypsy-device-new"></a><h3>gypsy_device_new ()</h3>
-<pre class="programlisting"><a class="link" href="GypsyDevice.html" title="GypsyDevice">GypsyDevice</a> *       gypsy_device_new                    (const char *object_path);</pre>
-<p>
-Creates a new <a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a> that points to <em class="parameter"><code>object_path</code></em></p>
+<pre class="programlisting"><a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="returnvalue">GypsyDevice</span></a> *       gypsy_device_new                    (<em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>);</pre>
 <p>
+Creates a new <a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a> that points to <em class="parameter"><code>object_path</code></em>
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>object_path</code></em> :</span></p></td>
-<td> Object path to the device
+<td>Object path to the device
 </td>
 </tr>
 <tr>
@@ -249,38 +247,27 @@ Creates a new <a class="link" href="GypsyDevice.html" title="GypsyDevice"><span
 <hr>
 <div class="refsect2" title="gypsy_device_get_connection_status ()">
 <a name="gypsy-device-get-connection-status"></a><h3>gypsy_device_get_connection_status ()</h3>
-<pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
->gboolean</a>            gypsy_device_get_connection_status  (<a class="link" href="GypsyDevice.html" title="GypsyDevice">GypsyDevice</a> *device,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);</pre>
-<p>
-Obtains the connection status of <em class="parameter"><code>device</code></em>.</p>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            gypsy_device_get_connection_status  (<em class="parameter"><code><a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a> *device</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
+Obtains the connection status of <em class="parameter"><code>device</code></em>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>device</code></em> :</span></p></td>
-<td> A <a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a>
+<td>A <a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> A pointer to a <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a> to return an error in.
+<td>A pointer to a <a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> to return an error in.
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><span class="type">TRUE</span></a> if the device is connected, <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><span class="type">FALSE</span></a> otherwise.
+<td> <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"><span class="type">TRUE</span></a> if the device is connected, <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"><span class="type">FALSE</span></a> otherwise.
 </td>
 </tr>
 </tbody>
@@ -289,27 +276,22 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FAL
 <hr>
 <div class="refsect2" title="gypsy_device_get_fix_status ()">
 <a name="gypsy-device-get-fix-status"></a><h3>gypsy_device_get_fix_status ()</h3>
-<pre class="programlisting"><a class="link" href="GypsyDevice.html#GypsyDeviceFixStatus" title="enum GypsyDeviceFixStatus">GypsyDeviceFixStatus</a>  gypsy_device_get_fix_status       (<a class="link" href="GypsyDevice.html" title="GypsyDevice">GypsyDevice</a> *device,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);</pre>
-<p>
-Obtains the current fix status of <em class="parameter"><code>device</code></em>.</p>
+<pre class="programlisting"><a class="link" href="GypsyDevice.html#GypsyDeviceFixStatus" title="enum GypsyDeviceFixStatus"><span class="returnvalue">GypsyDeviceFixStatus</span></a>  gypsy_device_get_fix_status       (<em class="parameter"><code><a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a> *device</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
+Obtains the current fix status of <em class="parameter"><code>device</code></em>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>device</code></em> :</span></p></td>
-<td> A <a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a>
+<td>A <a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> A pointer to a <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a> to return a error in.
+<td>A pointer to a <a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> to return a error in.
 </td>
 </tr>
 <tr>
@@ -321,41 +303,67 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GEr
 </table></div>
 </div>
 <hr>
+<div class="refsect2" title="gypsy_device_set_start_options ()">
+<a name="gypsy-device-set-start-options"></a><h3>gypsy_device_set_start_options ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            gypsy_device_set_start_options      (<em class="parameter"><code><a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a> *device</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *options</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>
+Sets options on the device before calling <a class="link" href="GypsyDevice.html#gypsy-device-start" title="gypsy_device_start ()"><span class="type">gypsy_device_start</span></a>.
+The only valid option currently is "BaudRate", used for serial devices.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>device</code></em> :</span></p></td>
+<td>
+<a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>options</code></em> :</span></p></td>
+<td>a <a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> of string keys and <a href="/usr/share/gtk-doc/html/gobject/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> values
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>A pointer to a <a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> to return the error in
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"><span class="type">TRUE</span></a> on success, <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"><span class="type">FALSE</span></a> otherwise.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
 <div class="refsect2" title="gypsy_device_start ()">
 <a name="gypsy-device-start"></a><h3>gypsy_device_start ()</h3>
-<pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
->gboolean</a>            gypsy_device_start                  (<a class="link" href="GypsyDevice.html" title="GypsyDevice">GypsyDevice</a> *device,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            gypsy_device_start                  (<em class="parameter"><code><a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a> *device</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
 Starts the connection to the physical device pointed to by <em class="parameter"><code>device</code></em>, and
-listens for incoming messages.</p>
-<p>
+listens for incoming messages.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>device</code></em> :</span></p></td>
-<td> A <a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a>
+<td>A <a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> A pointer to a <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a> to return the error in
+<td>A pointer to a <a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> to return the error in
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><span class="type">TRUE</span></a> on success, <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><span class="type">FALSE</span></a> otherwise.
+<td> <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"><span class="type">TRUE</span></a> on success, <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"><span class="type">FALSE</span></a> otherwise.
 </td>
 </tr>
 </tbody>
@@ -364,38 +372,27 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FAL
 <hr>
 <div class="refsect2" title="gypsy_device_stop ()">
 <a name="gypsy-device-stop"></a><h3>gypsy_device_stop ()</h3>
-<pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
->gboolean</a>            gypsy_device_stop                   (<a class="link" href="GypsyDevice.html" title="GypsyDevice">GypsyDevice</a> *device,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);</pre>
-<p>
-Stops the physical device pointed to by <em class="parameter"><code>device</code></em>.</p>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            gypsy_device_stop                   (<em class="parameter"><code><a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a> *device</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
+Stops the physical device pointed to by <em class="parameter"><code>device</code></em>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>device</code></em> :</span></p></td>
-<td> A <a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a>
+<td>A <a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> A pointer to a <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a> to return the error in
+<td>A pointer to a <a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> to return the error in
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><span class="type">TRUE</span></a> on success, <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><span class="type">FALSE</span></a> otherwise.
+<td> <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"><span class="type">TRUE</span></a> on success, <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"><span class="type">FALSE</span></a> otherwise.
 </td>
 </tr>
 </tbody>
@@ -406,12 +403,9 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FAL
 <a name="GypsyDevice.property-details"></a><h2>Property Details</h2>
 <div class="refsect2" title='The "object-path" property'>
 <a name="GypsyDevice--object-path"></a><h3>The <code class="literal">"object-path"</code> property</h3>
-<pre class="programlisting">  "object-path"              <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a>*                : Write / Construct Only</pre>
-<p>
-The path of the Gypsy GPS object</p>
+<pre class="programlisting">  "object-path"              <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Write / Construct Only</pre>
 <p>
+The path of the Gypsy GPS object
 </p>
 <p>Default value: ""</p>
 </div>
@@ -420,24 +414,19 @@ The path of the Gypsy GPS object</p>
 <a name="GypsyDevice.signal-details"></a><h2>Signal Details</h2>
 <div class="refsect2" title='The "connection-changed" signal'>
 <a name="GypsyDevice-connection-changed"></a><h3>The <code class="literal">"connection-changed"</code> signal</h3>
-<pre class="programlisting">void                user_function                      (<a class="link" href="GypsyDevice.html" title="GypsyDevice">GypsyDevice</a> *connected,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
->gboolean</a>     arg1,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a>     user_data)      : Run First / No Recursion</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a> *connected,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>     arg1,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>     user_data)      : Run First / No Recursion</pre>
 <p>
 The ::connection-changed signal is emitted whenever the device
-connection changes.</p>
-<p>
+connection changes.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>connected</code></em> :</span></p></td>
-<td> Whether or not the device is connected
+<td>Whether or not the device is connected
 </td>
 </tr>
 <tr>
@@ -450,25 +439,20 @@ connection changes.</p>
 <hr>
 <div class="refsect2" title='The "fix-status-changed" signal'>
 <a name="GypsyDevice-fix-status-changed"></a><h3>The <code class="literal">"fix-status-changed"</code> signal</h3>
-<pre class="programlisting">void                user_function                      (<a class="link" href="GypsyDevice.html" title="GypsyDevice">GypsyDevice</a> *fix_status,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"
->gint</a>         arg1,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a>     user_data)       : Run First / No Recursion</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="GypsyDevice.html" title="GypsyDevice"><span class="type">GypsyDevice</span></a> *fix_status,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a>         arg1,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>     user_data)       : Run First / No Recursion</pre>
 <p>
 The ::fix-status-changed signal is emitted whenever the GPS device
 reports that its fix status has changed. <em class="parameter"><code>fix_status</code></em> is a
-<a class="link" href="GypsyDevice.html#GypsyDeviceFixStatus" title="enum GypsyDeviceFixStatus"><span class="type">GypsyDeviceFixStatus</span></a></p>
-<p>
+<a class="link" href="GypsyDevice.html#GypsyDeviceFixStatus" title="enum GypsyDeviceFixStatus"><span class="type">GypsyDeviceFixStatus</span></a>
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>fix_status</code></em> :</span></p></td>
-<td> The new fix status
+<td>The new fix status
 </td>
 </tr>
 <tr>
@@ -482,6 +466,6 @@ reports that its fix status has changed. <em class="parameter"><code>fix_status<
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/GypsyPosition.html b/docs/reference/html/GypsyPosition.html
index 6e9fd4b..3ebdb1f 100644
--- a/docs/reference/html/GypsyPosition.html
+++ b/docs/reference/html/GypsyPosition.html
@@ -6,23 +6,15 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="index.html" title="Gypsy Reference Manual">
 <link rel="up" href="ch03.html" title="GPS Data Objects">
-<link rel="prev" href="GypsyCourse.html" title="GypsyCourse">
+<link rel="prev" href="gypsy-gypsy-course.html" title="GypsyCourse">
 <link rel="next" href="GypsySatellite.html" title="GypsySatellite">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
-<td><a accesskey="p" href="GypsyCourse.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="gypsy-gypsy-course.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">Gypsy Reference Manual</th>
@@ -30,14 +22,14 @@
 </tr>
 <tr><td colspan="5" class="shortcuts">
 <a href="#GypsyPosition.synopsis" class="shortcut">Top</a>
-                 | 
-                <a href="#GypsyPosition.description" class="shortcut">Description</a>
-                 | 
-                <a href="#GypsyPosition.object-hierarchy" class="shortcut">Object Hierarchy</a>
-                 | 
-                <a href="#GypsyPosition.properties" class="shortcut">Properties</a>
-                 | 
-                <a href="#GypsyPosition.signals" class="shortcut">Signals</a>
+                   | 
+                  <a href="#GypsyPosition.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#GypsyPosition.object-hierarchy" class="shortcut">Object Hierarchy</a>
+                   | 
+                  <a href="#GypsyPosition.properties" class="shortcut">Properties</a>
+                   | 
+                  <a href="#GypsyPosition.signals" class="shortcut">Signals</a>
 </td></tr>
 </table>
 <div class="refentry" title="GypsyPosition">
@@ -51,37 +43,30 @@
 </tr></table></div>
 <div class="refsynopsisdiv" title="Synopsis">
 <a name="GypsyPosition.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-                    <a class="link" href="GypsyPosition.html#GypsyPosition-struct" title="GypsyPosition">GypsyPosition</a>;
-#define             <a class="link" href="GypsyPosition.html#GYPSY-POSITION-DBUS-INTERFACE--CAPS" title="GYPSY_POSITION_DBUS_INTERFACE">GYPSY_POSITION_DBUS_INTERFACE</a>
-#define             <a class="link" href="GypsyPosition.html#GYPSY-POSITION-DBUS-SERVICE--CAPS" title="GYPSY_POSITION_DBUS_SERVICE">GYPSY_POSITION_DBUS_SERVICE</a>
+<pre class="synopsis">                    <a class="link" href="GypsyPosition.html#GypsyPosition-struct" title="GypsyPosition">GypsyPosition</a>;
+#define             <a class="link" href="GypsyPosition.html#GYPSY-POSITION-DBUS-INTERFACE:CAPS" title="GYPSY_POSITION_DBUS_INTERFACE">GYPSY_POSITION_DBUS_INTERFACE</a>
+#define             <a class="link" href="GypsyPosition.html#GYPSY-POSITION-DBUS-SERVICE:CAPS" title="GYPSY_POSITION_DBUS_SERVICE">GYPSY_POSITION_DBUS_SERVICE</a>
 enum                <a class="link" href="GypsyPosition.html#GypsyPositionFields" title="enum GypsyPositionFields">GypsyPositionFields</a>;
-<a class="link" href="GypsyPosition.html" title="GypsyPosition">GypsyPosition</a> *     <a class="link" href="GypsyPosition.html#gypsy-position-new" title="gypsy_position_new ()">gypsy_position_new</a>                  (const char *object_path);
-<a class="link" href="GypsyPosition.html#GypsyPositionFields" title="enum GypsyPositionFields">GypsyPositionFields</a>  <a class="link" href="GypsyPosition.html#gypsy-position-get-position" title="gypsy_position_get_position ()">gypsy_position_get_position</a>        (<a class="link" href="GypsyPosition.html" title="GypsyPosition">GypsyPosition</a> *position,
-                                                         int *timestamp,
-                                                         double *latitude,
-                                                         double *longitude,
-                                                         double *altitude,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);
+<a class="link" href="GypsyPosition.html" title="GypsyPosition"><span class="returnvalue">GypsyPosition</span></a> *     <a class="link" href="GypsyPosition.html#gypsy-position-new" title="gypsy_position_new ()">gypsy_position_new</a>                  (<em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>);
+<a class="link" href="GypsyPosition.html#GypsyPositionFields" title="enum GypsyPositionFields"><span class="returnvalue">GypsyPositionFields</span></a>  <a class="link" href="GypsyPosition.html#gypsy-position-get-position" title="gypsy_position_get_position ()">gypsy_position_get_position</a>        (<em class="parameter"><code><a class="link" href="GypsyPosition.html" title="GypsyPosition"><span class="type">GypsyPosition</span></a> *position</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *timestamp</code></em>,
+                                                         <em class="parameter"><code><span class="type">double</span> *latitude</code></em>,
+                                                         <em class="parameter"><code><span class="type">double</span> *longitude</code></em>,
+                                                         <em class="parameter"><code><span class="type">double</span> *altitude</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Object Hierarchy">
 <a name="GypsyPosition.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
-  <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
->GObject</a>
+  <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----GypsyPosition
 </pre>
 </div>
 <div class="refsect1" title="Properties">
 <a name="GypsyPosition.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
-  "<a class="link" href="GypsyPosition.html#GypsyPosition--object-path" title='The "object-path" property'>object-path</a>"              <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a>*                : Write / Construct Only
+  "<a class="link" href="GypsyPosition.html#GypsyPosition--object-path" title='The "object-path" property'>object-path</a>"              <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Write / Construct Only
 </pre>
 </div>
 <div class="refsect1" title="Signals">
@@ -100,7 +85,7 @@ to notify listeners of changes.
 <p>
 A <a class="link" href="GypsyPosition.html" title="GypsyPosition"><span class="type">GypsyPosition</span></a> object is created using <a class="link" href="GypsyPosition.html#gypsy-position-new" title="gypsy_position_new ()"><code class="function">gypsy_position_new()</code></a> using the 
 D-Bus path of the GPS device. This path is returned from the 
-<a class="link" href="GypsyControl.html#gypsy-control-create" title="gypsy_control_create ()"><code class="function">gypsy_control_create()</code></a> function. The client can then find out about the
+<a class="link" href="gypsy-gypsy-control.html#gypsy-control-create" title="gypsy_control_create ()"><code class="function">gypsy_control_create()</code></a> function. The client can then find out about the
 position with <a class="link" href="GypsyPosition.html#gypsy-position-get-position" title="gypsy_position_get_position ()"><code class="function">gypsy_position_get_position()</code></a>.
 </p>
 <p>
@@ -113,29 +98,57 @@ if it is greater than 0.
 </p>
 <p>
 </p>
-<div class="informalexample"><pre class="programlisting">
-GypsyPosition *position;
-GError *error = NULL;
+<div class="informalexample">
+  <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
+    <tbody>
+      <tr>
+        <td class="listing_lines" align="right"><pre>1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21</pre></td>
+        <td class="listing_code"><pre class="programlisting">GypsyPosition <span class="symbol">*</span>position<span class="symbol">;</span>
+GError <span class="symbol">*</span>error <span class="symbol">=</span> NULL<span class="symbol">;</span>
+
+<span class="symbol">. . .</span>
 
-. . .
+<span class="symbol">/ *</span> path comes from the <span class="function"><a href="gypsy-gypsy-control.html#gypsy-control-create">gypsy_control_create</a></span><span class="symbol">()</span> function <span class="symbol">* /</span>
+position <span class="symbol">=</span> <span class="function"><a href="GypsyPosition.html#gypsy-position-new">gypsy_position_new</a></span> <span class="symbol">(</span>path<span class="symbol">);</span>
+<span class="function"><a href="/usr/share/gtk-doc/html/gobject/gobject-Signals.html#g-signal-connect">g_signal_connect</a></span> <span class="symbol">(</span>position<span class="symbol">,</span> <span class="string">&quot;position-changed&quot;</span><span class="symbol">,</span> <span class="function"><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#G-CALLBACK:CAPS">G_CALLBACK</a></span> <span class="symbol">(</span>position_changed<span class="symbol">),</span> NULL<span class="symbol">);</span>
 
-/ * path comes from the gypsy_control_create() function * /
-position = gypsy_position_new (path);
-g_signal_connect (position, "position-changed", G_CALLBACK (position_changed), NULL);
+<span class="symbol">. . .</span>
 
-. . .
+<span class="gtkdoc kwb">static void</span> <span class="function">position_changed</span> <span class="symbol">(</span>GypsyPosition <span class="symbol">*</span>position<span class="symbol">,</span> 
+GypsyPositionFields fields<span class="symbol">,</span>
+<span class="gtkdoc kwb">int</span> timestamp<span class="symbol">,</span>
+<span class="gtkdoc kwb">double</span> latitude<span class="symbol">,</span>
+<span class="gtkdoc kwb">double</span> longitude<span class="symbol">,</span>
+<span class="gtkdoc kwb">double</span> altitude<span class="symbol">,</span>
+gpointer userdata<span class="symbol">)</span>
+<span class="symbol">{</span>
+  <span class="function"><a href="/usr/share/gtk-doc/html/glib/glib-Warnings-and-Assertions.html#g-print">g_print</a></span> <span class="symbol">(</span><span class="string">&quot;latitude, longitude (%f, %f)</span><span class="gtkdoc esc">\n</span><span class="string">&quot;</span><span class="symbol">, (</span>fields <span class="symbol">&amp;</span> GYPSY_POSITION_FIELDS_LATITUDE<span class="symbol">)</span> ? latitude <span class="symbol">: -</span><span class="number">1.0</span><span class="symbol">, (</span>fields <span class="symbol">&amp;</span> GYPSY_POSITION_FIELDS_LONGITUDE<span class="symbol">)</span> ? longitude <span class="symbol">: -</span><span class="number">1.0</span><span class="symbol">);</span>
+<span class="symbol">}</span></pre></td>
+      </tr>
+    </tbody>
+  </table>
+</div>
 
-static void position_changed (GypsyPosition *position, 
-GypsyPositionFields fields,
-int timestamp,
-double latitude,
-double longitude,
-double altitude,
-gpointer userdata)
-{
-  g_print ("latitude, longitude (%f, %f)\n", (fields &amp; GYPSY_POSITION_FIELDS_LATITUDE) ? latitude : -1.0, (fields &amp; GYPSY_POSITION_FIELDS_LONGITUDE) ? longitude : -1.0);
-}
-</pre></div>
 <p>
 </p>
 </div>
@@ -145,28 +158,25 @@ gpointer userdata)
 <a name="GypsyPosition-struct"></a><h3>GypsyPosition</h3>
 <pre class="programlisting">typedef struct _GypsyPosition GypsyPosition;</pre>
 <p>
-There are no public fields in <a class="link" href="GypsyPosition.html" title="GypsyPosition"><span class="type">GypsyPosition</span></a>.</p>
-<p>
+There are no public fields in <a class="link" href="GypsyPosition.html" title="GypsyPosition"><span class="type">GypsyPosition</span></a>.
 </p>
 </div>
 <hr>
 <div class="refsect2" title="GYPSY_POSITION_DBUS_INTERFACE">
-<a name="GYPSY-POSITION-DBUS-INTERFACE--CAPS"></a><h3>GYPSY_POSITION_DBUS_INTERFACE</h3>
+<a name="GYPSY-POSITION-DBUS-INTERFACE:CAPS"></a><h3>GYPSY_POSITION_DBUS_INTERFACE</h3>
 <pre class="programlisting">#define GYPSY_POSITION_DBUS_INTERFACE "org.freedesktop.Gypsy.Position"
 </pre>
 <p>
-A define containing the name of the Position interface</p>
-<p>
+A define containing the name of the Position interface
 </p>
 </div>
 <hr>
 <div class="refsect2" title="GYPSY_POSITION_DBUS_SERVICE">
-<a name="GYPSY-POSITION-DBUS-SERVICE--CAPS"></a><h3>GYPSY_POSITION_DBUS_SERVICE</h3>
+<a name="GYPSY-POSITION-DBUS-SERVICE:CAPS"></a><h3>GYPSY_POSITION_DBUS_SERVICE</h3>
 <pre class="programlisting">#define GYPSY_POSITION_DBUS_SERVICE "org.freedesktop.Gypsy"
 </pre>
 <p>
-A define containing the address of the Position service</p>
-<p>
+A define containing the address of the Position service
 </p>
 </div>
 <hr>
@@ -180,30 +190,29 @@ A define containing the address of the Position service</p>
 } GypsyPositionFields;
 </pre>
 <p>
-A bitmask telling which fields in the position_changed callback are valid</p>
-<p>
+A bitmask telling which fields in the position_changed callback are valid
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
-<td><p><a name="GYPSY-POSITION-FIELDS-NONE--CAPS"></a><span class="term"><code class="literal">GYPSY_POSITION_FIELDS_NONE</code></span></p></td>
-<td> None of the fields are valid
+<td><p><a name="GYPSY-POSITION-FIELDS-NONE:CAPS"></a><span class="term"><code class="literal">GYPSY_POSITION_FIELDS_NONE</code></span></p></td>
+<td>None of the fields are valid
 </td>
 </tr>
 <tr>
-<td><p><a name="GYPSY-POSITION-FIELDS-LATITUDE--CAPS"></a><span class="term"><code class="literal">GYPSY_POSITION_FIELDS_LATITUDE</code></span></p></td>
-<td> The latitude field is valid
+<td><p><a name="GYPSY-POSITION-FIELDS-LATITUDE:CAPS"></a><span class="term"><code class="literal">GYPSY_POSITION_FIELDS_LATITUDE</code></span></p></td>
+<td>The latitude field is valid
 </td>
 </tr>
 <tr>
-<td><p><a name="GYPSY-POSITION-FIELDS-LONGITUDE--CAPS"></a><span class="term"><code class="literal">GYPSY_POSITION_FIELDS_LONGITUDE</code></span></p></td>
-<td> The longitude field is valid
+<td><p><a name="GYPSY-POSITION-FIELDS-LONGITUDE:CAPS"></a><span class="term"><code class="literal">GYPSY_POSITION_FIELDS_LONGITUDE</code></span></p></td>
+<td>The longitude field is valid
 </td>
 </tr>
 <tr>
-<td><p><a name="GYPSY-POSITION-FIELDS-ALTITUDE--CAPS"></a><span class="term"><code class="literal">GYPSY_POSITION_FIELDS_ALTITUDE</code></span></p></td>
-<td> The altitude field is valid
+<td><p><a name="GYPSY-POSITION-FIELDS-ALTITUDE:CAPS"></a><span class="term"><code class="literal">GYPSY_POSITION_FIELDS_ALTITUDE</code></span></p></td>
+<td>The altitude field is valid
 </td>
 </tr>
 </tbody>
@@ -212,18 +221,17 @@ A bitmask telling which fields in the position_changed callback are valid</p>
 <hr>
 <div class="refsect2" title="gypsy_position_new ()">
 <a name="gypsy-position-new"></a><h3>gypsy_position_new ()</h3>
-<pre class="programlisting"><a class="link" href="GypsyPosition.html" title="GypsyPosition">GypsyPosition</a> *     gypsy_position_new                  (const char *object_path);</pre>
+<pre class="programlisting"><a class="link" href="GypsyPosition.html" title="GypsyPosition"><span class="returnvalue">GypsyPosition</span></a> *     gypsy_position_new                  (<em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>);</pre>
 <p>
 Creates a new <a class="link" href="GypsyPosition.html" title="GypsyPosition"><span class="type">GypsyPosition</span></a> object that listens for position changes
-from the GPS found at <em class="parameter"><code>object_path</code></em>.</p>
-<p>
+from the GPS found at <em class="parameter"><code>object_path</code></em>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>object_path</code></em> :</span></p></td>
-<td> Object path to the GPS device
+<td>Object path to the GPS device
 </td>
 </tr>
 <tr>
@@ -237,55 +245,48 @@ from the GPS found at <em class="parameter"><code>object_path</code></em>.</p>
 <hr>
 <div class="refsect2" title="gypsy_position_get_position ()">
 <a name="gypsy-position-get-position"></a><h3>gypsy_position_get_position ()</h3>
-<pre class="programlisting"><a class="link" href="GypsyPosition.html#GypsyPositionFields" title="enum GypsyPositionFields">GypsyPositionFields</a>  gypsy_position_get_position        (<a class="link" href="GypsyPosition.html" title="GypsyPosition">GypsyPosition</a> *position,
-                                                         int *timestamp,
-                                                         double *latitude,
-                                                         double *longitude,
-                                                         double *altitude,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);</pre>
+<pre class="programlisting"><a class="link" href="GypsyPosition.html#GypsyPositionFields" title="enum GypsyPositionFields"><span class="returnvalue">GypsyPositionFields</span></a>  gypsy_position_get_position        (<em class="parameter"><code><a class="link" href="GypsyPosition.html" title="GypsyPosition"><span class="type">GypsyPosition</span></a> *position</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *timestamp</code></em>,
+                                                         <em class="parameter"><code><span class="type">double</span> *latitude</code></em>,
+                                                         <em class="parameter"><code><span class="type">double</span> *longitude</code></em>,
+                                                         <em class="parameter"><code><span class="type">double</span> *altitude</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
 Obtains the current position, if known, from the GPS device.
-<em class="parameter"><code>timestamp</code></em>, <em class="parameter"><code>latitude</code></em>, <em class="parameter"><code>longitude</code></em> and <em class="parameter"><code>altitude</code></em> can be <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><span class="type">NULL</span></a> if the result
-is not required.</p>
-<p>
+<em class="parameter"><code>timestamp</code></em>, <em class="parameter"><code>latitude</code></em>, <em class="parameter"><code>longitude</code></em> and <em class="parameter"><code>altitude</code></em> can be <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if the result
+is not required.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>position</code></em> :</span></p></td>
-<td> A <a class="link" href="GypsyPosition.html" title="GypsyPosition"><span class="type">GypsyPosition</span></a>
+<td>A <a class="link" href="GypsyPosition.html" title="GypsyPosition"><span class="type">GypsyPosition</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>timestamp</code></em> :</span></p></td>
-<td> Pointer to store the timestamp
+<td>Pointer to store the timestamp
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>latitude</code></em> :</span></p></td>
-<td> Pointer to store the latitude
+<td>Pointer to store the latitude
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>longitude</code></em> :</span></p></td>
-<td> Pointer to store the longitude
+<td>Pointer to store the longitude
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>altitude</code></em> :</span></p></td>
-<td> Pointer to store the altitude
+<td>Pointer to store the altitude
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> Pointer to store a <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a>
+<td>Pointer to store a <a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>
 </td>
 </tr>
 <tr>
@@ -301,12 +302,9 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GEr
 <a name="GypsyPosition.property-details"></a><h2>Property Details</h2>
 <div class="refsect2" title='The "object-path" property'>
 <a name="GypsyPosition--object-path"></a><h3>The <code class="literal">"object-path"</code> property</h3>
-<pre class="programlisting">  "object-path"              <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a>*                : Write / Construct Only</pre>
-<p>
-The path of the Gypsy GPS object</p>
+<pre class="programlisting">  "object-path"              <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Write / Construct Only</pre>
 <p>
+The path of the Gypsy GPS object
 </p>
 <p>Default value: ""</p>
 </div>
@@ -315,58 +313,45 @@ The path of the Gypsy GPS object</p>
 <a name="GypsyPosition.signal-details"></a><h2>Signal Details</h2>
 <div class="refsect2" title='The "position-changed" signal'>
 <a name="GypsyPosition-position-changed"></a><h3>The <code class="literal">"position-changed"</code> signal</h3>
-<pre class="programlisting">void                user_function                      (<a class="link" href="GypsyPosition.html" title="GypsyPosition">GypsyPosition</a> *fields,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"
->gint</a>           timestamp,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"
->gint</a>           latitude,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"
->gdouble</a>        longitude,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"
->gdouble</a>        altitude,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"
->gdouble</a>        arg5,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a>       user_data)      : Run First / No Recursion</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="GypsyPosition.html" title="GypsyPosition"><span class="type">GypsyPosition</span></a> *fields,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a>           timestamp,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a>           latitude,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a>        longitude,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a>        altitude,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a>        arg5,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>       user_data)      : Run First / No Recursion</pre>
 <p>
 The ::position-changed signal is emitted when the GPS device
 indicates that one or more of the position fields has changed.
 The fields which have changed will be indicated in the <em class="parameter"><code>fields</code></em>
-bitmask.</p>
-<p>
+bitmask.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>fields</code></em> :</span></p></td>
-<td> A bitmask of <a class="link" href="GypsyPosition.html#GypsyPositionFields" title="enum GypsyPositionFields"><span class="type">GypsyPositionFields</span></a> indicating which of the following fields are valid
+<td>A bitmask of <a class="link" href="GypsyPosition.html#GypsyPositionFields" title="enum GypsyPositionFields"><span class="type">GypsyPositionFields</span></a> indicating which of the following fields are valid
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>timestamp</code></em> :</span></p></td>
-<td> The timestamp when this change occurred
+<td>The timestamp when this change occurred
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>latitude</code></em> :</span></p></td>
-<td> The new latitude
+<td>The new latitude
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>longitude</code></em> :</span></p></td>
-<td> The new longitude
+<td>The new longitude
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>altitude</code></em> :</span></p></td>
-<td> The new altitude
+<td>The new altitude
 </td>
 </tr>
 <tr>
@@ -380,6 +365,6 @@ bitmask.</p>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/GypsySatellite.html b/docs/reference/html/GypsySatellite.html
index fa8e9ea..48567a4 100644
--- a/docs/reference/html/GypsySatellite.html
+++ b/docs/reference/html/GypsySatellite.html
@@ -8,16 +8,8 @@
 <link rel="up" href="ch03.html" title="GPS Data Objects">
 <link rel="prev" href="GypsyPosition.html" title="GypsyPosition">
 <link rel="next" href="gypsy-GypsyTime.html" title="GypsyTime">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -30,14 +22,14 @@
 </tr>
 <tr><td colspan="5" class="shortcuts">
 <a href="#GypsySatellite.synopsis" class="shortcut">Top</a>
-                 | 
-                <a href="#GypsySatellite.description" class="shortcut">Description</a>
-                 | 
-                <a href="#GypsySatellite.object-hierarchy" class="shortcut">Object Hierarchy</a>
-                 | 
-                <a href="#GypsySatellite.properties" class="shortcut">Properties</a>
-                 | 
-                <a href="#GypsySatellite.signals" class="shortcut">Signals</a>
+                   | 
+                  <a href="#GypsySatellite.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#GypsySatellite.object-hierarchy" class="shortcut">Object Hierarchy</a>
+                   | 
+                  <a href="#GypsySatellite.properties" class="shortcut">Properties</a>
+                   | 
+                  <a href="#GypsySatellite.signals" class="shortcut">Signals</a>
 </td></tr>
 </table>
 <div class="refentry" title="GypsySatellite">
@@ -51,39 +43,28 @@
 </tr></table></div>
 <div class="refsynopsisdiv" title="Synopsis">
 <a name="GypsySatellite.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-                    <a class="link" href="GypsySatellite.html#GypsySatellite-struct" title="GypsySatellite">GypsySatellite</a>;
-#define             <a class="link" href="GypsySatellite.html#GYPSY-SATELLITE-DBUS-INTERFACE--CAPS" title="GYPSY_SATELLITE_DBUS_INTERFACE">GYPSY_SATELLITE_DBUS_INTERFACE</a>
-#define             <a class="link" href="GypsySatellite.html#GYPSY-SATELLITE-DBUS-SERVICE--CAPS" title="GYPSY_SATELLITE_DBUS_SERVICE">GYPSY_SATELLITE_DBUS_SERVICE</a>
+<pre class="synopsis">                    <a class="link" href="GypsySatellite.html#GypsySatellite-struct" title="GypsySatellite">GypsySatellite</a>;
+#define             <a class="link" href="GypsySatellite.html#GYPSY-SATELLITE-DBUS-INTERFACE:CAPS" title="GYPSY_SATELLITE_DBUS_INTERFACE">GYPSY_SATELLITE_DBUS_INTERFACE</a>
+#define             <a class="link" href="GypsySatellite.html#GYPSY-SATELLITE-DBUS-SERVICE:CAPS" title="GYPSY_SATELLITE_DBUS_SERVICE">GYPSY_SATELLITE_DBUS_SERVICE</a>
                     <a class="link" href="GypsySatellite.html#GypsySatelliteDetails" title="GypsySatelliteDetails">GypsySatelliteDetails</a>;
-<a class="link" href="GypsySatellite.html" title="GypsySatellite">GypsySatellite</a> *    <a class="link" href="GypsySatellite.html#gypsy-satellite-new" title="gypsy_satellite_new ()">gypsy_satellite_new</a>                 (const char *object_path);
-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"
->GPtrArray</a> *         <a class="link" href="GypsySatellite.html#gypsy-satellite-get-satellites" title="gypsy_satellite_get_satellites ()">gypsy_satellite_get_satellites</a>      (<a class="link" href="GypsySatellite.html" title="GypsySatellite">GypsySatellite</a> *satellite,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);
-void                <a class="link" href="GypsySatellite.html#gypsy-satellite-free-satellite-array" title="gypsy_satellite_free_satellite_array ()">gypsy_satellite_free_satellite_array</a>
-                                                        (<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"
->GPtrArray</a> *satellites);
+<a class="link" href="GypsySatellite.html" title="GypsySatellite"><span class="returnvalue">GypsySatellite</span></a> *    <a class="link" href="GypsySatellite.html#gypsy-satellite-new" title="gypsy_satellite_new ()">gypsy_satellite_new</a>                 (<em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *         <a class="link" href="GypsySatellite.html#gypsy-satellite-get-satellites" title="gypsy_satellite_get_satellites ()">gypsy_satellite_get_satellites</a>      (<em class="parameter"><code><a class="link" href="GypsySatellite.html" title="GypsySatellite"><span class="type">GypsySatellite</span></a> *satellite</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="GypsySatellite.html#gypsy-satellite-free-satellite-array" title="gypsy_satellite_free_satellite_array ()">gypsy_satellite_free_satellite_array</a>
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *satellites</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Object Hierarchy">
 <a name="GypsySatellite.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
-  <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
->GObject</a>
+  <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject">GObject</a>
    +----GypsySatellite
 </pre>
 </div>
 <div class="refsect1" title="Properties">
 <a name="GypsySatellite.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
-  "<a class="link" href="GypsySatellite.html#GypsySatellite--object-path" title='The "object-path" property'>object-path</a>"              <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a>*                : Write / Construct Only
+  "<a class="link" href="GypsySatellite.html#GypsySatellite--object-path" title='The "object-path" property'>object-path</a>"              <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Write / Construct Only
 </pre>
 </div>
 <div class="refsect1" title="Signals">
@@ -103,7 +84,7 @@ ID number (the PRN), the elevation, the azimuth, the signal-to-noise ratio
 <p>
 A <a class="link" href="GypsySatellite.html" title="GypsySatellite"><span class="type">GypsySatellite</span></a> object is created using <a class="link" href="GypsySatellite.html#gypsy-satellite-new" title="gypsy_satellite_new ()"><code class="function">gypsy_satellite_new()</code></a> using the 
 D-Bus path of the GPS device. This path is returned from the 
-<a class="link" href="GypsyControl.html#gypsy-control-create" title="gypsy_control_create ()"><code class="function">gypsy_control_create()</code></a> function. The client can then find out about the
+<a class="link" href="gypsy-gypsy-control.html#gypsy-control-create" title="gypsy_control_create ()"><code class="function">gypsy_control_create()</code></a> function. The client can then find out about the
 visible satellites with <a class="link" href="GypsySatellite.html#gypsy-satellite-get-satellites" title="gypsy_satellite_get_satellites ()"><code class="function">gypsy_satellite_get_satellites()</code></a> which returns a
 GPtrArray containing the <a class="link" href="GypsySatellite.html#GypsySatelliteDetails" title="GypsySatelliteDetails"><span class="type">GypsySatelliteDetails</span></a> for each visible satellite.
 Once the client is finished with this GPtrArray 
@@ -122,30 +103,59 @@ signal will be emitted at a rate of once every second.
 </p>
 <p>
 </p>
-<div class="informalexample"><pre class="programlisting">
-GypsySatellite *satellite;
-GError *error = NULL;
+<div class="informalexample">
+  <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
+    <tbody>
+      <tr>
+        <td class="listing_lines" align="right"><pre>1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22</pre></td>
+        <td class="listing_code"><pre class="programlisting">GypsySatellite <span class="symbol">*</span>satellite<span class="symbol">;</span>
+GError <span class="symbol">*</span>error <span class="symbol">=</span> NULL<span class="symbol">;</span>
+
+<span class="symbol">. . .</span>
 
-. . .
+<span class="symbol">/ *</span> path comes from the <span class="function"><a href="gypsy-gypsy-control.html#gypsy-control-create">gypsy_control_create</a></span><span class="symbol">()</span> function <span class="symbol">* /</span>
+satellite <span class="symbol">=</span> <span class="function"><a href="GypsySatellite.html#gypsy-satellite-new">gypsy_satellite_new</a></span> <span class="symbol">(</span>path<span class="symbol">);</span>
+<span class="function"><a href="/usr/share/gtk-doc/html/gobject/gobject-Signals.html#g-signal-connect">g_signal_connect</a></span> <span class="symbol">(</span>satellite<span class="symbol">,</span> <span class="string">&quot;satellite-changed&quot;</span><span class="symbol">,</span> <span class="function"><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#G-CALLBACK:CAPS">G_CALLBACK</a></span> <span class="symbol">(</span>satellite_changed<span class="symbol">),</span> NULL<span class="symbol">);</span>
 
-/ * path comes from the gypsy_control_create() function * /
-satellite = gypsy_satellite_new (path);
-g_signal_connect (satellite, "satellite-changed", G_CALLBACK (satellite_changed), NULL);
+<span class="symbol">. . .</span>
 
-. . .
+<span class="gtkdoc kwb">static void</span> <span class="function">satellite_changed</span> <span class="symbol">(</span>GypsySatellite <span class="symbol">*</span>satellite<span class="symbol">,</span> 
+GPtrArray <span class="symbol">*</span>satellites<span class="symbol">,</span>
+gpointer userdata<span class="symbol">)</span>
+<span class="symbol">{</span>
+  <span class="gtkdoc kwb">int</span> i<span class="symbol">;</span>
 
-static void satellite_changed (GypsySatellite *satellite, 
-GPtrArray *satellites,
-gpointer userdata)
-{
-  int i;
+  <span class="keyword">for</span> <span class="symbol">(</span>i <span class="symbol">=</span> <span class="number">0</span><span class="symbol">;</span> i <span class="symbol">&lt;</span> satellites<span class="symbol">-&gt;</span>len<span class="symbol">;</span> i<span class="symbol">++) {</span>
+    GypsySatelliteDetails <span class="symbol">*</span>details <span class="symbol">=</span> satellites<span class="symbol">-&gt;</span>pdata<span class="symbol">[</span>i<span class="symbol">];</span>
+    <span class="function"><a href="/usr/share/gtk-doc/html/glib/glib-Warnings-and-Assertions.html#g-print">g_print</a></span> <span class="symbol">(</span><span class="string">&quot;Satellite %d: %s&quot;</span><span class="symbol">,</span> details<span class="symbol">-&gt;</span>satellite_id<span class="symbol">,</span> details<span class="symbol">-&gt;</span>in_use ? <span class="string">&quot;In use&quot;</span> <span class="symbol">:</span> <span class="string">&quot;Not in use&quot;</span><span class="symbol">);</span>
+  <span class="symbol">}</span>
+<span class="symbol">}</span></pre></td>
+      </tr>
+    </tbody>
+  </table>
+</div>
 
-  for (i = 0; i &lt; satellites-&gt;len; i++) {
-    GypsySatelliteDetails *details = satellites-&gt;pdata[i];
-    g_print ("Satellite %d: %s", details-&gt;satellite_id, details-&gt;in_use ? "In use" : "Not in use");
-  }
-}
-</pre></div>
 <p>
 </p>
 </div>
@@ -155,28 +165,25 @@ gpointer userdata)
 <a name="GypsySatellite-struct"></a><h3>GypsySatellite</h3>
 <pre class="programlisting">typedef struct _GypsySatellite GypsySatellite;</pre>
 <p>
-There are no public fields in <a class="link" href="GypsySatellite.html" title="GypsySatellite"><span class="type">GypsySatellite</span></a>.</p>
-<p>
+There are no public fields in <a class="link" href="GypsySatellite.html" title="GypsySatellite"><span class="type">GypsySatellite</span></a>.
 </p>
 </div>
 <hr>
 <div class="refsect2" title="GYPSY_SATELLITE_DBUS_INTERFACE">
-<a name="GYPSY-SATELLITE-DBUS-INTERFACE--CAPS"></a><h3>GYPSY_SATELLITE_DBUS_INTERFACE</h3>
+<a name="GYPSY-SATELLITE-DBUS-INTERFACE:CAPS"></a><h3>GYPSY_SATELLITE_DBUS_INTERFACE</h3>
 <pre class="programlisting">#define GYPSY_SATELLITE_DBUS_INTERFACE "org.freedesktop.Gypsy.Satellite"
 </pre>
 <p>
-A define containing the name of the Satellite interface</p>
-<p>
+A define containing the name of the Satellite interface
 </p>
 </div>
 <hr>
 <div class="refsect2" title="GYPSY_SATELLITE_DBUS_SERVICE">
-<a name="GYPSY-SATELLITE-DBUS-SERVICE--CAPS"></a><h3>GYPSY_SATELLITE_DBUS_SERVICE</h3>
+<a name="GYPSY-SATELLITE-DBUS-SERVICE:CAPS"></a><h3>GYPSY_SATELLITE_DBUS_SERVICE</h3>
 <pre class="programlisting">#define GYPSY_SATELLITE_DBUS_SERVICE "org.freedesktop.Gypsy"
 </pre>
 <p>
-A define containing the address of the Satellite service.</p>
-<p>
+A define containing the address of the Satellite service.
 </p>
 </div>
 <hr>
@@ -191,43 +198,34 @@ A define containing the address of the Satellite service.</p>
 } GypsySatelliteDetails;
 </pre>
 <p>
-A structure defining a satellite</p>
-<p>
+A structure defining a satellite
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
-<td><p><span class="term">int <em class="structfield"><code>satellite_id</code></em>;</span></p></td>
-<td> The satellite PRN id
+<td><p><span class="term"><span class="type">int</span> <em class="structfield"><code><a name="GypsySatelliteDetails.satellite-id"></a>satellite_id</code></em>;</span></p></td>
+<td>The satellite PRN id
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
->gboolean</a> <em class="structfield"><code>in_use</code></em>;</span></p></td>
-<td> Whether this satellite was used in calculating the fix
+<td><p><span class="term"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> <em class="structfield"><code><a name="GypsySatelliteDetails.in-use"></a>in_use</code></em>;</span></p></td>
+<td>Whether this satellite was used in calculating the fix
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> <em class="structfield"><code>elevation</code></em>;</span></p></td>
-<td> The satellite elevation
+<td><p><span class="term"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="GypsySatelliteDetails.elevation"></a>elevation</code></em>;</span></p></td>
+<td>The satellite elevation
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> <em class="structfield"><code>azimuth</code></em>;</span></p></td>
-<td> The satellite azimuth
+<td><p><span class="term"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="GypsySatelliteDetails.azimuth"></a>azimuth</code></em>;</span></p></td>
+<td>The satellite azimuth
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> <em class="structfield"><code>snr</code></em>;</span></p></td>
-<td> The signal to noise ratio
+<td><p><span class="term"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="GypsySatelliteDetails.snr"></a>snr</code></em>;</span></p></td>
+<td>The signal to noise ratio
 </td>
 </tr>
 </tbody>
@@ -236,18 +234,17 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
 <hr>
 <div class="refsect2" title="gypsy_satellite_new ()">
 <a name="gypsy-satellite-new"></a><h3>gypsy_satellite_new ()</h3>
-<pre class="programlisting"><a class="link" href="GypsySatellite.html" title="GypsySatellite">GypsySatellite</a> *    gypsy_satellite_new                 (const char *object_path);</pre>
+<pre class="programlisting"><a class="link" href="GypsySatellite.html" title="GypsySatellite"><span class="returnvalue">GypsySatellite</span></a> *    gypsy_satellite_new                 (<em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>);</pre>
 <p>
 Creates a new <a class="link" href="GypsySatellite.html" title="GypsySatellite"><span class="type">GypsySatellite</span></a> object that listens for satellite changes
-from the GPS found at <em class="parameter"><code>object_path</code></em>.</p>
-<p>
+from the GPS found at <em class="parameter"><code>object_path</code></em>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>object_path</code></em> :</span></p></td>
-<td> Object path to the GPS device
+<td>Object path to the GPS device
 </td>
 </tr>
 <tr>
@@ -261,39 +258,28 @@ from the GPS found at <em class="parameter"><code>object_path</code></em>.</p>
 <hr>
 <div class="refsect2" title="gypsy_satellite_get_satellites ()">
 <a name="gypsy-satellite-get-satellites"></a><h3>gypsy_satellite_get_satellites ()</h3>
-<pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"
->GPtrArray</a> *         gypsy_satellite_get_satellites      (<a class="link" href="GypsySatellite.html" title="GypsySatellite">GypsySatellite</a> *satellite,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *         gypsy_satellite_get_satellites      (<em class="parameter"><code><a class="link" href="GypsySatellite.html" title="GypsySatellite"><span class="type">GypsySatellite</span></a> *satellite</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
 Retrieves the <a class="link" href="GypsySatellite.html#GypsySatelliteDetails" title="GypsySatelliteDetails"><span class="type">GypsySatelliteDetails</span></a> about the satellites that the 
-GPS is able to see.</p>
-<p>
+GPS is able to see.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>satellite</code></em> :</span></p></td>
-<td> A <a class="link" href="GypsySatellite.html" title="GypsySatellite"><span class="type">GypsySatellite</span></a>
+<td>A <a class="link" href="GypsySatellite.html" title="GypsySatellite"><span class="type">GypsySatellite</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> A <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a> for error return
+<td>A <a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> for error return
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> A <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"
-><span class="type">GPtrArray</span></a> of <a class="link" href="GypsySatellite.html#GypsySatelliteDetails" title="GypsySatelliteDetails"><span class="type">GypsySatelliteDetails</span></a> or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><span class="type">NULL</span></a> on error. 
+<td> A <a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> of <a class="link" href="GypsySatellite.html#GypsySatelliteDetails" title="GypsySatelliteDetails"><span class="type">GypsySatelliteDetails</span></a> or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> on error. 
 Should be freed using <a class="link" href="GypsySatellite.html#gypsy-satellite-free-satellite-array" title="gypsy_satellite_free_satellite_array ()"><code class="function">gypsy_satellite_free_satellite_array()</code></a>.
 </td>
 </tr>
@@ -303,21 +289,17 @@ Should be freed using <a class="link" href="GypsySatellite.html#gypsy-satellite-
 <hr>
 <div class="refsect2" title="gypsy_satellite_free_satellite_array ()">
 <a name="gypsy-satellite-free-satellite-array"></a><h3>gypsy_satellite_free_satellite_array ()</h3>
-<pre class="programlisting">void                gypsy_satellite_free_satellite_array
-                                                        (<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"
->GPtrArray</a> *satellites);</pre>
-<p>
-Frees all resources used in the array.</p>
+<pre class="programlisting"><span class="returnvalue">void</span>                gypsy_satellite_free_satellite_array
+                                                        (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *satellites</code></em>);</pre>
 <p>
+Frees all resources used in the array.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>satellites</code></em> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"
-><span class="type">GPtrArray</span></a> containing <a class="link" href="GypsySatellite.html#GypsySatelliteDetails" title="GypsySatelliteDetails"><span class="type">GypsySatelliteDetails</span></a>
+<td>
+<a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing <a class="link" href="GypsySatellite.html#GypsySatelliteDetails" title="GypsySatelliteDetails"><span class="type">GypsySatelliteDetails</span></a>
 </td>
 </tr></tbody>
 </table></div>
@@ -327,9 +309,7 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtr
 <a name="GypsySatellite.property-details"></a><h2>Property Details</h2>
 <div class="refsect2" title='The "object-path" property'>
 <a name="GypsySatellite--object-path"></a><h3>The <code class="literal">"object-path"</code> property</h3>
-<pre class="programlisting">  "object-path"              <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a>*                : Write / Construct Only</pre>
+<pre class="programlisting">  "object-path"              <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Write / Construct Only</pre>
 <p>The DBus path to the object.</p>
 <p>Default value: ""</p>
 </div>
@@ -338,26 +318,19 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
 <a name="GypsySatellite.signal-details"></a><h2>Signal Details</h2>
 <div class="refsect2" title='The "satellites-changed" signal'>
 <a name="GypsySatellite-satellites-changed"></a><h3>The <code class="literal">"satellites-changed"</code> signal</h3>
-<pre class="programlisting">void                user_function                      (<a class="link" href="GypsySatellite.html" title="GypsySatellite">GypsySatellite</a> *satellites,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a>        arg1,
-                                                        <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a>        user_data)       : Run Last</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="GypsySatellite.html" title="GypsySatellite"><span class="type">GypsySatellite</span></a> *satellites,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>        arg1,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>        user_data)       : Run Last</pre>
 <p>
 The ::satellites-changed signal is emitted every time the GPS
-reports a change in the satellite data.</p>
-<p>
+reports a change in the satellite data.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>satellites</code></em> :</span></p></td>
-<td> A <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"
-><span class="type">GPtrArray</span></a> containing <a class="link" href="GypsySatellite.html#GypsySatelliteDetails" title="GypsySatelliteDetails"><span class="type">GypsySatelliteDetails</span></a>
+<td>A <a href="/usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing <a class="link" href="GypsySatellite.html#GypsySatelliteDetails" title="GypsySatelliteDetails"><span class="type">GypsySatelliteDetails</span></a>
 </td>
 </tr>
 <tr>
@@ -371,6 +344,6 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtr
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/Position.html b/docs/reference/html/Position.html
index 126002f..f9f698a 100644
--- a/docs/reference/html/Position.html
+++ b/docs/reference/html/Position.html
@@ -8,16 +8,8 @@
 <link rel="up" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
 <link rel="prev" href="Device.html" title="org.freedesktop.Gypsy.Device">
 <link rel="next" href="Satellite.html" title="org.freedesktop.Gypsy.Satellite">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -30,14 +22,14 @@
 </tr>
 <tr><td colspan="5" class="shortcuts">
 <a href="#Position.synopsis" class="shortcut">Top</a>
-                 | 
-                <a href="#Position.description" class="shortcut">Description</a>
-                 | 
-                <a href="#Position.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
-                 | 
-                <a href="#Position.properties" class="shortcut">Properties</a>
-                 | 
-                <a href="#Position.signals" class="shortcut">Signals</a>
+                   | 
+                  <a href="#Position.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#Position.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
+                   | 
+                  <a href="#Position.properties" class="shortcut">Properties</a>
+                   | 
+                  <a href="#Position.signals" class="shortcut">Signals</a>
 </td></tr>
 </table>
 <div class="refentry" title="org.freedesktop.Gypsy.Position">
@@ -51,9 +43,7 @@
 </tr></table></div>
 <div class="refsynopsisdiv" title="Methods">
 <h2>Methods</h2>
-<pre class="synopsis"><a
-href="/usr/share/gtk-doc/html/gypsy/Position.html#Position.GetPosition"
->GetPosition</a> (out 'i'fields,
+<pre class="synopsis"><a href="Position.html#Position.GetPosition">GetPosition</a> (out 'i'fields,
              out 'i'timestamp,
              out 'd'latitude,
              out 'd'longitude,
@@ -61,10 +51,8 @@ href="/usr/share/gtk-doc/html/gypsy/Position.html#Position.GetPosition"
 </pre>
 </div>
 <div class="refsect1" title="Signals">
-<a name="id564629"></a><h2>Signals</h2>
-<pre class="synopsis"><a
-href="/usr/share/gtk-doc/html/gypsy/Position.html#Position::PositionChanged"
->PositionChanged</a> ('i'fields,
+<a name="id514718"></a><h2>Signals</h2>
+<pre class="synopsis"><a href="Position.html#Position::PositionChanged">PositionChanged</a> ('i'fields,
                  'i'timestamp,
                  'd'latitude,
                  'd'longitude,
@@ -72,37 +60,33 @@ href="/usr/share/gtk-doc/html/gypsy/Position.html#Position::PositionChanged"
 </pre>
 </div>
 <div class="refsect1" title="Implemented Interfaces">
-<a name="id564650"></a><h2>Implemented Interfaces</h2>
+<a name="id514740"></a><h2>Implemented Interfaces</h2>
 <p>org.freedesktop.Gypsy.Position implements
     org.freedesktop.DBus.Introspectable,
     org.freedesktop.DBus.Properties
     </p>
 </div>
 <div class="refsect1" title="Properties">
-<a name="id564667"></a><h2>Properties</h2>
+<a name="id514756"></a><h2>Properties</h2>
 <pre class="synopsis"></pre>
 </div>
 <div class="refsect1" title="Description">
-<a name="id564682"></a><h2>Description</h2>
+<a name="id514771"></a><h2>Description</h2>
 <p>
       </p>
 <p>
         Position objects are used to obtain the current position (longitude,
         latitude, altitude) of the GPS.  The current position can be obtained
-        with <a
-href="/usr/share/gtk-doc/html/gypsy/Position.html#Position.GetPosition"
-><code class="function">GetPosition()</code></a>, and <a
-href="/usr/share/gtk-doc/html/gypsy/Position.html#Position::PositionChanged"
-><code class="literal">PositionChanged</code></a>
+        with <a href="Position.html#Position.GetPosition"><code class="function">GetPosition()</code></a>, and <a href="Position.html#Position::PositionChanged"><code class="literal">PositionChanged</code></a>
         signals are emitted when the position changes.
       </p>
 <p>
     </p>
 </div>
 <div class="refsect1" title="Details">
-<a name="id564716"></a><h2>Details</h2>
+<a name="id495611"></a><h2>Details</h2>
 <div class="refsect2" title="GetPosition ()">
-<a name="id564727"></a><h3>
+<a name="id495621"></a><h3>
 <a name="Position.GetPosition"></a>GetPosition ()</h3>
 <pre class="programlisting">GetPosition (out 'i' fields,
              out 'i' timestamp,
@@ -139,9 +123,9 @@ href="/usr/share/gtk-doc/html/gypsy/Position.html#Position::PositionChanged"
 </div>
 </div>
 <div class="refsect1" title="Signal Details">
-<a name="id554494"></a><h2>Signal Details</h2>
+<a name="id495745"></a><h2>Signal Details</h2>
 <div class="refsect2" title="The PositionChanged signal">
-<a name="id554504"></a><h3>
+<a name="id495755"></a><h3>
 <a name="Position::PositionChanged"></a>The PositionChanged signal</h3>
 <pre class="programlisting">PositionChanged ('i' fields,
                  'i' timestamp,
@@ -177,11 +161,11 @@ href="/usr/share/gtk-doc/html/gypsy/Position.html#Position::PositionChanged"
 </div>
 </div>
 <div class="refsect1" title="Property Details">
-<a name="id554628"></a><h2>Property Details</h2>
+<a name="id502395"></a><h2>Property Details</h2>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/Satellite.html b/docs/reference/html/Satellite.html
index 21ea380..efbf53d 100644
--- a/docs/reference/html/Satellite.html
+++ b/docs/reference/html/Satellite.html
@@ -8,16 +8,8 @@
 <link rel="up" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
 <link rel="prev" href="Position.html" title="org.freedesktop.Gypsy.Position">
 <link rel="next" href="Time.html" title="org.freedesktop.Gypsy.Time">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -30,14 +22,14 @@
 </tr>
 <tr><td colspan="5" class="shortcuts">
 <a href="#Satellite.synopsis" class="shortcut">Top</a>
-                 | 
-                <a href="#Satellite.description" class="shortcut">Description</a>
-                 | 
-                <a href="#Satellite.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
-                 | 
-                <a href="#Satellite.properties" class="shortcut">Properties</a>
-                 | 
-                <a href="#Satellite.signals" class="shortcut">Signals</a>
+                   | 
+                  <a href="#Satellite.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#Satellite.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
+                   | 
+                  <a href="#Satellite.properties" class="shortcut">Properties</a>
+                   | 
+                  <a href="#Satellite.signals" class="shortcut">Signals</a>
 </td></tr>
 </table>
 <div class="refentry" title="org.freedesktop.Gypsy.Satellite">
@@ -51,37 +43,33 @@
 </tr></table></div>
 <div class="refsynopsisdiv" title="Methods">
 <h2>Methods</h2>
-<pre class="synopsis"><a
-href="/usr/share/gtk-doc/html/gypsy/Satellite.html#Satellite.GetSatellites"
->GetSatellites</a> (out 'a(ubuuu)'satellites)
+<pre class="synopsis"><a href="Satellite.html#Satellite.GetSatellites">GetSatellites</a> (out 'a(ubuuu)'satellites)
 </pre>
 </div>
 <div class="refsect1" title="Signals">
-<a name="id554688"></a><h2>Signals</h2>
-<pre class="synopsis"><a
-href="/usr/share/gtk-doc/html/gypsy/Satellite.html#Satellite::SatellitesChanged"
->SatellitesChanged</a> ('a(ubuuu)'satellites)
+<a name="id502455"></a><h2>Signals</h2>
+<pre class="synopsis"><a href="Satellite.html#Satellite::SatellitesChanged">SatellitesChanged</a> ('a(ubuuu)'satellites)
 </pre>
 </div>
 <div class="refsect1" title="Implemented Interfaces">
-<a name="id554709"></a><h2>Implemented Interfaces</h2>
+<a name="id502476"></a><h2>Implemented Interfaces</h2>
 <p>org.freedesktop.Gypsy.Satellite implements
     org.freedesktop.DBus.Introspectable,
     org.freedesktop.DBus.Properties
     </p>
 </div>
 <div class="refsect1" title="Properties">
-<a name="id554726"></a><h2>Properties</h2>
+<a name="id502492"></a><h2>Properties</h2>
 <pre class="synopsis"></pre>
 </div>
 <div class="refsect1" title="Description">
-<a name="id552409"></a><h2>Description</h2>
+<a name="id502507"></a><h2>Description</h2>
 <p></p>
 </div>
 <div class="refsect1" title="Details">
-<a name="id552424"></a><h2>Details</h2>
+<a name="id502521"></a><h2>Details</h2>
 <div class="refsect2" title="GetSatellites ()">
-<a name="id552434"></a><h3>
+<a name="id502532"></a><h3>
 <a name="Satellite.GetSatellites"></a>GetSatellites ()</h3>
 <pre class="programlisting">GetSatellites (out 'a(ubuuu)' satellites)</pre>
 <div class="variablelist"><table border="0">
@@ -94,9 +82,9 @@ href="/usr/share/gtk-doc/html/gypsy/Satellite.html#Satellite::SatellitesChanged"
 </div>
 </div>
 <div class="refsect1" title="Signal Details">
-<a name="id552485"></a><h2>Signal Details</h2>
+<a name="id502583"></a><h2>Signal Details</h2>
 <div class="refsect2" title="The SatellitesChanged signal">
-<a name="id552496"></a><h3>
+<a name="id502594"></a><h3>
 <a name="Satellite::SatellitesChanged"></a>The SatellitesChanged signal</h3>
 <pre class="programlisting">SatellitesChanged ('a(ubuuu)' satellites)</pre>
 <div class="variablelist"><table border="0">
@@ -109,11 +97,11 @@ href="/usr/share/gtk-doc/html/gypsy/Satellite.html#Satellite::SatellitesChanged"
 </div>
 </div>
 <div class="refsect1" title="Property Details">
-<a name="id552547"></a><h2>Property Details</h2>
+<a name="id502645"></a><h2>Property Details</h2>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/Server.html b/docs/reference/html/Server.html
index e42227e..f68dd29 100644
--- a/docs/reference/html/Server.html
+++ b/docs/reference/html/Server.html
@@ -8,16 +8,8 @@
 <link rel="up" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
 <link rel="prev" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
 <link rel="next" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -30,14 +22,14 @@
 </tr>
 <tr><td colspan="5" class="shortcuts">
 <a href="#Server.synopsis" class="shortcut">Top</a>
-                 | 
-                <a href="#Server.description" class="shortcut">Description</a>
-                 | 
-                <a href="#Server.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
-                 | 
-                <a href="#Server.properties" class="shortcut">Properties</a>
-                 | 
-                <a href="#Server.signals" class="shortcut">Signals</a>
+                   | 
+                  <a href="#Server.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#Server.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
+                   | 
+                  <a href="#Server.properties" class="shortcut">Properties</a>
+                   | 
+                  <a href="#Server.signals" class="shortcut">Signals</a>
 </td></tr>
 </table>
 <div class="refentry" title="org.freedesktop.Gypsy.Server">
@@ -51,32 +43,28 @@
 </tr></table></div>
 <div class="refsynopsisdiv" title="Methods">
 <h2>Methods</h2>
-<pre class="synopsis"><a
-href="/usr/share/gtk-doc/html/gypsy/Server.html#Server.Create"
->Create</a>   (in  's'device,
+<pre class="synopsis"><a href="Server.html#Server.Create">Create</a>   (in  's'device,
           out 'o'path)
-<a
-href="/usr/share/gtk-doc/html/gypsy/Server.html#Server.Shutdown"
->Shutdown</a> (in  'o'path)
+<a href="Server.html#Server.Shutdown">Shutdown</a> (in  'o'path)
 </pre>
 </div>
 <div class="refsect1" title="Signals">
-<a name="id564119"></a><h2>Signals</h2>
+<a name="id513776"></a><h2>Signals</h2>
 <pre class="synopsis"></pre>
 </div>
 <div class="refsect1" title="Implemented Interfaces">
-<a name="id564134"></a><h2>Implemented Interfaces</h2>
+<a name="id513792"></a><h2>Implemented Interfaces</h2>
 <p>org.freedesktop.Gypsy.Server implements
     org.freedesktop.DBus.Introspectable,
     org.freedesktop.DBus.Properties
     </p>
 </div>
 <div class="refsect1" title="Properties">
-<a name="id564150"></a><h2>Properties</h2>
+<a name="id513809"></a><h2>Properties</h2>
 <pre class="synopsis"></pre>
 </div>
 <div class="refsect1" title="Description">
-<a name="id563820"></a><h2>Description</h2>
+<a name="id513823"></a><h2>Description</h2>
 <p>
       </p>
 <p>
@@ -87,9 +75,9 @@ href="/usr/share/gtk-doc/html/gypsy/Server.html#Server.Shutdown"
     </p>
 </div>
 <div class="refsect1" title="Details">
-<a name="id563840"></a><h2>Details</h2>
+<a name="id513962"></a><h2>Details</h2>
 <div class="refsect2" title="Create ()">
-<a name="id563851"></a><h3>
+<a name="id513973"></a><h3>
 <a name="Server.Create"></a>Create ()</h3>
 <pre class="programlisting">Create (in  's' device,
         out 'o' path)</pre>
@@ -117,7 +105,7 @@ href="/usr/share/gtk-doc/html/gypsy/Server.html#Server.Shutdown"
 </div>
 <hr>
 <div class="refsect2" title="Shutdown ()">
-<a name="id563788"></a><h3>
+<a name="id513911"></a><h3>
 <a name="Server.Shutdown"></a>Shutdown ()</h3>
 <pre class="programlisting">Shutdown (in  'o' path)</pre>
           Disconnect from the specified GPS device.
@@ -133,14 +121,14 @@ href="/usr/share/gtk-doc/html/gypsy/Server.html#Server.Shutdown"
 </div>
 </div>
 <div class="refsect1" title="Signal Details">
-<a name="id564951"></a><h2>Signal Details</h2>
+<a name="id513944"></a><h2>Signal Details</h2>
 </div>
 <div class="refsect1" title="Property Details">
-<a name="id564963"></a><h2>Property Details</h2>
+<a name="id514912"></a><h2>Property Details</h2>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/Time.html b/docs/reference/html/Time.html
index 0a1019e..35a1072 100644
--- a/docs/reference/html/Time.html
+++ b/docs/reference/html/Time.html
@@ -8,16 +8,8 @@
 <link rel="up" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
 <link rel="prev" href="Satellite.html" title="org.freedesktop.Gypsy.Satellite">
 <link rel="next" href="rn05.html" title="LibGypsy API Reference">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -30,14 +22,14 @@
 </tr>
 <tr><td colspan="5" class="shortcuts">
 <a href="#Time.synopsis" class="shortcut">Top</a>
-                 | 
-                <a href="#Time.description" class="shortcut">Description</a>
-                 | 
-                <a href="#Time.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
-                 | 
-                <a href="#Time.properties" class="shortcut">Properties</a>
-                 | 
-                <a href="#Time.signals" class="shortcut">Signals</a>
+                   | 
+                  <a href="#Time.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#Time.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
+                   | 
+                  <a href="#Time.properties" class="shortcut">Properties</a>
+                   | 
+                  <a href="#Time.signals" class="shortcut">Signals</a>
 </td></tr>
 </table>
 <div class="refentry" title="org.freedesktop.Gypsy.Time">
@@ -51,37 +43,33 @@
 </tr></table></div>
 <div class="refsynopsisdiv" title="Methods">
 <h2>Methods</h2>
-<pre class="synopsis"><a
-href="/usr/share/gtk-doc/html/gypsy/Time.html#Time.GetTime"
->GetTime</a> (out 'i'timestamp)
+<pre class="synopsis"><a href="Time.html#Time.GetTime">GetTime</a> (out 'i'timestamp)
 </pre>
 </div>
 <div class="refsect1" title="Signals">
-<a name="id552607"></a><h2>Signals</h2>
-<pre class="synopsis"><a
-href="/usr/share/gtk-doc/html/gypsy/Time.html#Time::TimeChanged"
->TimeChanged</a> ('i'timestamp)
+<a name="id514280"></a><h2>Signals</h2>
+<pre class="synopsis"><a href="Time.html#Time::TimeChanged">TimeChanged</a> ('i'timestamp)
 </pre>
 </div>
 <div class="refsect1" title="Implemented Interfaces">
-<a name="id552627"></a><h2>Implemented Interfaces</h2>
+<a name="id514300"></a><h2>Implemented Interfaces</h2>
 <p>org.freedesktop.Gypsy.Time implements
     org.freedesktop.DBus.Introspectable,
     org.freedesktop.DBus.Properties
     </p>
 </div>
 <div class="refsect1" title="Properties">
-<a name="id552644"></a><h2>Properties</h2>
+<a name="id514317"></a><h2>Properties</h2>
 <pre class="synopsis"></pre>
 </div>
 <div class="refsect1" title="Description">
-<a name="id552658"></a><h2>Description</h2>
+<a name="id514331"></a><h2>Description</h2>
 <p></p>
 </div>
 <div class="refsect1" title="Details">
-<a name="id552673"></a><h2>Details</h2>
+<a name="id514346"></a><h2>Details</h2>
 <div class="refsect2" title="GetTime ()">
-<a name="id552683"></a><h3>
+<a name="id514356"></a><h3>
 <a name="Time.GetTime"></a>GetTime ()</h3>
 <pre class="programlisting">GetTime (out 'i' timestamp)</pre>
 <div class="variablelist"><table border="0">
@@ -94,9 +82,9 @@ href="/usr/share/gtk-doc/html/gypsy/Time.html#Time::TimeChanged"
 </div>
 </div>
 <div class="refsect1" title="Signal Details">
-<a name="id564310"></a><h2>Signal Details</h2>
+<a name="id514408"></a><h2>Signal Details</h2>
 <div class="refsect2" title="The TimeChanged signal">
-<a name="id564321"></a><h3>
+<a name="id514418"></a><h3>
 <a name="Time::TimeChanged"></a>The TimeChanged signal</h3>
 <pre class="programlisting">TimeChanged ('i' timestamp)</pre>
 <div class="variablelist"><table border="0">
@@ -109,11 +97,11 @@ href="/usr/share/gtk-doc/html/gypsy/Time.html#Time::TimeChanged"
 </div>
 </div>
 <div class="refsect1" title="Property Details">
-<a name="id564372"></a><h2>Property Details</h2>
+<a name="id514470"></a><h2>Property Details</h2>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/ch01.html b/docs/reference/html/ch01.html
index 33b1ac8..725f711 100644
--- a/docs/reference/html/ch01.html
+++ b/docs/reference/html/ch01.html
@@ -8,16 +8,8 @@
 <link rel="up" href="rn02.html" title="Tutorials">
 <link rel="prev" href="rn02.html" title="Tutorials">
 <link rel="next" href="connecting.html" title="Connecting to a GPS">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
@@ -29,7 +21,7 @@
 </tr></table>
 <div class="chapter" title="Programming Gypsy With Python">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id554732"></a>Programming Gypsy With Python</h2></div></div></div>
+<a name="id495604"></a>Programming Gypsy With Python</h2></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section"><a href="ch01.html#overview">Overview of Gypsy</a></span></dt>
 <dt><span class="section"><a href="connecting.html">Connecting to a GPS</a></span></dt>
@@ -53,6 +45,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/ch02.html b/docs/reference/html/ch02.html
index e55f45a..7aafda2 100644
--- a/docs/reference/html/ch02.html
+++ b/docs/reference/html/ch02.html
@@ -7,17 +7,9 @@
 <link rel="home" href="index.html" title="Gypsy Reference Manual">
 <link rel="up" href="rn05.html" title="LibGypsy API Reference">
 <link rel="prev" href="rn05.html" title="LibGypsy API Reference">
-<link rel="next" href="GypsyControl.html" title="GypsyControl">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<link rel="next" href="gypsy-gypsy-control.html" title="GypsyControl">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
@@ -25,17 +17,17 @@
 <td><a accesskey="u" href="rn05.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">Gypsy Reference Manual</th>
-<td><a accesskey="n" href="GypsyControl.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="gypsy-gypsy-control.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter" title="Gypsy-Daemon Control">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id499556"></a>Gypsy-Daemon Control</h2></div></div></div>
+<a name="id449673"></a>Gypsy-Daemon Control</h2></div></div></div>
 <div class="toc"><dl><dt>
-<span class="refentrytitle"><a href="GypsyControl.html">GypsyControl</a></span><span class="refpurpose"> — Control object for gypsy-daemon</span>
+<span class="refentrytitle"><a href="gypsy-gypsy-control.html">GypsyControl</a></span><span class="refpurpose"> — Control object for gypsy-daemon</span>
 </dt></dl></div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/ch03.html b/docs/reference/html/ch03.html
index 33b8bfa..acae059 100644
--- a/docs/reference/html/ch03.html
+++ b/docs/reference/html/ch03.html
@@ -6,22 +6,14 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="index.html" title="Gypsy Reference Manual">
 <link rel="up" href="rn05.html" title="LibGypsy API Reference">
-<link rel="prev" href="GypsyControl.html" title="GypsyControl">
+<link rel="prev" href="gypsy-gypsy-control.html" title="GypsyControl">
 <link rel="next" href="GypsyDevice.html" title="GypsyDevice">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="GypsyControl.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="gypsy-gypsy-control.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td><a accesskey="u" href="rn05.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">Gypsy Reference Manual</th>
@@ -29,7 +21,7 @@
 </tr></table>
 <div class="chapter" title="GPS Data Objects">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id499567"></a>GPS Data Objects</h2></div></div></div>
+<a name="id449684"></a>GPS Data Objects</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="GypsyDevice.html">GypsyDevice</a></span><span class="refpurpose"> — Object for obtaining device information</span>
@@ -38,7 +30,7 @@
 <span class="refentrytitle"><a href="GypsyAccuracy.html">GypsyAccuracy</a></span><span class="refpurpose"> — Object for obtaining accuracy information from gypsy-daemon</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="GypsyCourse.html">GypsyCourse</a></span><span class="refpurpose"> — Object for obtaining course information</span>
+<span class="refentrytitle"><a href="gypsy-gypsy-course.html">GypsyCourse</a></span><span class="refpurpose"> — Object for obtaining course information</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="GypsyPosition.html">GypsyPosition</a></span><span class="refpurpose"> — Object for obtaining positions from gypsy-daemon</span>
@@ -53,6 +45,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/connecting.html b/docs/reference/html/connecting.html
index 92bb8ed..f1be16c 100644
--- a/docs/reference/html/connecting.html
+++ b/docs/reference/html/connecting.html
@@ -8,16 +8,8 @@
 <link rel="up" href="ch01.html" title="Programming Gypsy With Python">
 <link rel="prev" href="ch01.html" title="Programming Gypsy With Python">
 <link rel="next" href="gps.html" title="Getting Your Location">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
@@ -69,6 +61,6 @@ gps = bus.get_object("org.freedesktop.Gypsy", path)
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/gps.html b/docs/reference/html/gps.html
index 7b67d83..c032475 100644
--- a/docs/reference/html/gps.html
+++ b/docs/reference/html/gps.html
@@ -8,16 +8,8 @@
 <link rel="up" href="ch01.html" title="Programming Gypsy With Python">
 <link rel="prev" href="connecting.html" title="Connecting to a GPS">
 <link rel="next" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
@@ -80,6 +72,6 @@ position.connect_to_signal("PositionChanged", position_changed)</pre>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/gypsy-GypsyTime.html b/docs/reference/html/gypsy-GypsyTime.html
index 46fa6d9..dae5794 100644
--- a/docs/reference/html/gypsy-GypsyTime.html
+++ b/docs/reference/html/gypsy-GypsyTime.html
@@ -7,16 +7,8 @@
 <link rel="home" href="index.html" title="Gypsy Reference Manual">
 <link rel="up" href="ch03.html" title="GPS Data Objects">
 <link rel="prev" href="GypsySatellite.html" title="GypsySatellite">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -29,8 +21,8 @@
 </tr>
 <tr><td colspan="5" class="shortcuts">
 <a href="#gypsy-GypsyTime.synopsis" class="shortcut">Top</a>
-                 | 
-                <a href="#gypsy-GypsyTime.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#gypsy-GypsyTime.description" class="shortcut">Description</a>
 </td></tr>
 </table>
 <div class="refentry" title="GypsyTime">
@@ -44,18 +36,13 @@
 </tr></table></div>
 <div class="refsynopsisdiv" title="Synopsis">
 <a name="gypsy-GypsyTime.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-                    <a class="link" href="gypsy-GypsyTime.html#GypsyTime" title="GypsyTime">GypsyTime</a>;
-#define             <a class="link" href="gypsy-GypsyTime.html#GYPSY-TIME-DBUS-SERVICE--CAPS" title="GYPSY_TIME_DBUS_SERVICE">GYPSY_TIME_DBUS_SERVICE</a>
-#define             <a class="link" href="gypsy-GypsyTime.html#GYPSY-TIME-DBUS-INTERFACE--CAPS" title="GYPSY_TIME_DBUS_INTERFACE">GYPSY_TIME_DBUS_INTERFACE</a>
-<a class="link" href="gypsy-GypsyTime.html#GypsyTime" title="GypsyTime">GypsyTime</a> *         <a class="link" href="gypsy-GypsyTime.html#gypsy-time-new" title="gypsy_time_new ()">gypsy_time_new</a>                      (const char *object_path);
-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
->gboolean</a>            <a class="link" href="gypsy-GypsyTime.html#gypsy-time-get-time" title="gypsy_time_get_time ()">gypsy_time_get_time</a>                 (<a class="link" href="gypsy-GypsyTime.html#GypsyTime" title="GypsyTime">GypsyTime</a> *gps_time,
-                                                         int *timestamp,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);
+<pre class="synopsis">                    <a class="link" href="gypsy-GypsyTime.html#GypsyTime" title="GypsyTime">GypsyTime</a>;
+#define             <a class="link" href="gypsy-GypsyTime.html#GYPSY-TIME-DBUS-SERVICE:CAPS" title="GYPSY_TIME_DBUS_SERVICE">GYPSY_TIME_DBUS_SERVICE</a>
+#define             <a class="link" href="gypsy-GypsyTime.html#GYPSY-TIME-DBUS-INTERFACE:CAPS" title="GYPSY_TIME_DBUS_INTERFACE">GYPSY_TIME_DBUS_INTERFACE</a>
+<a class="link" href="gypsy-GypsyTime.html#GypsyTime" title="GypsyTime"><span class="returnvalue">GypsyTime</span></a> *         <a class="link" href="gypsy-GypsyTime.html#gypsy-time-new" title="gypsy_time_new ()">gypsy_time_new</a>                      (<em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="gypsy-GypsyTime.html#gypsy-time-get-time" title="gypsy_time_get_time ()">gypsy_time_get_time</a>                 (<em class="parameter"><code><a class="link" href="gypsy-GypsyTime.html#GypsyTime" title="GypsyTime"><span class="type">GypsyTime</span></a> *gps_time</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *timestamp</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Description">
@@ -68,7 +55,7 @@ to notify listeners of changes.
 <p>
 A <a class="link" href="gypsy-GypsyTime.html#GypsyTime" title="GypsyTime"><span class="type">GypsyTime</span></a> object is created with <a class="link" href="gypsy-GypsyTime.html#gypsy-time-new" title="gypsy_time_new ()"><code class="function">gypsy_time_new()</code></a> using the 
 D-Bus path of the GPS device. This path is returned from the 
-<a class="link" href="GypsyControl.html#gypsy-control-create" title="gypsy_control_create ()"><code class="function">gypsy_control_create()</code></a> function. The client can then find out about the
+<a class="link" href="gypsy-gypsy-control.html#gypsy-control-create" title="gypsy_control_create ()"><code class="function">gypsy_control_create()</code></a> function. The client can then find out about the
 GPS time with <a class="link" href="gypsy-GypsyTime.html#gypsy-time-get-time" title="gypsy_time_get_time ()"><code class="function">gypsy_time_get_time()</code></a>.
 </p>
 <p>
@@ -78,25 +65,49 @@ GPS update that it received.
 </p>
 <p>
 </p>
-<div class="informalexample"><pre class="programlisting">
-GypsyTime *gps_time;
-GError *error = NULL;
+<div class="informalexample">
+  <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
+    <tbody>
+      <tr>
+        <td class="listing_lines" align="right"><pre>1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17</pre></td>
+        <td class="listing_code"><pre class="programlisting">GypsyTime <span class="symbol">*</span>gps_time<span class="symbol">;</span>
+GError <span class="symbol">*</span>error <span class="symbol">=</span> NULL<span class="symbol">;</span>
 
-. . .
+<span class="symbol">. . .</span>
 
-/* path comes from the gypsy_control_create() function */
-gps_time = gypsy_time_new (path);
-g_signal_connect (gps_time, "time-changed", G_CALLBACK (time_changed), NULL);
+<span class="comment">/* path comes from the gypsy_control_create() function */</span>
+gps_time <span class="symbol">=</span> <span class="function"><a href="gypsy-GypsyTime.html#gypsy-time-new">gypsy_time_new</a></span> <span class="symbol">(</span>path<span class="symbol">);</span>
+<span class="function"><a href="/usr/share/gtk-doc/html/gobject/gobject-Signals.html#g-signal-connect">g_signal_connect</a></span> <span class="symbol">(</span>gps_time<span class="symbol">,</span> <span class="string">&quot;time-changed&quot;</span><span class="symbol">,</span> <span class="function"><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#G-CALLBACK:CAPS">G_CALLBACK</a></span> <span class="symbol">(</span>time_changed<span class="symbol">),</span> NULL<span class="symbol">);</span>
 
-. . .
+<span class="symbol">. . .</span>
+
+<span class="gtkdoc kwb">static void</span> <span class="function">position_changed</span> <span class="symbol">(</span>GypsyTime <span class="symbol">*</span>gps_time<span class="symbol">,</span> 
+<span class="gtkdoc kwb">int</span> timestamp<span class="symbol">,</span>
+gpointer userdata<span class="symbol">)</span>
+<span class="symbol">{</span>
+  <span class="function"><a href="/usr/share/gtk-doc/html/glib/glib-Warnings-and-Assertions.html#g-print">g_print</a></span> <span class="symbol">(</span><span class="string">&quot;timestamp: %d</span><span class="gtkdoc esc">\n</span><span class="string">&quot;</span><span class="symbol">,</span> timestamp<span class="symbol">);</span>
+<span class="symbol">}</span></pre></td>
+      </tr>
+    </tbody>
+  </table>
+</div>
 
-static void position_changed (GypsyTime *gps_time, 
-int timestamp,
-gpointer userdata)
-{
-  g_print ("timestamp: %d\n", timestamp);
-}
-</pre></div>
 <p>
 </p>
 </div>
@@ -109,45 +120,41 @@ gpointer userdata)
 } GypsyTime;
 </pre>
 <p>
-There are no public fields in <a class="link" href="gypsy-GypsyTime.html#GypsyTime" title="GypsyTime"><span class="type">GypsyTime</span></a>.</p>
-<p>
+There are no public fields in <a class="link" href="gypsy-GypsyTime.html#GypsyTime" title="GypsyTime"><span class="type">GypsyTime</span></a>.
 </p>
 </div>
 <hr>
 <div class="refsect2" title="GYPSY_TIME_DBUS_SERVICE">
-<a name="GYPSY-TIME-DBUS-SERVICE--CAPS"></a><h3>GYPSY_TIME_DBUS_SERVICE</h3>
+<a name="GYPSY-TIME-DBUS-SERVICE:CAPS"></a><h3>GYPSY_TIME_DBUS_SERVICE</h3>
 <pre class="programlisting">#define GYPSY_TIME_DBUS_SERVICE "org.freedesktop.Gypsy"
 </pre>
 <p>
-A define containing the address of the Time service</p>
-<p>
+A define containing the address of the Time service
 </p>
 </div>
 <hr>
 <div class="refsect2" title="GYPSY_TIME_DBUS_INTERFACE">
-<a name="GYPSY-TIME-DBUS-INTERFACE--CAPS"></a><h3>GYPSY_TIME_DBUS_INTERFACE</h3>
+<a name="GYPSY-TIME-DBUS-INTERFACE:CAPS"></a><h3>GYPSY_TIME_DBUS_INTERFACE</h3>
 <pre class="programlisting">#define GYPSY_TIME_DBUS_INTERFACE "org.freedesktop.Gypsy.Time"
 </pre>
 <p>
-A define containing the name of the Time interface</p>
-<p>
+A define containing the name of the Time interface
 </p>
 </div>
 <hr>
 <div class="refsect2" title="gypsy_time_new ()">
 <a name="gypsy-time-new"></a><h3>gypsy_time_new ()</h3>
-<pre class="programlisting"><a class="link" href="gypsy-GypsyTime.html#GypsyTime" title="GypsyTime">GypsyTime</a> *         gypsy_time_new                      (const char *object_path);</pre>
+<pre class="programlisting"><a class="link" href="gypsy-GypsyTime.html#GypsyTime" title="GypsyTime"><span class="returnvalue">GypsyTime</span></a> *         gypsy_time_new                      (<em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>);</pre>
 <p>
 Creates a new <a class="link" href="gypsy-GypsyTime.html#GypsyTime" title="GypsyTime"><span class="type">GypsyTime</span></a> object that listens for time changes
-from the GPS found at <em class="parameter"><code>object_path</code></em>.</p>
-<p>
+from the GPS found at <em class="parameter"><code>object_path</code></em>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>object_path</code></em> :</span></p></td>
-<td> Object path to the GPS device
+<td>Object path to the GPS device
 </td>
 </tr>
 <tr>
@@ -161,35 +168,28 @@ from the GPS found at <em class="parameter"><code>object_path</code></em>.</p>
 <hr>
 <div class="refsect2" title="gypsy_time_get_time ()">
 <a name="gypsy-time-get-time"></a><h3>gypsy_time_get_time ()</h3>
-<pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
->gboolean</a>            gypsy_time_get_time                 (<a class="link" href="gypsy-GypsyTime.html#GypsyTime" title="GypsyTime">GypsyTime</a> *gps_time,
-                                                         int *timestamp,
-                                                         <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
->GError</a> **error);</pre>
-<p>
-Obtains the current time, if known, from the GPS device.</p>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            gypsy_time_get_time                 (<em class="parameter"><code><a class="link" href="gypsy-GypsyTime.html#GypsyTime" title="GypsyTime"><span class="type">GypsyTime</span></a> *gps_time</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *timestamp</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
+Obtains the current time, if known, from the GPS device.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>gps_time</code></em> :</span></p></td>
-<td> A <a class="link" href="gypsy-GypsyTime.html#GypsyTime" title="GypsyTime"><span class="type">GypsyTime</span></a>
+<td>A <a class="link" href="gypsy-GypsyTime.html#GypsyTime" title="GypsyTime"><span class="type">GypsyTime</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>timestamp</code></em> :</span></p></td>
-<td> Pointer to store the timestamp
+<td>Pointer to store the timestamp
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> Pointer to store a <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a>
+<td>Pointer to store a <a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>
 </td>
 </tr>
 <tr>
@@ -204,6 +204,6 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GEr
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/gypsy-client-interfaces.html b/docs/reference/html/gypsy-client-interfaces.html
index 346dbdb..75166ec 100644
--- a/docs/reference/html/gypsy-client-interfaces.html
+++ b/docs/reference/html/gypsy-client-interfaces.html
@@ -8,16 +8,8 @@
 <link rel="up" href="index.html" title="Gypsy Reference Manual">
 <link rel="prev" href="Server.html" title="org.freedesktop.Gypsy.Server">
 <link rel="next" href="Accuracy.html" title="org.freedesktop.Gypsy.Accuracy">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
@@ -59,6 +51,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/gypsy-design.html b/docs/reference/html/gypsy-design.html
index a8132b1..8c7bfef 100644
--- a/docs/reference/html/gypsy-design.html
+++ b/docs/reference/html/gypsy-design.html
@@ -8,16 +8,8 @@
 <link rel="up" href="rn01.html" title="Gypsy Overview">
 <link rel="prev" href="rn01.html" title="Gypsy Overview">
 <link rel="next" href="why-not-gpsd.html" title="Design Flaws in GPSD">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
@@ -37,15 +29,15 @@
 <td valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1">
-<a name="id499018"></a><p>
+<a name="id449218"></a><p>
 From a users perspective Gypsy is designed to be powerful, yet lightweight enough to be used on low powered systems such as embedded devices. From an application developers perspective Gypsy is designed to be as simple to use as possible.
 </p>
 <p>
 When we talk about Gypsy, we are really talking about the gypsy-daemon program which is the program that actually connects to GPS devices, parses the data from them, and emits signals onto the D-Bus system bus for listening clients to receive. The figure below shows gypsy-daemon connected to two GPS devices, a Bluetooth one and a serial one, and three clients connected to the D-Bus system bus listening for GPS signals.
 </p>
-
+<GTKDOCLINK HREF="GypsyDesign">
 <img src="gypsy-design.png">
-<p>
+</GTKDOCLINK><p>
 Gypsy's client D-Bus methods and signals are grouped into a number of related interfaces. These interfaces are:
 
 </p>
@@ -94,6 +86,6 @@ Using D-Bus also enables Gypsy to be used from any language that has D-Bus suppo
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/gypsy-gypsy-control.html b/docs/reference/html/gypsy-gypsy-control.html
new file mode 100644
index 0000000..aea4c37
--- /dev/null
+++ b/docs/reference/html/gypsy-gypsy-control.html
@@ -0,0 +1,271 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GypsyControl</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="Gypsy Reference Manual">
+<link rel="up" href="ch02.html" title="Gypsy-Daemon Control">
+<link rel="prev" href="ch02.html" title="Gypsy-Daemon Control">
+<link rel="next" href="ch03.html" title="GPS Data Objects">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="ch02.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">Gypsy Reference Manual</th>
+<td><a accesskey="n" href="ch03.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#gypsy-gypsy-control.synopsis" class="shortcut">Top</a>
+                   | 
+                  <a href="#gypsy-gypsy-control.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#gypsy-gypsy-control.object-hierarchy" class="shortcut">Object Hierarchy</a>
+</td></tr>
+</table>
+<div class="refentry" title="GypsyControl">
+<a name="gypsy-gypsy-control"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="gypsy-gypsy-control.top_of_page"></a>GypsyControl</span></h2>
+<p>GypsyControl — Control object for gypsy-daemon</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv" title="Synopsis">
+<a name="gypsy-gypsy-control.synopsis"></a><h2>Synopsis</h2>
+<a name="GypsyControl"></a><pre class="synopsis">                    <a class="link" href="gypsy-gypsy-control.html#GypsyControl-struct" title="GypsyControl">GypsyControl</a>;
+#define             <a class="link" href="gypsy-gypsy-control.html#GYPSY-CONTROL-DBUS-SERVICE:CAPS" title="GYPSY_CONTROL_DBUS_SERVICE">GYPSY_CONTROL_DBUS_SERVICE</a>
+#define             <a class="link" href="gypsy-gypsy-control.html#GYPSY-CONTROL-DBUS-PATH:CAPS" title="GYPSY_CONTROL_DBUS_PATH">GYPSY_CONTROL_DBUS_PATH</a>
+#define             <a class="link" href="gypsy-gypsy-control.html#GYPSY-CONTROL-DBUS-INTERFACE:CAPS" title="GYPSY_CONTROL_DBUS_INTERFACE">GYPSY_CONTROL_DBUS_INTERFACE</a>
+<a class="link" href="gypsy-gypsy-control.html#GypsyControl"><span class="returnvalue">GypsyControl</span></a> *      <a class="link" href="gypsy-gypsy-control.html#gypsy-control-get-default" title="gypsy_control_get_default ()">gypsy_control_get_default</a>           (<em class="parameter"><code><span class="type">void</span></code></em>);
+<span class="returnvalue">char</span> *              <a class="link" href="gypsy-gypsy-control.html#gypsy-control-create" title="gypsy_control_create ()">gypsy_control_create</a>                (<em class="parameter"><code><a class="link" href="gypsy-gypsy-control.html#GypsyControl"><span class="type">GypsyControl</span></a> *control</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *device_name</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
+</pre>
+</div>
+<div class="refsect1" title="Object Hierarchy">
+<a name="gypsy-gypsy-control.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="synopsis">
+  <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject">GObject</a>
+   +----GypsyControl
+</pre>
+</div>
+<div class="refsect1" title="Description">
+<a name="gypsy-gypsy-control.description"></a><h2>Description</h2>
+<p>
+<a class="link" href="gypsy-gypsy-control.html#GypsyControl"><span class="type">GypsyControl</span></a> is the object that controls the gypsy-daemon process. 
+It is a singleton object, meaning that there will only be one instance of it
+per application. Once the object has been created (or referenced if it 
+had already been created for the application) with 
+<a class="link" href="gypsy-gypsy-control.html#gypsy-control-get-default" title="gypsy_control_get_default ()"><code class="function">gypsy_control_get_default()</code></a>, it can be used to tell gypsy-daemon what GPS
+device to connect to with <a class="link" href="gypsy-gypsy-control.html#gypsy-control-create" title="gypsy_control_create ()"><code class="function">gypsy_control_create()</code></a>. This call returns the
+D-Bus object path to the GPS object in gypsy-daemon. This object path is then used to 
+create other objects, such as <a class="link" href="GypsyPosition.html" title="GypsyPosition"><span class="type">GypsyPosition</span></a>, or <a class="link" href="gypsy-gypsy-course.html#GypsyCourse"><span class="type">GypsyCourse</span></a>.
+</p>
+<p>
+As gypsy-daemon is able to connect to multiple GPS devices, the one
+<a class="link" href="gypsy-gypsy-control.html#GypsyControl"><span class="type">GypsyControl</span></a> can be used to create them, returning a different path for each
+GPS device. Gypsy-daemon can connect to both serial port devices which have
+an entry in <code class="filename">/dev</code> and Bluetooth devices natively without
+the need to use rfcomm to set up a <code class="filename">/dev</code> entry. To do
+this you pass either the device path or the Bluetooth address of the device
+to <a class="link" href="gypsy-gypsy-control.html#gypsy-control-create" title="gypsy_control_create ()"><code class="function">gypsy_control_create()</code></a>.
+</p>
+<p>
+Once the program has finished with the GPS, the <a class="link" href="gypsy-gypsy-control.html#GypsyControl"><span class="type">GypsyControl</span></a> object should
+by unreferenced with <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#g-object-unref"><code class="function">g_object_unref()</code></a>.
+</p>
+<p>
+</p>
+<div class="informalexample">
+  <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
+    <tbody>
+      <tr>
+        <td class="listing_lines" align="right"><pre>1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38</pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="symbol">. . .</span>
+
+<span class="symbol">&lt;</span>a <span class="gtkdoc kwc">class</span><span class="symbol">=</span><span class="string">&quot;link&quot;</span> href<span class="symbol">=</span><span class="string">&quot;gypsy-gypsy-control.html#GypsyControl&quot;</span><span class="symbol">&gt;</span>GypsyControl<span class="symbol">&lt;/</span>a<span class="symbol">&gt; *</span>control<span class="symbol">;</span>
+<span class="gtkdoc kwb">char</span> <span class="symbol">*</span>path_bt<span class="symbol">, *</span>path_dev<span class="symbol">;</span>
+GError <span class="symbol">*</span>error <span class="symbol">=</span> NULL<span class="symbol">;</span>
+
+<span class="symbol">. . .</span>
+
+control <span class="symbol">=</span> <span class="function"><a href="gypsy-gypsy-control.html#gypsy-control-get-default">gypsy_control_get_default</a></span> <span class="symbol">();</span>
+<span class="symbol">/ *</span> Use a Bluetooth device <span class="symbol">* /</span>
+path_bt <span class="symbol">=</span> <span class="function"><a href="gypsy-gypsy-control.html#gypsy-control-create">gypsy_control_create</a></span> <span class="symbol">(</span>control<span class="symbol">,</span> <span class="string">&quot;aa:bb:cc:dd:ee&quot;</span><span class="symbol">, &amp;</span>error<span class="symbol">);</span>
+<span class="keyword">if</span> <span class="symbol">(</span>path_bt <span class="symbol">==</span> NULL<span class="symbol">) {</span>
+  <span class="function"><a href="/usr/share/gtk-doc/html/glib/glib-Message-Logging.html#g-warning">g_warning</a></span> <span class="symbol">(</span><span class="string">&quot;There was an error creating aa:bb:cc:dd:ee - %s&quot;</span><span class="symbol">,</span> error<span class="symbol">-&gt;</span>message<span class="symbol">);</span>
+  <span class="function"><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#g-error-free">g_error_free</a></span> <span class="symbol">(</span>error<span class="symbol">);</span>
+  error <span class="symbol">=</span> NULL<span class="symbol">;</span>
+<span class="symbol">}</span>
+
+<span class="symbol">/ *</span> Use a serial port device <span class="symbol">* /</span>
+path_dev <span class="symbol">=</span> <span class="function"><a href="gypsy-gypsy-control.html#gypsy-control-create">gypsy_control_create</a></span> <span class="symbol">(</span>control<span class="symbol">,</span> <span class="string">&quot;/dev/gps&quot;</span><span class="symbol">, &amp;</span>error<span class="symbol">);</span>
+<span class="keyword">if</span> <span class="symbol">(</span>path_dev <span class="symbol">==</span> NULL<span class="symbol">) {</span>
+  <span class="function"><a href="/usr/share/gtk-doc/html/glib/glib-Message-Logging.html#g-warning">g_warning</a></span> <span class="symbol">(</span><span class="string">&quot;There was an error creating /dev/gps - %s&quot;</span><span class="symbol">,</span> error<span class="symbol">-&gt;</span>message<span class="symbol">);</span>
+  <span class="function"><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#g-error-free">g_error_free</a></span> <span class="symbol">(</span>error<span class="symbol">);</span>
+  error <span class="symbol">=</span> NULL<span class="symbol">;</span>
+<span class="symbol">}</span>
+
+<span class="symbol">. . .</span>
+
+<span class="symbol">/ *</span> Use the paths here to create listener objects <span class="symbol">* /</span>
+
+<span class="symbol">. . .</span> 
+
+<span class="function"><a href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-free">g_free</a></span> <span class="symbol">(</span>path_bt<span class="symbol">);</span>
+<span class="function"><a href="/usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html#g-free">g_free</a></span> <span class="symbol">(</span>path_dev<span class="symbol">);</span>
+
+<span class="symbol">. . .</span>
+
+<span class="symbol">/ *</span> The program has finished with Gypsy now<span class="symbol">,</span> unref the object<span class="symbol">. * /</span>
+<span class="function"><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#g-object-unref">g_object_unref</a></span> <span class="symbol">(</span><span class="function"><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#G-OBJECT:CAPS">G_OBJECT</a></span> <span class="symbol">(</span>control<span class="symbol">));</span></pre></td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+
+<p>
+</p>
+</div>
+<div class="refsect1" title="Details">
+<a name="gypsy-gypsy-control.details"></a><h2>Details</h2>
+<div class="refsect2" title="GypsyControl">
+<a name="GypsyControl-struct"></a><h3>GypsyControl</h3>
+<pre class="programlisting">typedef struct _GypsyControl GypsyControl;</pre>
+<p>
+There are no public fields in <a class="link" href="gypsy-gypsy-control.html#GypsyControl"><span class="type">GypsyControl</span></a>.
+</p>
+</div>
+<hr>
+<div class="refsect2" title="GYPSY_CONTROL_DBUS_SERVICE">
+<a name="GYPSY-CONTROL-DBUS-SERVICE:CAPS"></a><h3>GYPSY_CONTROL_DBUS_SERVICE</h3>
+<pre class="programlisting">#define GYPSY_CONTROL_DBUS_SERVICE "org.freedesktop.Gypsy"
+</pre>
+<p>
+A define containing the service name of the control service
+</p>
+</div>
+<hr>
+<div class="refsect2" title="GYPSY_CONTROL_DBUS_PATH">
+<a name="GYPSY-CONTROL-DBUS-PATH:CAPS"></a><h3>GYPSY_CONTROL_DBUS_PATH</h3>
+<pre class="programlisting">#define GYPSY_CONTROL_DBUS_PATH "/org/freedesktop/Gypsy"
+</pre>
+<p>
+A define containing the object path of the Gypsy object
+</p>
+</div>
+<hr>
+<div class="refsect2" title="GYPSY_CONTROL_DBUS_INTERFACE">
+<a name="GYPSY-CONTROL-DBUS-INTERFACE:CAPS"></a><h3>GYPSY_CONTROL_DBUS_INTERFACE</h3>
+<pre class="programlisting">#define GYPSY_CONTROL_DBUS_INTERFACE "org.freedesktop.Gypsy.Server"
+</pre>
+<p>
+A define containing the name of the Control interface
+</p>
+</div>
+<hr>
+<div class="refsect2" title="gypsy_control_get_default ()">
+<a name="gypsy-control-get-default"></a><h3>gypsy_control_get_default ()</h3>
+<pre class="programlisting"><a class="link" href="gypsy-gypsy-control.html#GypsyControl"><span class="returnvalue">GypsyControl</span></a> *      gypsy_control_get_default           (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+Retrieves the default <a class="link" href="gypsy-gypsy-control.html#GypsyControl"><span class="type">GypsyControl</span></a> object.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> A singleton <a class="link" href="gypsy-gypsy-control.html#GypsyControl"><span class="type">GypsyControl</span></a>.  Once the program has finished using
+the <a class="link" href="gypsy-gypsy-control.html#GypsyControl"><span class="type">GypsyControl</span></a>, it should be unreferenced with <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#g-object-unref"><code class="function">g_object_unref()</code></a>.
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="gypsy_control_create ()">
+<a name="gypsy-control-create"></a><h3>gypsy_control_create ()</h3>
+<pre class="programlisting"><span class="returnvalue">char</span> *              gypsy_control_create                (<em class="parameter"><code><a class="link" href="gypsy-gypsy-control.html#GypsyControl"><span class="type">GypsyControl</span></a> *control</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *device_name</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>
+Creates a object on the server that refers to the GPS device at <em class="parameter"><code>device_name</code></em>.
+When this object is finalized, the remote object on the server will be
+shutdown after which any calls to the object at the returned path
+are not guaranteed to work.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>control</code></em> :</span></p></td>
+<td>The <a class="link" href="gypsy-gypsy-control.html#GypsyControl"><span class="type">GypsyControl</span></a> device
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>device_name</code></em> :</span></p></td>
+<td>The path to the device file, or Bluetooth address
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>A <a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> to return errors in, or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> The path to the created object.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.15</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/gypsy-gypsy-course.html b/docs/reference/html/gypsy-gypsy-course.html
new file mode 100644
index 0000000..f05ccfa
--- /dev/null
+++ b/docs/reference/html/gypsy-gypsy-course.html
@@ -0,0 +1,372 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>GypsyCourse</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="Gypsy Reference Manual">
+<link rel="up" href="ch03.html" title="GPS Data Objects">
+<link rel="prev" href="GypsyAccuracy.html" title="GypsyAccuracy">
+<link rel="next" href="GypsyPosition.html" title="GypsyPosition">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="GypsyAccuracy.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch03.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">Gypsy Reference Manual</th>
+<td><a accesskey="n" href="GypsyPosition.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#gypsy-gypsy-course.synopsis" class="shortcut">Top</a>
+                   | 
+                  <a href="#gypsy-gypsy-course.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#gypsy-gypsy-course.object-hierarchy" class="shortcut">Object Hierarchy</a>
+                   | 
+                  <a href="#gypsy-gypsy-course.properties" class="shortcut">Properties</a>
+                   | 
+                  <a href="#gypsy-gypsy-course.signals" class="shortcut">Signals</a>
+</td></tr>
+</table>
+<div class="refentry" title="GypsyCourse">
+<a name="gypsy-gypsy-course"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="gypsy-gypsy-course.top_of_page"></a>GypsyCourse</span></h2>
+<p>GypsyCourse — Object for obtaining course information</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv" title="Synopsis">
+<a name="gypsy-gypsy-course.synopsis"></a><h2>Synopsis</h2>
+<a name="GypsyCourse"></a><pre class="synopsis">                    <a class="link" href="gypsy-gypsy-course.html#GypsyCourse-struct" title="GypsyCourse">GypsyCourse</a>;
+#define             <a class="link" href="gypsy-gypsy-course.html#GYPSY-COURSE-DBUS-INTERFACE:CAPS" title="GYPSY_COURSE_DBUS_INTERFACE">GYPSY_COURSE_DBUS_INTERFACE</a>
+#define             <a class="link" href="gypsy-gypsy-course.html#GYPSY-COURSE-DBUS-SERVICE:CAPS" title="GYPSY_COURSE_DBUS_SERVICE">GYPSY_COURSE_DBUS_SERVICE</a>
+enum                <a class="link" href="gypsy-gypsy-course.html#GypsyCourseFields" title="enum GypsyCourseFields">GypsyCourseFields</a>;
+<a class="link" href="gypsy-gypsy-course.html#GypsyCourse"><span class="returnvalue">GypsyCourse</span></a> *       <a class="link" href="gypsy-gypsy-course.html#gypsy-course-new" title="gypsy_course_new ()">gypsy_course_new</a>                    (<em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>);
+<a class="link" href="gypsy-gypsy-course.html#GypsyCourseFields" title="enum GypsyCourseFields"><span class="returnvalue">GypsyCourseFields</span></a>   <a class="link" href="gypsy-gypsy-course.html#gypsy-course-get-course" title="gypsy_course_get_course ()">gypsy_course_get_course</a>             (<em class="parameter"><code><a class="link" href="gypsy-gypsy-course.html#GypsyCourse"><span class="type">GypsyCourse</span></a> *course</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *timestamp</code></em>,
+                                                         <em class="parameter"><code><span class="type">double</span> *speed</code></em>,
+                                                         <em class="parameter"><code><span class="type">double</span> *direction</code></em>,
+                                                         <em class="parameter"><code><span class="type">double</span> *climb</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
+</pre>
+</div>
+<div class="refsect1" title="Object Hierarchy">
+<a name="gypsy-gypsy-course.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="synopsis">
+  <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject">GObject</a>
+   +----GypsyCourse
+</pre>
+</div>
+<div class="refsect1" title="Properties">
+<a name="gypsy-gypsy-course.properties"></a><h2>Properties</h2>
+<pre class="synopsis">
+  "<a class="link" href="gypsy-gypsy-course.html#GypsyCourse--object-path" title='The "object-path" property'>object-path</a>"              <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Write / Construct Only
+</pre>
+</div>
+<div class="refsect1" title="Signals">
+<a name="gypsy-gypsy-course.signals"></a><h2>Signals</h2>
+<pre class="synopsis">
+  "<a class="link" href="gypsy-gypsy-course.html#GypsyCourse-course-changed" title='The "course-changed" signal'>course-changed</a>"                                 : Run First / No Recursion
+</pre>
+</div>
+<div class="refsect1" title="Description">
+<a name="gypsy-gypsy-course.description"></a><h2>Description</h2>
+<p>
+<a class="link" href="gypsy-gypsy-course.html#GypsyCourse"><span class="type">GypsyCourse</span></a> is used whenever the client program wishes to know about
+GPS course changes. It can report the current course, and has a signal
+to notify listeners of changes. The course consists of the speed, direction
+and rate of ascent or descent (called the climb).
+</p>
+<p>
+A <a class="link" href="gypsy-gypsy-course.html#GypsyCourse"><span class="type">GypsyCourse</span></a> object is created using <a class="link" href="gypsy-gypsy-course.html#gypsy-course-new" title="gypsy_course_new ()"><code class="function">gypsy_course_new()</code></a> using the 
+D-Bus path of the GPS device. This path is returned from the 
+<a class="link" href="gypsy-gypsy-control.html#gypsy-control-create" title="gypsy_control_create ()"><code class="function">gypsy_control_create()</code></a> function. The client can then find out about the
+course with <a class="link" href="gypsy-gypsy-course.html#gypsy-course-get-course" title="gypsy_course_get_course ()"><code class="function">gypsy_course_get_course()</code></a>.
+</p>
+<p>
+As the course information changes <a class="link" href="gypsy-gypsy-course.html#GypsyCourse"><span class="type">GypsyCourse</span></a> will emit the 
+course-changed signal. This signal contains the course information if 
+gypsy-daemon knows it. It has a fields paramater which is a bitmask of
+<a class="link" href="gypsy-gypsy-course.html#GypsyCourseFields" title="enum GypsyCourseFields"><span class="type">GypsyCourseFields</span></a> which indicates which of the speed, direction or
+climb contains valid information. The timestamp will always be valid
+if it is greater than 0.
+</p>
+<p>
+</p>
+<div class="informalexample">
+  <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
+    <tbody>
+      <tr>
+        <td class="listing_lines" align="right"><pre>1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22</pre></td>
+        <td class="listing_code"><pre class="programlisting">GypsyCourse <span class="symbol">*</span>course<span class="symbol">;</span>
+GError <span class="symbol">*</span>error <span class="symbol">=</span> NULL<span class="symbol">;</span>
+
+<span class="symbol">. . .</span>
+
+<span class="symbol">/ *</span> path comes from the <span class="function"><a href="gypsy-gypsy-control.html#gypsy-control-create">gypsy_control_create</a></span><span class="symbol">()</span> function <span class="symbol">* /</span>
+course <span class="symbol">=</span> <span class="function"><a href="gypsy-gypsy-course.html#gypsy-course-new">gypsy_course_new</a></span> <span class="symbol">(</span>path<span class="symbol">);</span>
+<span class="function"><a href="/usr/share/gtk-doc/html/gobject/gobject-Signals.html#g-signal-connect">g_signal_connect</a></span> <span class="symbol">(</span>course<span class="symbol">,</span> <span class="string">&quot;course-changed&quot;</span><span class="symbol">,</span> <span class="function"><a href="/usr/share/gtk-doc/html/gobject/gobject-Closures.html#G-CALLBACK:CAPS">G_CALLBACK</a></span> <span class="symbol">(</span>course_changed<span class="symbol">),</span> NULL<span class="symbol">);</span>
+
+<span class="symbol">. . .</span>
+
+<span class="gtkdoc kwb">static void</span> 
+<span class="function">course_changed</span> <span class="symbol">(</span>GypsyCourse <span class="symbol">*</span>course<span class="symbol">,</span> 
+GypsyCourseFields fields<span class="symbol">,</span>
+<span class="gtkdoc kwb">int</span> timestamp<span class="symbol">,</span>
+<span class="gtkdoc kwb">double</span> speed<span class="symbol">,</span>
+<span class="gtkdoc kwb">double</span> direction<span class="symbol">,</span>
+<span class="gtkdoc kwb">double</span> climb<span class="symbol">,</span>
+gpointer userdata<span class="symbol">)</span>
+<span class="symbol">{</span>
+  <span class="function"><a href="/usr/share/gtk-doc/html/glib/glib-Warnings-and-Assertions.html#g-print">g_print</a></span> <span class="symbol">(</span><span class="string">&quot;speed: %fm/s</span><span class="gtkdoc esc">\n</span><span class="string">&quot;</span><span class="symbol">, (</span>fields <span class="symbol">&amp;</span> GYPSY_COURSE_FIELDS_SPEED<span class="symbol">)</span> ? speed <span class="symbol">: -</span><span class="number">1.0</span><span class="symbol">);</span>
+<span class="symbol">}</span></pre></td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+
+<p>
+</p>
+</div>
+<div class="refsect1" title="Details">
+<a name="gypsy-gypsy-course.details"></a><h2>Details</h2>
+<div class="refsect2" title="GypsyCourse">
+<a name="GypsyCourse-struct"></a><h3>GypsyCourse</h3>
+<pre class="programlisting">typedef struct _GypsyCourse GypsyCourse;</pre>
+<p>
+There are no public fields in <a class="link" href="gypsy-gypsy-course.html#GypsyCourse"><span class="type">GypsyCourse</span></a>.
+</p>
+</div>
+<hr>
+<div class="refsect2" title="GYPSY_COURSE_DBUS_INTERFACE">
+<a name="GYPSY-COURSE-DBUS-INTERFACE:CAPS"></a><h3>GYPSY_COURSE_DBUS_INTERFACE</h3>
+<pre class="programlisting">#define GYPSY_COURSE_DBUS_INTERFACE "org.freedesktop.Gypsy.Course"
+</pre>
+<p>
+A define containing the name of the Course interface
+</p>
+</div>
+<hr>
+<div class="refsect2" title="GYPSY_COURSE_DBUS_SERVICE">
+<a name="GYPSY-COURSE-DBUS-SERVICE:CAPS"></a><h3>GYPSY_COURSE_DBUS_SERVICE</h3>
+<pre class="programlisting">#define GYPSY_COURSE_DBUS_SERVICE "org.freedesktop.Gypsy"
+</pre>
+<p>
+A define containing the address of the Course service
+</p>
+</div>
+<hr>
+<div class="refsect2" title="enum GypsyCourseFields">
+<a name="GypsyCourseFields"></a><h3>enum GypsyCourseFields</h3>
+<pre class="programlisting">typedef enum {
+	GYPSY_COURSE_FIELDS_NONE = 0,
+	GYPSY_COURSE_FIELDS_SPEED = 1 &lt;&lt; 0,
+	GYPSY_COURSE_FIELDS_DIRECTION = 1 &lt;&lt; 1,
+	GYPSY_COURSE_FIELDS_CLIMB = 1 &lt;&lt; 2
+} GypsyCourseFields;
+</pre>
+<p>
+A bitfield telling which fields in the course_changed callback are valid
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><a name="GYPSY-COURSE-FIELDS-NONE:CAPS"></a><span class="term"><code class="literal">GYPSY_COURSE_FIELDS_NONE</code></span></p></td>
+<td>None of the fields are valid
+</td>
+</tr>
+<tr>
+<td><p><a name="GYPSY-COURSE-FIELDS-SPEED:CAPS"></a><span class="term"><code class="literal">GYPSY_COURSE_FIELDS_SPEED</code></span></p></td>
+<td>The speed field is valid
+</td>
+</tr>
+<tr>
+<td><p><a name="GYPSY-COURSE-FIELDS-DIRECTION:CAPS"></a><span class="term"><code class="literal">GYPSY_COURSE_FIELDS_DIRECTION</code></span></p></td>
+<td>The direction field is valid
+</td>
+</tr>
+<tr>
+<td><p><a name="GYPSY-COURSE-FIELDS-CLIMB:CAPS"></a><span class="term"><code class="literal">GYPSY_COURSE_FIELDS_CLIMB</code></span></p></td>
+<td>The climb field is valid
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="gypsy_course_new ()">
+<a name="gypsy-course-new"></a><h3>gypsy_course_new ()</h3>
+<pre class="programlisting"><a class="link" href="gypsy-gypsy-course.html#GypsyCourse"><span class="returnvalue">GypsyCourse</span></a> *       gypsy_course_new                    (<em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>);</pre>
+<p>
+Creates a new <a class="link" href="gypsy-gypsy-course.html#GypsyCourse"><span class="type">GypsyCourse</span></a> object that listens for course changes
+from the GPS device found at <em class="parameter"><code>object_path</code></em>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>object_path</code></em> :</span></p></td>
+<td>Object path to the GPS device.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> A <a class="link" href="gypsy-gypsy-course.html#GypsyCourse"><span class="type">GypsyCourse</span></a> object
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="gypsy_course_get_course ()">
+<a name="gypsy-course-get-course"></a><h3>gypsy_course_get_course ()</h3>
+<pre class="programlisting"><a class="link" href="gypsy-gypsy-course.html#GypsyCourseFields" title="enum GypsyCourseFields"><span class="returnvalue">GypsyCourseFields</span></a>   gypsy_course_get_course             (<em class="parameter"><code><a class="link" href="gypsy-gypsy-course.html#GypsyCourse"><span class="type">GypsyCourse</span></a> *course</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *timestamp</code></em>,
+                                                         <em class="parameter"><code><span class="type">double</span> *speed</code></em>,
+                                                         <em class="parameter"><code><span class="type">double</span> *direction</code></em>,
+                                                         <em class="parameter"><code><span class="type">double</span> *climb</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>
+Obtains the course details from <em class="parameter"><code>course</code></em>. <em class="parameter"><code>timestamp</code></em>, <em class="parameter"><code>speed</code></em>, <em class="parameter"><code>direction</code></em> and
+<em class="parameter"><code>climb</code></em> can be <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if that detail is not required.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>course</code></em> :</span></p></td>
+<td>A <a class="link" href="gypsy-gypsy-course.html#GypsyCourse"><span class="type">GypsyCourse</span></a> object
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>timestamp</code></em> :</span></p></td>
+<td>Pointer for the timestamp to be returned
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>speed</code></em> :</span></p></td>
+<td>Pointer for the speed to be returned
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>direction</code></em> :</span></p></td>
+<td>Pointer for the direction to be returned
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>climb</code></em> :</span></p></td>
+<td>Pointer for the climb to be returned
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td>A <a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> for error return
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> A bitmask of the fields that are set.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<div class="refsect1" title="Property Details">
+<a name="gypsy-gypsy-course.property-details"></a><h2>Property Details</h2>
+<div class="refsect2" title='The "object-path" property'>
+<a name="GypsyCourse--object-path"></a><h3>The <code class="literal">"object-path"</code> property</h3>
+<pre class="programlisting">  "object-path"              <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Write / Construct Only</pre>
+<p>
+The path of the Gypsy GPS object
+</p>
+<p>Default value: ""</p>
+</div>
+</div>
+<div class="refsect1" title="Signal Details">
+<a name="gypsy-gypsy-course.signal-details"></a><h2>Signal Details</h2>
+<div class="refsect2" title='The "course-changed" signal'>
+<a name="GypsyCourse-course-changed"></a><h3>The <code class="literal">"course-changed"</code> signal</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="gypsy-gypsy-course.html#GypsyCourse"><span class="type">GypsyCourse</span></a> *fields,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a>         timestamp,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a>         speed,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a>      direction,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a>      climb,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a>      arg5,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>     user_data)      : Run First / No Recursion</pre>
+<p>
+The ::course-changed signal is emitted when the GPS device
+indicates that one or more of the course fields has changed.
+The fields which have changed will be indicated in the <em class="parameter"><code>fields</code></em>
+bitmask.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>fields</code></em> :</span></p></td>
+<td>A bitmask of <a class="link" href="gypsy-gypsy-course.html#GypsyCourseFields" title="enum GypsyCourseFields"><span class="type">GypsyCourseFields</span></a> indicating which of the following fields are valid
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>timestamp</code></em> :</span></p></td>
+<td>The time this change occurred
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>speed</code></em> :</span></p></td>
+<td>The new speed
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>direction</code></em> :</span></p></td>
+<td>The new direction
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>climb</code></em> :</span></p></td>
+<td>The new rate of climb
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>user data set when the signal handler was connected.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.15</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/gypsy-server-interfaces.html b/docs/reference/html/gypsy-server-interfaces.html
index c864ddd..51ff850 100644
--- a/docs/reference/html/gypsy-server-interfaces.html
+++ b/docs/reference/html/gypsy-server-interfaces.html
@@ -8,16 +8,8 @@
 <link rel="up" href="index.html" title="Gypsy Reference Manual">
 <link rel="prev" href="gps.html" title="Getting Your Location">
 <link rel="next" href="Server.html" title="org.freedesktop.Gypsy.Server">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
@@ -42,6 +34,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/gypsy.devhelp b/docs/reference/html/gypsy.devhelp
index 4572048..312733b 100644
--- a/docs/reference/html/gypsy.devhelp
+++ b/docs/reference/html/gypsy.devhelp
@@ -26,12 +26,12 @@
     </sub>
     <sub name="LibGypsy API Reference" link="rn05.html">
       <sub name="Gypsy-Daemon Control" link="ch02.html">
-        <sub name="GypsyControl" link="GypsyControl.html"/>
+        <sub name="GypsyControl" link="gypsy-gypsy-control.html"/>
       </sub>
       <sub name="GPS Data Objects" link="ch03.html">
         <sub name="GypsyDevice" link="GypsyDevice.html"/>
         <sub name="GypsyAccuracy" link="GypsyAccuracy.html"/>
-        <sub name="GypsyCourse" link="GypsyCourse.html"/>
+        <sub name="GypsyCourse" link="gypsy-gypsy-course.html"/>
         <sub name="GypsyPosition" link="GypsyPosition.html"/>
         <sub name="GypsySatellite" link="GypsySatellite.html"/>
         <sub name="GypsyTime" link="gypsy-GypsyTime.html"/>
@@ -45,6 +45,7 @@
     <function name="The AccuracyChanged signal" link="Accuracy.html#Accuracy::AccuracyChanged"/>
     <function name="GetCourse ()" link="Course.html#Course.GetCourse"/>
     <function name="The CourseChanged signal" link="Course.html#Course::CourseChanged"/>
+    <function name="SetStartOptions ()" link="Device.html#Device.SetStartOptions"/>
     <function name="Start ()" link="Device.html#Device.Start"/>
     <function name="Stop ()" link="Device.html#Device.Stop"/>
     <function name="GetFixStatus ()" link="Device.html#Device.GetFixStatus"/>
@@ -57,51 +58,52 @@
     <function name="The SatellitesChanged signal" link="Satellite.html#Satellite::SatellitesChanged"/>
     <function name="GetTime ()" link="Time.html#Time.GetTime"/>
     <function name="The TimeChanged signal" link="Time.html#Time::TimeChanged"/>
-    <function name="GypsyControl" link="GypsyControl.html#GypsyControl-struct"/>
-    <function name="GYPSY_CONTROL_DBUS_SERVICE" link="GypsyControl.html#GYPSY-CONTROL-DBUS-SERVICE--CAPS"/>
-    <function name="GYPSY_CONTROL_DBUS_PATH" link="GypsyControl.html#GYPSY-CONTROL-DBUS-PATH--CAPS"/>
-    <function name="GYPSY_CONTROL_DBUS_INTERFACE" link="GypsyControl.html#GYPSY-CONTROL-DBUS-INTERFACE--CAPS"/>
-    <function name="gypsy_control_get_default ()" link="GypsyControl.html#gypsy-control-get-default"/>
-    <function name="gypsy_control_create ()" link="GypsyControl.html#gypsy-control-create"/>
+    <function name="GypsyControl" link="gypsy-gypsy-control.html#GypsyControl-struct"/>
+    <function name="GYPSY_CONTROL_DBUS_SERVICE" link="gypsy-gypsy-control.html#GYPSY-CONTROL-DBUS-SERVICE:CAPS"/>
+    <function name="GYPSY_CONTROL_DBUS_PATH" link="gypsy-gypsy-control.html#GYPSY-CONTROL-DBUS-PATH:CAPS"/>
+    <function name="GYPSY_CONTROL_DBUS_INTERFACE" link="gypsy-gypsy-control.html#GYPSY-CONTROL-DBUS-INTERFACE:CAPS"/>
+    <function name="gypsy_control_get_default ()" link="gypsy-gypsy-control.html#gypsy-control-get-default"/>
+    <function name="gypsy_control_create ()" link="gypsy-gypsy-control.html#gypsy-control-create"/>
     <function name="GypsyDevice" link="GypsyDevice.html#GypsyDevice-struct"/>
-    <function name="GYPSY_DEVICE_DBUS_SERVICE" link="GypsyDevice.html#GYPSY-DEVICE-DBUS-SERVICE--CAPS"/>
-    <function name="GYPSY_DEVICE_DBUS_INTERFACE" link="GypsyDevice.html#GYPSY-DEVICE-DBUS-INTERFACE--CAPS"/>
+    <function name="GYPSY_DEVICE_DBUS_SERVICE" link="GypsyDevice.html#GYPSY-DEVICE-DBUS-SERVICE:CAPS"/>
+    <function name="GYPSY_DEVICE_DBUS_INTERFACE" link="GypsyDevice.html#GYPSY-DEVICE-DBUS-INTERFACE:CAPS"/>
     <function name="enum GypsyDeviceFixStatus" link="GypsyDevice.html#GypsyDeviceFixStatus"/>
     <function name="gypsy_device_new ()" link="GypsyDevice.html#gypsy-device-new"/>
     <function name="gypsy_device_get_connection_status ()" link="GypsyDevice.html#gypsy-device-get-connection-status"/>
     <function name="gypsy_device_get_fix_status ()" link="GypsyDevice.html#gypsy-device-get-fix-status"/>
+    <function name="gypsy_device_set_start_options ()" link="GypsyDevice.html#gypsy-device-set-start-options"/>
     <function name="gypsy_device_start ()" link="GypsyDevice.html#gypsy-device-start"/>
     <function name="gypsy_device_stop ()" link="GypsyDevice.html#gypsy-device-stop"/>
     <function name="The &quot;object-path&quot; property" link="GypsyDevice.html#GypsyDevice--object-path"/>
     <function name="The &quot;connection-changed&quot; signal" link="GypsyDevice.html#GypsyDevice-connection-changed"/>
     <function name="The &quot;fix-status-changed&quot; signal" link="GypsyDevice.html#GypsyDevice-fix-status-changed"/>
     <function name="GypsyAccuracy" link="GypsyAccuracy.html#GypsyAccuracy-struct"/>
-    <function name="GYPSY_ACCURACY_DBUS_SERVICE" link="GypsyAccuracy.html#GYPSY-ACCURACY-DBUS-SERVICE--CAPS"/>
-    <function name="GYPSY_ACCURACY_DBUS_INTERFACE" link="GypsyAccuracy.html#GYPSY-ACCURACY-DBUS-INTERFACE--CAPS"/>
+    <function name="GYPSY_ACCURACY_DBUS_SERVICE" link="GypsyAccuracy.html#GYPSY-ACCURACY-DBUS-SERVICE:CAPS"/>
+    <function name="GYPSY_ACCURACY_DBUS_INTERFACE" link="GypsyAccuracy.html#GYPSY-ACCURACY-DBUS-INTERFACE:CAPS"/>
     <function name="enum GypsyAccuracyFields" link="GypsyAccuracy.html#GypsyAccuracyFields"/>
     <function name="gypsy_accuracy_new ()" link="GypsyAccuracy.html#gypsy-accuracy-new"/>
     <function name="gypsy_accuracy_get_accuracy ()" link="GypsyAccuracy.html#gypsy-accuracy-get-accuracy"/>
     <function name="The &quot;object-path&quot; property" link="GypsyAccuracy.html#GypsyAccuracy--object-path"/>
     <function name="The &quot;accuracy-changed&quot; signal" link="GypsyAccuracy.html#GypsyAccuracy-accuracy-changed"/>
-    <function name="GypsyCourse" link="GypsyCourse.html#GypsyCourse-struct"/>
-    <function name="GYPSY_COURSE_DBUS_INTERFACE" link="GypsyCourse.html#GYPSY-COURSE-DBUS-INTERFACE--CAPS"/>
-    <function name="GYPSY_COURSE_DBUS_SERVICE" link="GypsyCourse.html#GYPSY-COURSE-DBUS-SERVICE--CAPS"/>
-    <function name="enum GypsyCourseFields" link="GypsyCourse.html#GypsyCourseFields"/>
-    <function name="gypsy_course_new ()" link="GypsyCourse.html#gypsy-course-new"/>
-    <function name="gypsy_course_get_course ()" link="GypsyCourse.html#gypsy-course-get-course"/>
-    <function name="The &quot;object-path&quot; property" link="GypsyCourse.html#GypsyCourse--object-path"/>
-    <function name="The &quot;course-changed&quot; signal" link="GypsyCourse.html#GypsyCourse-course-changed"/>
+    <function name="GypsyCourse" link="gypsy-gypsy-course.html#GypsyCourse-struct"/>
+    <function name="GYPSY_COURSE_DBUS_INTERFACE" link="gypsy-gypsy-course.html#GYPSY-COURSE-DBUS-INTERFACE:CAPS"/>
+    <function name="GYPSY_COURSE_DBUS_SERVICE" link="gypsy-gypsy-course.html#GYPSY-COURSE-DBUS-SERVICE:CAPS"/>
+    <function name="enum GypsyCourseFields" link="gypsy-gypsy-course.html#GypsyCourseFields"/>
+    <function name="gypsy_course_new ()" link="gypsy-gypsy-course.html#gypsy-course-new"/>
+    <function name="gypsy_course_get_course ()" link="gypsy-gypsy-course.html#gypsy-course-get-course"/>
+    <function name="The &quot;object-path&quot; property" link="gypsy-gypsy-course.html#GypsyCourse--object-path"/>
+    <function name="The &quot;course-changed&quot; signal" link="gypsy-gypsy-course.html#GypsyCourse-course-changed"/>
     <function name="GypsyPosition" link="GypsyPosition.html#GypsyPosition-struct"/>
-    <function name="GYPSY_POSITION_DBUS_INTERFACE" link="GypsyPosition.html#GYPSY-POSITION-DBUS-INTERFACE--CAPS"/>
-    <function name="GYPSY_POSITION_DBUS_SERVICE" link="GypsyPosition.html#GYPSY-POSITION-DBUS-SERVICE--CAPS"/>
+    <function name="GYPSY_POSITION_DBUS_INTERFACE" link="GypsyPosition.html#GYPSY-POSITION-DBUS-INTERFACE:CAPS"/>
+    <function name="GYPSY_POSITION_DBUS_SERVICE" link="GypsyPosition.html#GYPSY-POSITION-DBUS-SERVICE:CAPS"/>
     <function name="enum GypsyPositionFields" link="GypsyPosition.html#GypsyPositionFields"/>
     <function name="gypsy_position_new ()" link="GypsyPosition.html#gypsy-position-new"/>
     <function name="gypsy_position_get_position ()" link="GypsyPosition.html#gypsy-position-get-position"/>
     <function name="The &quot;object-path&quot; property" link="GypsyPosition.html#GypsyPosition--object-path"/>
     <function name="The &quot;position-changed&quot; signal" link="GypsyPosition.html#GypsyPosition-position-changed"/>
     <function name="GypsySatellite" link="GypsySatellite.html#GypsySatellite-struct"/>
-    <function name="GYPSY_SATELLITE_DBUS_INTERFACE" link="GypsySatellite.html#GYPSY-SATELLITE-DBUS-INTERFACE--CAPS"/>
-    <function name="GYPSY_SATELLITE_DBUS_SERVICE" link="GypsySatellite.html#GYPSY-SATELLITE-DBUS-SERVICE--CAPS"/>
+    <function name="GYPSY_SATELLITE_DBUS_INTERFACE" link="GypsySatellite.html#GYPSY-SATELLITE-DBUS-INTERFACE:CAPS"/>
+    <function name="GYPSY_SATELLITE_DBUS_SERVICE" link="GypsySatellite.html#GYPSY-SATELLITE-DBUS-SERVICE:CAPS"/>
     <function name="GypsySatelliteDetails" link="GypsySatellite.html#GypsySatelliteDetails"/>
     <function name="gypsy_satellite_new ()" link="GypsySatellite.html#gypsy-satellite-new"/>
     <function name="gypsy_satellite_get_satellites ()" link="GypsySatellite.html#gypsy-satellite-get-satellites"/>
@@ -109,8 +111,8 @@
     <function name="The &quot;object-path&quot; property" link="GypsySatellite.html#GypsySatellite--object-path"/>
     <function name="The &quot;satellites-changed&quot; signal" link="GypsySatellite.html#GypsySatellite-satellites-changed"/>
     <function name="GypsyTime" link="gypsy-GypsyTime.html#GypsyTime"/>
-    <function name="GYPSY_TIME_DBUS_SERVICE" link="gypsy-GypsyTime.html#GYPSY-TIME-DBUS-SERVICE--CAPS"/>
-    <function name="GYPSY_TIME_DBUS_INTERFACE" link="gypsy-GypsyTime.html#GYPSY-TIME-DBUS-INTERFACE--CAPS"/>
+    <function name="GYPSY_TIME_DBUS_SERVICE" link="gypsy-GypsyTime.html#GYPSY-TIME-DBUS-SERVICE:CAPS"/>
+    <function name="GYPSY_TIME_DBUS_INTERFACE" link="gypsy-GypsyTime.html#GYPSY-TIME-DBUS-INTERFACE:CAPS"/>
     <function name="gypsy_time_new ()" link="gypsy-GypsyTime.html#gypsy-time-new"/>
     <function name="gypsy_time_get_time ()" link="gypsy-GypsyTime.html#gypsy-time-get-time"/>
   </functions>
diff --git a/docs/reference/html/gypsy.devhelp2 b/docs/reference/html/gypsy.devhelp2
index e96b437..b7411cd 100644
--- a/docs/reference/html/gypsy.devhelp2
+++ b/docs/reference/html/gypsy.devhelp2
@@ -26,12 +26,12 @@
     </sub>
     <sub name="LibGypsy API Reference" link="rn05.html">
       <sub name="Gypsy-Daemon Control" link="ch02.html">
-        <sub name="GypsyControl" link="GypsyControl.html"/>
+        <sub name="GypsyControl" link="gypsy-gypsy-control.html"/>
       </sub>
       <sub name="GPS Data Objects" link="ch03.html">
         <sub name="GypsyDevice" link="GypsyDevice.html"/>
         <sub name="GypsyAccuracy" link="GypsyAccuracy.html"/>
-        <sub name="GypsyCourse" link="GypsyCourse.html"/>
+        <sub name="GypsyCourse" link="gypsy-gypsy-course.html"/>
         <sub name="GypsyPosition" link="GypsyPosition.html"/>
         <sub name="GypsySatellite" link="GypsySatellite.html"/>
         <sub name="GypsyTime" link="gypsy-GypsyTime.html"/>
@@ -45,6 +45,7 @@
     <keyword type="" name="The AccuracyChanged signal" link="Accuracy.html#Accuracy::AccuracyChanged"/>
     <keyword type="" name="GetCourse ()" link="Course.html#Course.GetCourse"/>
     <keyword type="" name="The CourseChanged signal" link="Course.html#Course::CourseChanged"/>
+    <keyword type="" name="SetStartOptions ()" link="Device.html#Device.SetStartOptions"/>
     <keyword type="" name="Start ()" link="Device.html#Device.Start"/>
     <keyword type="" name="Stop ()" link="Device.html#Device.Stop"/>
     <keyword type="" name="GetFixStatus ()" link="Device.html#Device.GetFixStatus"/>
@@ -57,51 +58,52 @@
     <keyword type="" name="The SatellitesChanged signal" link="Satellite.html#Satellite::SatellitesChanged"/>
     <keyword type="" name="GetTime ()" link="Time.html#Time.GetTime"/>
     <keyword type="" name="The TimeChanged signal" link="Time.html#Time::TimeChanged"/>
-    <keyword type="struct" name="GypsyControl" link="GypsyControl.html#GypsyControl-struct"/>
-    <keyword type="macro" name="GYPSY_CONTROL_DBUS_SERVICE" link="GypsyControl.html#GYPSY-CONTROL-DBUS-SERVICE--CAPS"/>
-    <keyword type="macro" name="GYPSY_CONTROL_DBUS_PATH" link="GypsyControl.html#GYPSY-CONTROL-DBUS-PATH--CAPS"/>
-    <keyword type="macro" name="GYPSY_CONTROL_DBUS_INTERFACE" link="GypsyControl.html#GYPSY-CONTROL-DBUS-INTERFACE--CAPS"/>
-    <keyword type="function" name="gypsy_control_get_default ()" link="GypsyControl.html#gypsy-control-get-default"/>
-    <keyword type="function" name="gypsy_control_create ()" link="GypsyControl.html#gypsy-control-create"/>
+    <keyword type="struct" name="GypsyControl" link="gypsy-gypsy-control.html#GypsyControl-struct"/>
+    <keyword type="macro" name="GYPSY_CONTROL_DBUS_SERVICE" link="gypsy-gypsy-control.html#GYPSY-CONTROL-DBUS-SERVICE:CAPS"/>
+    <keyword type="macro" name="GYPSY_CONTROL_DBUS_PATH" link="gypsy-gypsy-control.html#GYPSY-CONTROL-DBUS-PATH:CAPS"/>
+    <keyword type="macro" name="GYPSY_CONTROL_DBUS_INTERFACE" link="gypsy-gypsy-control.html#GYPSY-CONTROL-DBUS-INTERFACE:CAPS"/>
+    <keyword type="function" name="gypsy_control_get_default ()" link="gypsy-gypsy-control.html#gypsy-control-get-default"/>
+    <keyword type="function" name="gypsy_control_create ()" link="gypsy-gypsy-control.html#gypsy-control-create"/>
     <keyword type="struct" name="GypsyDevice" link="GypsyDevice.html#GypsyDevice-struct"/>
-    <keyword type="macro" name="GYPSY_DEVICE_DBUS_SERVICE" link="GypsyDevice.html#GYPSY-DEVICE-DBUS-SERVICE--CAPS"/>
-    <keyword type="macro" name="GYPSY_DEVICE_DBUS_INTERFACE" link="GypsyDevice.html#GYPSY-DEVICE-DBUS-INTERFACE--CAPS"/>
+    <keyword type="macro" name="GYPSY_DEVICE_DBUS_SERVICE" link="GypsyDevice.html#GYPSY-DEVICE-DBUS-SERVICE:CAPS"/>
+    <keyword type="macro" name="GYPSY_DEVICE_DBUS_INTERFACE" link="GypsyDevice.html#GYPSY-DEVICE-DBUS-INTERFACE:CAPS"/>
     <keyword type="enum" name="enum GypsyDeviceFixStatus" link="GypsyDevice.html#GypsyDeviceFixStatus"/>
     <keyword type="function" name="gypsy_device_new ()" link="GypsyDevice.html#gypsy-device-new"/>
     <keyword type="function" name="gypsy_device_get_connection_status ()" link="GypsyDevice.html#gypsy-device-get-connection-status"/>
     <keyword type="function" name="gypsy_device_get_fix_status ()" link="GypsyDevice.html#gypsy-device-get-fix-status"/>
+    <keyword type="function" name="gypsy_device_set_start_options ()" link="GypsyDevice.html#gypsy-device-set-start-options"/>
     <keyword type="function" name="gypsy_device_start ()" link="GypsyDevice.html#gypsy-device-start"/>
     <keyword type="function" name="gypsy_device_stop ()" link="GypsyDevice.html#gypsy-device-stop"/>
     <keyword type="property" name="The &quot;object-path&quot; property" link="GypsyDevice.html#GypsyDevice--object-path"/>
     <keyword type="signal" name="The &quot;connection-changed&quot; signal" link="GypsyDevice.html#GypsyDevice-connection-changed"/>
     <keyword type="signal" name="The &quot;fix-status-changed&quot; signal" link="GypsyDevice.html#GypsyDevice-fix-status-changed"/>
     <keyword type="struct" name="GypsyAccuracy" link="GypsyAccuracy.html#GypsyAccuracy-struct"/>
-    <keyword type="macro" name="GYPSY_ACCURACY_DBUS_SERVICE" link="GypsyAccuracy.html#GYPSY-ACCURACY-DBUS-SERVICE--CAPS"/>
-    <keyword type="macro" name="GYPSY_ACCURACY_DBUS_INTERFACE" link="GypsyAccuracy.html#GYPSY-ACCURACY-DBUS-INTERFACE--CAPS"/>
+    <keyword type="macro" name="GYPSY_ACCURACY_DBUS_SERVICE" link="GypsyAccuracy.html#GYPSY-ACCURACY-DBUS-SERVICE:CAPS"/>
+    <keyword type="macro" name="GYPSY_ACCURACY_DBUS_INTERFACE" link="GypsyAccuracy.html#GYPSY-ACCURACY-DBUS-INTERFACE:CAPS"/>
     <keyword type="enum" name="enum GypsyAccuracyFields" link="GypsyAccuracy.html#GypsyAccuracyFields"/>
     <keyword type="function" name="gypsy_accuracy_new ()" link="GypsyAccuracy.html#gypsy-accuracy-new"/>
     <keyword type="function" name="gypsy_accuracy_get_accuracy ()" link="GypsyAccuracy.html#gypsy-accuracy-get-accuracy"/>
     <keyword type="property" name="The &quot;object-path&quot; property" link="GypsyAccuracy.html#GypsyAccuracy--object-path"/>
     <keyword type="signal" name="The &quot;accuracy-changed&quot; signal" link="GypsyAccuracy.html#GypsyAccuracy-accuracy-changed"/>
-    <keyword type="struct" name="GypsyCourse" link="GypsyCourse.html#GypsyCourse-struct"/>
-    <keyword type="macro" name="GYPSY_COURSE_DBUS_INTERFACE" link="GypsyCourse.html#GYPSY-COURSE-DBUS-INTERFACE--CAPS"/>
-    <keyword type="macro" name="GYPSY_COURSE_DBUS_SERVICE" link="GypsyCourse.html#GYPSY-COURSE-DBUS-SERVICE--CAPS"/>
-    <keyword type="enum" name="enum GypsyCourseFields" link="GypsyCourse.html#GypsyCourseFields"/>
-    <keyword type="function" name="gypsy_course_new ()" link="GypsyCourse.html#gypsy-course-new"/>
-    <keyword type="function" name="gypsy_course_get_course ()" link="GypsyCourse.html#gypsy-course-get-course"/>
-    <keyword type="property" name="The &quot;object-path&quot; property" link="GypsyCourse.html#GypsyCourse--object-path"/>
-    <keyword type="signal" name="The &quot;course-changed&quot; signal" link="GypsyCourse.html#GypsyCourse-course-changed"/>
+    <keyword type="struct" name="GypsyCourse" link="gypsy-gypsy-course.html#GypsyCourse-struct"/>
+    <keyword type="macro" name="GYPSY_COURSE_DBUS_INTERFACE" link="gypsy-gypsy-course.html#GYPSY-COURSE-DBUS-INTERFACE:CAPS"/>
+    <keyword type="macro" name="GYPSY_COURSE_DBUS_SERVICE" link="gypsy-gypsy-course.html#GYPSY-COURSE-DBUS-SERVICE:CAPS"/>
+    <keyword type="enum" name="enum GypsyCourseFields" link="gypsy-gypsy-course.html#GypsyCourseFields"/>
+    <keyword type="function" name="gypsy_course_new ()" link="gypsy-gypsy-course.html#gypsy-course-new"/>
+    <keyword type="function" name="gypsy_course_get_course ()" link="gypsy-gypsy-course.html#gypsy-course-get-course"/>
+    <keyword type="property" name="The &quot;object-path&quot; property" link="gypsy-gypsy-course.html#GypsyCourse--object-path"/>
+    <keyword type="signal" name="The &quot;course-changed&quot; signal" link="gypsy-gypsy-course.html#GypsyCourse-course-changed"/>
     <keyword type="struct" name="GypsyPosition" link="GypsyPosition.html#GypsyPosition-struct"/>
-    <keyword type="macro" name="GYPSY_POSITION_DBUS_INTERFACE" link="GypsyPosition.html#GYPSY-POSITION-DBUS-INTERFACE--CAPS"/>
-    <keyword type="macro" name="GYPSY_POSITION_DBUS_SERVICE" link="GypsyPosition.html#GYPSY-POSITION-DBUS-SERVICE--CAPS"/>
+    <keyword type="macro" name="GYPSY_POSITION_DBUS_INTERFACE" link="GypsyPosition.html#GYPSY-POSITION-DBUS-INTERFACE:CAPS"/>
+    <keyword type="macro" name="GYPSY_POSITION_DBUS_SERVICE" link="GypsyPosition.html#GYPSY-POSITION-DBUS-SERVICE:CAPS"/>
     <keyword type="enum" name="enum GypsyPositionFields" link="GypsyPosition.html#GypsyPositionFields"/>
     <keyword type="function" name="gypsy_position_new ()" link="GypsyPosition.html#gypsy-position-new"/>
     <keyword type="function" name="gypsy_position_get_position ()" link="GypsyPosition.html#gypsy-position-get-position"/>
     <keyword type="property" name="The &quot;object-path&quot; property" link="GypsyPosition.html#GypsyPosition--object-path"/>
     <keyword type="signal" name="The &quot;position-changed&quot; signal" link="GypsyPosition.html#GypsyPosition-position-changed"/>
     <keyword type="struct" name="GypsySatellite" link="GypsySatellite.html#GypsySatellite-struct"/>
-    <keyword type="macro" name="GYPSY_SATELLITE_DBUS_INTERFACE" link="GypsySatellite.html#GYPSY-SATELLITE-DBUS-INTERFACE--CAPS"/>
-    <keyword type="macro" name="GYPSY_SATELLITE_DBUS_SERVICE" link="GypsySatellite.html#GYPSY-SATELLITE-DBUS-SERVICE--CAPS"/>
+    <keyword type="macro" name="GYPSY_SATELLITE_DBUS_INTERFACE" link="GypsySatellite.html#GYPSY-SATELLITE-DBUS-INTERFACE:CAPS"/>
+    <keyword type="macro" name="GYPSY_SATELLITE_DBUS_SERVICE" link="GypsySatellite.html#GYPSY-SATELLITE-DBUS-SERVICE:CAPS"/>
     <keyword type="struct" name="GypsySatelliteDetails" link="GypsySatellite.html#GypsySatelliteDetails"/>
     <keyword type="function" name="gypsy_satellite_new ()" link="GypsySatellite.html#gypsy-satellite-new"/>
     <keyword type="function" name="gypsy_satellite_get_satellites ()" link="GypsySatellite.html#gypsy-satellite-get-satellites"/>
@@ -109,25 +111,25 @@
     <keyword type="property" name="The &quot;object-path&quot; property" link="GypsySatellite.html#GypsySatellite--object-path"/>
     <keyword type="signal" name="The &quot;satellites-changed&quot; signal" link="GypsySatellite.html#GypsySatellite-satellites-changed"/>
     <keyword type="struct" name="GypsyTime" link="gypsy-GypsyTime.html#GypsyTime"/>
-    <keyword type="macro" name="GYPSY_TIME_DBUS_SERVICE" link="gypsy-GypsyTime.html#GYPSY-TIME-DBUS-SERVICE--CAPS"/>
-    <keyword type="macro" name="GYPSY_TIME_DBUS_INTERFACE" link="gypsy-GypsyTime.html#GYPSY-TIME-DBUS-INTERFACE--CAPS"/>
+    <keyword type="macro" name="GYPSY_TIME_DBUS_SERVICE" link="gypsy-GypsyTime.html#GYPSY-TIME-DBUS-SERVICE:CAPS"/>
+    <keyword type="macro" name="GYPSY_TIME_DBUS_INTERFACE" link="gypsy-GypsyTime.html#GYPSY-TIME-DBUS-INTERFACE:CAPS"/>
     <keyword type="function" name="gypsy_time_new ()" link="gypsy-GypsyTime.html#gypsy-time-new"/>
     <keyword type="function" name="gypsy_time_get_time ()" link="gypsy-GypsyTime.html#gypsy-time-get-time"/>
-    <keyword type="constant" name="GYPSY_DEVICE_FIX_STATUS_INVALID" link="GypsyDevice.html#GYPSY-DEVICE-FIX-STATUS-INVALID--CAPS"/>
-    <keyword type="constant" name="GYPSY_DEVICE_FIX_STATUS_NONE" link="GypsyDevice.html#GYPSY-DEVICE-FIX-STATUS-NONE--CAPS"/>
-    <keyword type="constant" name="GYPSY_DEVICE_FIX_STATUS_2D" link="GypsyDevice.html#GYPSY-DEVICE-FIX-STATUS-2D--CAPS"/>
-    <keyword type="constant" name="GYPSY_DEVICE_FIX_STATUS_3D" link="GypsyDevice.html#GYPSY-DEVICE-FIX-STATUS-3D--CAPS"/>
-    <keyword type="constant" name="GYPSY_ACCURACY_FIELDS_NONE" link="GypsyAccuracy.html#GYPSY-ACCURACY-FIELDS-NONE--CAPS"/>
-    <keyword type="constant" name="GYPSY_ACCURACY_FIELDS_POSITION" link="GypsyAccuracy.html#GYPSY-ACCURACY-FIELDS-POSITION--CAPS"/>
-    <keyword type="constant" name="GYPSY_ACCURACY_FIELDS_HORIZONTAL" link="GypsyAccuracy.html#GYPSY-ACCURACY-FIELDS-HORIZONTAL--CAPS"/>
-    <keyword type="constant" name="GYPSY_ACCURACY_FIELDS_VERTICAL" link="GypsyAccuracy.html#GYPSY-ACCURACY-FIELDS-VERTICAL--CAPS"/>
-    <keyword type="constant" name="GYPSY_COURSE_FIELDS_NONE" link="GypsyCourse.html#GYPSY-COURSE-FIELDS-NONE--CAPS"/>
-    <keyword type="constant" name="GYPSY_COURSE_FIELDS_SPEED" link="GypsyCourse.html#GYPSY-COURSE-FIELDS-SPEED--CAPS"/>
-    <keyword type="constant" name="GYPSY_COURSE_FIELDS_DIRECTION" link="GypsyCourse.html#GYPSY-COURSE-FIELDS-DIRECTION--CAPS"/>
-    <keyword type="constant" name="GYPSY_COURSE_FIELDS_CLIMB" link="GypsyCourse.html#GYPSY-COURSE-FIELDS-CLIMB--CAPS"/>
-    <keyword type="constant" name="GYPSY_POSITION_FIELDS_NONE" link="GypsyPosition.html#GYPSY-POSITION-FIELDS-NONE--CAPS"/>
-    <keyword type="constant" name="GYPSY_POSITION_FIELDS_LATITUDE" link="GypsyPosition.html#GYPSY-POSITION-FIELDS-LATITUDE--CAPS"/>
-    <keyword type="constant" name="GYPSY_POSITION_FIELDS_LONGITUDE" link="GypsyPosition.html#GYPSY-POSITION-FIELDS-LONGITUDE--CAPS"/>
-    <keyword type="constant" name="GYPSY_POSITION_FIELDS_ALTITUDE" link="GypsyPosition.html#GYPSY-POSITION-FIELDS-ALTITUDE--CAPS"/>
+    <keyword type="constant" name="GYPSY_DEVICE_FIX_STATUS_INVALID" link="GypsyDevice.html#GYPSY-DEVICE-FIX-STATUS-INVALID:CAPS"/>
+    <keyword type="constant" name="GYPSY_DEVICE_FIX_STATUS_NONE" link="GypsyDevice.html#GYPSY-DEVICE-FIX-STATUS-NONE:CAPS"/>
+    <keyword type="constant" name="GYPSY_DEVICE_FIX_STATUS_2D" link="GypsyDevice.html#GYPSY-DEVICE-FIX-STATUS-2D:CAPS"/>
+    <keyword type="constant" name="GYPSY_DEVICE_FIX_STATUS_3D" link="GypsyDevice.html#GYPSY-DEVICE-FIX-STATUS-3D:CAPS"/>
+    <keyword type="constant" name="GYPSY_ACCURACY_FIELDS_NONE" link="GypsyAccuracy.html#GYPSY-ACCURACY-FIELDS-NONE:CAPS"/>
+    <keyword type="constant" name="GYPSY_ACCURACY_FIELDS_POSITION" link="GypsyAccuracy.html#GYPSY-ACCURACY-FIELDS-POSITION:CAPS"/>
+    <keyword type="constant" name="GYPSY_ACCURACY_FIELDS_HORIZONTAL" link="GypsyAccuracy.html#GYPSY-ACCURACY-FIELDS-HORIZONTAL:CAPS"/>
+    <keyword type="constant" name="GYPSY_ACCURACY_FIELDS_VERTICAL" link="GypsyAccuracy.html#GYPSY-ACCURACY-FIELDS-VERTICAL:CAPS"/>
+    <keyword type="constant" name="GYPSY_COURSE_FIELDS_NONE" link="gypsy-gypsy-course.html#GYPSY-COURSE-FIELDS-NONE:CAPS"/>
+    <keyword type="constant" name="GYPSY_COURSE_FIELDS_SPEED" link="gypsy-gypsy-course.html#GYPSY-COURSE-FIELDS-SPEED:CAPS"/>
+    <keyword type="constant" name="GYPSY_COURSE_FIELDS_DIRECTION" link="gypsy-gypsy-course.html#GYPSY-COURSE-FIELDS-DIRECTION:CAPS"/>
+    <keyword type="constant" name="GYPSY_COURSE_FIELDS_CLIMB" link="gypsy-gypsy-course.html#GYPSY-COURSE-FIELDS-CLIMB:CAPS"/>
+    <keyword type="constant" name="GYPSY_POSITION_FIELDS_NONE" link="GypsyPosition.html#GYPSY-POSITION-FIELDS-NONE:CAPS"/>
+    <keyword type="constant" name="GYPSY_POSITION_FIELDS_LATITUDE" link="GypsyPosition.html#GYPSY-POSITION-FIELDS-LATITUDE:CAPS"/>
+    <keyword type="constant" name="GYPSY_POSITION_FIELDS_LONGITUDE" link="GypsyPosition.html#GYPSY-POSITION-FIELDS-LONGITUDE:CAPS"/>
+    <keyword type="constant" name="GYPSY_POSITION_FIELDS_ALTITUDE" link="GypsyPosition.html#GYPSY-POSITION-FIELDS-ALTITUDE:CAPS"/>
   </functions>
 </book>
diff --git a/docs/reference/html/index.html b/docs/reference/html/index.html
index b82d01a..b9ef84e 100644
--- a/docs/reference/html/index.html
+++ b/docs/reference/html/index.html
@@ -6,16 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="index.html" title="Gypsy Reference Manual">
 <link rel="next" href="rn01.html" title="Gypsy Overview">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <div class="book" title="Gypsy Reference Manual">
@@ -40,12 +32,12 @@
           </p></div></div>
 </div>
 </div></div>
-<div><p class="releaseinfo">Version 0.7
+<div><p class="releaseinfo">Version 0.8
 </p></div>
 <div><p class="copyright">Copyright © 2007 Iain Holmes</p></div>
 <div><p class="copyright">Copyright © 2007 OpenedHand LTD</p></div>
 <div><div class="legalnotice" title="Legal Notice">
-<a name="id499785"></a><p>
+<a name="id480362"></a><p>
         Permission is granted to copy, distribute and/or modify this
         document under the terms of the <em class="citetitle">GNU Free
         Documentation License</em>, Version 1.1 or any later
@@ -117,7 +109,7 @@
 <dd><dl>
 <dt><span class="chapter"><a href="ch02.html">Gypsy-Daemon Control</a></span></dt>
 <dd><dl><dt>
-<span class="refentrytitle"><a href="GypsyControl.html">GypsyControl</a></span><span class="refpurpose"> — Control object for gypsy-daemon</span>
+<span class="refentrytitle"><a href="gypsy-gypsy-control.html">GypsyControl</a></span><span class="refpurpose"> — Control object for gypsy-daemon</span>
 </dt></dl></dd>
 <dt><span class="chapter"><a href="ch03.html">GPS Data Objects</a></span></dt>
 <dd><dl>
@@ -128,7 +120,7 @@
 <span class="refentrytitle"><a href="GypsyAccuracy.html">GypsyAccuracy</a></span><span class="refpurpose"> — Object for obtaining accuracy information from gypsy-daemon</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="GypsyCourse.html">GypsyCourse</a></span><span class="refpurpose"> — Object for obtaining course information</span>
+<span class="refentrytitle"><a href="gypsy-gypsy-course.html">GypsyCourse</a></span><span class="refpurpose"> — Object for obtaining course information</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="GypsyPosition.html">GypsyPosition</a></span><span class="refpurpose"> — Object for obtaining positions from gypsy-daemon</span>
@@ -145,6 +137,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/index.sgml b/docs/reference/html/index.sgml
index 7e2c90c..3060f06 100644
--- a/docs/reference/html/index.sgml
+++ b/docs/reference/html/index.sgml
@@ -10,6 +10,7 @@
 <ANCHOR id="Course.GetCourse" href="gypsy/Course.html#Course.GetCourse">
 <ANCHOR id="Course::CourseChanged" href="gypsy/Course.html#Course::CourseChanged">
 <ANCHOR id="Device" href="gypsy/Device.html">
+<ANCHOR id="Device.SetStartOptions" href="gypsy/Device.html#Device.SetStartOptions">
 <ANCHOR id="Device.Start" href="gypsy/Device.html#Device.Start">
 <ANCHOR id="Device.Stop" href="gypsy/Device.html#Device.Stop">
 <ANCHOR id="Device.GetFixStatus" href="gypsy/Device.html#Device.GetFixStatus">
@@ -25,17 +26,18 @@
 <ANCHOR id="Time" href="gypsy/Time.html">
 <ANCHOR id="Time.GetTime" href="gypsy/Time.html#Time.GetTime">
 <ANCHOR id="Time::TimeChanged" href="gypsy/Time.html#Time::TimeChanged">
-<ANCHOR id="GypsyControl" href="gypsy/GypsyControl.html">
-<ANCHOR id="GypsyControl.synopsis" href="gypsy/GypsyControl.html#GypsyControl.synopsis">
-<ANCHOR id="GypsyControl.object-hierarchy" href="gypsy/GypsyControl.html#GypsyControl.object-hierarchy">
-<ANCHOR id="GypsyControl.description" href="gypsy/GypsyControl.html#GypsyControl.description">
-<ANCHOR id="GypsyControl.details" href="gypsy/GypsyControl.html#GypsyControl.details">
-<ANCHOR id="GypsyControl-struct" href="gypsy/GypsyControl.html#GypsyControl-struct">
-<ANCHOR id="GYPSY-CONTROL-DBUS-SERVICE--CAPS" href="gypsy/GypsyControl.html#GYPSY-CONTROL-DBUS-SERVICE--CAPS">
-<ANCHOR id="GYPSY-CONTROL-DBUS-PATH--CAPS" href="gypsy/GypsyControl.html#GYPSY-CONTROL-DBUS-PATH--CAPS">
-<ANCHOR id="GYPSY-CONTROL-DBUS-INTERFACE--CAPS" href="gypsy/GypsyControl.html#GYPSY-CONTROL-DBUS-INTERFACE--CAPS">
-<ANCHOR id="gypsy-control-get-default" href="gypsy/GypsyControl.html#gypsy-control-get-default">
-<ANCHOR id="gypsy-control-create" href="gypsy/GypsyControl.html#gypsy-control-create">
+<ANCHOR id="gypsy-gypsy-control" href="gypsy/gypsy-gypsy-control.html">
+<ANCHOR id="gypsy-gypsy-control.synopsis" href="gypsy/gypsy-gypsy-control.html#gypsy-gypsy-control.synopsis">
+<ANCHOR id="GypsyControl" href="gypsy/gypsy-gypsy-control.html#GypsyControl">
+<ANCHOR id="gypsy-gypsy-control.object-hierarchy" href="gypsy/gypsy-gypsy-control.html#gypsy-gypsy-control.object-hierarchy">
+<ANCHOR id="gypsy-gypsy-control.description" href="gypsy/gypsy-gypsy-control.html#gypsy-gypsy-control.description">
+<ANCHOR id="gypsy-gypsy-control.details" href="gypsy/gypsy-gypsy-control.html#gypsy-gypsy-control.details">
+<ANCHOR id="GypsyControl-struct" href="gypsy/gypsy-gypsy-control.html#GypsyControl-struct">
+<ANCHOR id="GYPSY-CONTROL-DBUS-SERVICE:CAPS" href="gypsy/gypsy-gypsy-control.html#GYPSY-CONTROL-DBUS-SERVICE:CAPS">
+<ANCHOR id="GYPSY-CONTROL-DBUS-PATH:CAPS" href="gypsy/gypsy-gypsy-control.html#GYPSY-CONTROL-DBUS-PATH:CAPS">
+<ANCHOR id="GYPSY-CONTROL-DBUS-INTERFACE:CAPS" href="gypsy/gypsy-gypsy-control.html#GYPSY-CONTROL-DBUS-INTERFACE:CAPS">
+<ANCHOR id="gypsy-control-get-default" href="gypsy/gypsy-gypsy-control.html#gypsy-control-get-default">
+<ANCHOR id="gypsy-control-create" href="gypsy/gypsy-gypsy-control.html#gypsy-control-create">
 <ANCHOR id="GypsyDevice" href="gypsy/GypsyDevice.html">
 <ANCHOR id="GypsyDevice.synopsis" href="gypsy/GypsyDevice.html#GypsyDevice.synopsis">
 <ANCHOR id="GypsyDevice.object-hierarchy" href="gypsy/GypsyDevice.html#GypsyDevice.object-hierarchy">
@@ -44,12 +46,17 @@
 <ANCHOR id="GypsyDevice.description" href="gypsy/GypsyDevice.html#GypsyDevice.description">
 <ANCHOR id="GypsyDevice.details" href="gypsy/GypsyDevice.html#GypsyDevice.details">
 <ANCHOR id="GypsyDevice-struct" href="gypsy/GypsyDevice.html#GypsyDevice-struct">
-<ANCHOR id="GYPSY-DEVICE-DBUS-SERVICE--CAPS" href="gypsy/GypsyDevice.html#GYPSY-DEVICE-DBUS-SERVICE--CAPS">
-<ANCHOR id="GYPSY-DEVICE-DBUS-INTERFACE--CAPS" href="gypsy/GypsyDevice.html#GYPSY-DEVICE-DBUS-INTERFACE--CAPS">
+<ANCHOR id="GYPSY-DEVICE-DBUS-SERVICE:CAPS" href="gypsy/GypsyDevice.html#GYPSY-DEVICE-DBUS-SERVICE:CAPS">
+<ANCHOR id="GYPSY-DEVICE-DBUS-INTERFACE:CAPS" href="gypsy/GypsyDevice.html#GYPSY-DEVICE-DBUS-INTERFACE:CAPS">
 <ANCHOR id="GypsyDeviceFixStatus" href="gypsy/GypsyDevice.html#GypsyDeviceFixStatus">
+<ANCHOR id="GYPSY-DEVICE-FIX-STATUS-INVALID:CAPS" href="gypsy/GypsyDevice.html#GYPSY-DEVICE-FIX-STATUS-INVALID:CAPS">
+<ANCHOR id="GYPSY-DEVICE-FIX-STATUS-NONE:CAPS" href="gypsy/GypsyDevice.html#GYPSY-DEVICE-FIX-STATUS-NONE:CAPS">
+<ANCHOR id="GYPSY-DEVICE-FIX-STATUS-2D:CAPS" href="gypsy/GypsyDevice.html#GYPSY-DEVICE-FIX-STATUS-2D:CAPS">
+<ANCHOR id="GYPSY-DEVICE-FIX-STATUS-3D:CAPS" href="gypsy/GypsyDevice.html#GYPSY-DEVICE-FIX-STATUS-3D:CAPS">
 <ANCHOR id="gypsy-device-new" href="gypsy/GypsyDevice.html#gypsy-device-new">
 <ANCHOR id="gypsy-device-get-connection-status" href="gypsy/GypsyDevice.html#gypsy-device-get-connection-status">
 <ANCHOR id="gypsy-device-get-fix-status" href="gypsy/GypsyDevice.html#gypsy-device-get-fix-status">
+<ANCHOR id="gypsy-device-set-start-options" href="gypsy/GypsyDevice.html#gypsy-device-set-start-options">
 <ANCHOR id="gypsy-device-start" href="gypsy/GypsyDevice.html#gypsy-device-start">
 <ANCHOR id="gypsy-device-stop" href="gypsy/GypsyDevice.html#gypsy-device-stop">
 <ANCHOR id="GypsyDevice.property-details" href="gypsy/GypsyDevice.html#GypsyDevice.property-details">
@@ -65,32 +72,41 @@
 <ANCHOR id="GypsyAccuracy.description" href="gypsy/GypsyAccuracy.html#GypsyAccuracy.description">
 <ANCHOR id="GypsyAccuracy.details" href="gypsy/GypsyAccuracy.html#GypsyAccuracy.details">
 <ANCHOR id="GypsyAccuracy-struct" href="gypsy/GypsyAccuracy.html#GypsyAccuracy-struct">
-<ANCHOR id="GYPSY-ACCURACY-DBUS-SERVICE--CAPS" href="gypsy/GypsyAccuracy.html#GYPSY-ACCURACY-DBUS-SERVICE--CAPS">
-<ANCHOR id="GYPSY-ACCURACY-DBUS-INTERFACE--CAPS" href="gypsy/GypsyAccuracy.html#GYPSY-ACCURACY-DBUS-INTERFACE--CAPS">
+<ANCHOR id="GYPSY-ACCURACY-DBUS-SERVICE:CAPS" href="gypsy/GypsyAccuracy.html#GYPSY-ACCURACY-DBUS-SERVICE:CAPS">
+<ANCHOR id="GYPSY-ACCURACY-DBUS-INTERFACE:CAPS" href="gypsy/GypsyAccuracy.html#GYPSY-ACCURACY-DBUS-INTERFACE:CAPS">
 <ANCHOR id="GypsyAccuracyFields" href="gypsy/GypsyAccuracy.html#GypsyAccuracyFields">
+<ANCHOR id="GYPSY-ACCURACY-FIELDS-NONE:CAPS" href="gypsy/GypsyAccuracy.html#GYPSY-ACCURACY-FIELDS-NONE:CAPS">
+<ANCHOR id="GYPSY-ACCURACY-FIELDS-POSITION:CAPS" href="gypsy/GypsyAccuracy.html#GYPSY-ACCURACY-FIELDS-POSITION:CAPS">
+<ANCHOR id="GYPSY-ACCURACY-FIELDS-HORIZONTAL:CAPS" href="gypsy/GypsyAccuracy.html#GYPSY-ACCURACY-FIELDS-HORIZONTAL:CAPS">
+<ANCHOR id="GYPSY-ACCURACY-FIELDS-VERTICAL:CAPS" href="gypsy/GypsyAccuracy.html#GYPSY-ACCURACY-FIELDS-VERTICAL:CAPS">
 <ANCHOR id="gypsy-accuracy-new" href="gypsy/GypsyAccuracy.html#gypsy-accuracy-new">
 <ANCHOR id="gypsy-accuracy-get-accuracy" href="gypsy/GypsyAccuracy.html#gypsy-accuracy-get-accuracy">
 <ANCHOR id="GypsyAccuracy.property-details" href="gypsy/GypsyAccuracy.html#GypsyAccuracy.property-details">
 <ANCHOR id="GypsyAccuracy--object-path" href="gypsy/GypsyAccuracy.html#GypsyAccuracy--object-path">
 <ANCHOR id="GypsyAccuracy.signal-details" href="gypsy/GypsyAccuracy.html#GypsyAccuracy.signal-details">
 <ANCHOR id="GypsyAccuracy-accuracy-changed" href="gypsy/GypsyAccuracy.html#GypsyAccuracy-accuracy-changed">
-<ANCHOR id="GypsyCourse" href="gypsy/GypsyCourse.html">
-<ANCHOR id="GypsyCourse.synopsis" href="gypsy/GypsyCourse.html#GypsyCourse.synopsis">
-<ANCHOR id="GypsyCourse.object-hierarchy" href="gypsy/GypsyCourse.html#GypsyCourse.object-hierarchy">
-<ANCHOR id="GypsyCourse.properties" href="gypsy/GypsyCourse.html#GypsyCourse.properties">
-<ANCHOR id="GypsyCourse.signals" href="gypsy/GypsyCourse.html#GypsyCourse.signals">
-<ANCHOR id="GypsyCourse.description" href="gypsy/GypsyCourse.html#GypsyCourse.description">
-<ANCHOR id="GypsyCourse.details" href="gypsy/GypsyCourse.html#GypsyCourse.details">
-<ANCHOR id="GypsyCourse-struct" href="gypsy/GypsyCourse.html#GypsyCourse-struct">
-<ANCHOR id="GYPSY-COURSE-DBUS-INTERFACE--CAPS" href="gypsy/GypsyCourse.html#GYPSY-COURSE-DBUS-INTERFACE--CAPS">
-<ANCHOR id="GYPSY-COURSE-DBUS-SERVICE--CAPS" href="gypsy/GypsyCourse.html#GYPSY-COURSE-DBUS-SERVICE--CAPS">
-<ANCHOR id="GypsyCourseFields" href="gypsy/GypsyCourse.html#GypsyCourseFields">
-<ANCHOR id="gypsy-course-new" href="gypsy/GypsyCourse.html#gypsy-course-new">
-<ANCHOR id="gypsy-course-get-course" href="gypsy/GypsyCourse.html#gypsy-course-get-course">
-<ANCHOR id="GypsyCourse.property-details" href="gypsy/GypsyCourse.html#GypsyCourse.property-details">
-<ANCHOR id="GypsyCourse--object-path" href="gypsy/GypsyCourse.html#GypsyCourse--object-path">
-<ANCHOR id="GypsyCourse.signal-details" href="gypsy/GypsyCourse.html#GypsyCourse.signal-details">
-<ANCHOR id="GypsyCourse-course-changed" href="gypsy/GypsyCourse.html#GypsyCourse-course-changed">
+<ANCHOR id="gypsy-gypsy-course" href="gypsy/gypsy-gypsy-course.html">
+<ANCHOR id="gypsy-gypsy-course.synopsis" href="gypsy/gypsy-gypsy-course.html#gypsy-gypsy-course.synopsis">
+<ANCHOR id="GypsyCourse" href="gypsy/gypsy-gypsy-course.html#GypsyCourse">
+<ANCHOR id="gypsy-gypsy-course.object-hierarchy" href="gypsy/gypsy-gypsy-course.html#gypsy-gypsy-course.object-hierarchy">
+<ANCHOR id="gypsy-gypsy-course.properties" href="gypsy/gypsy-gypsy-course.html#gypsy-gypsy-course.properties">
+<ANCHOR id="gypsy-gypsy-course.signals" href="gypsy/gypsy-gypsy-course.html#gypsy-gypsy-course.signals">
+<ANCHOR id="gypsy-gypsy-course.description" href="gypsy/gypsy-gypsy-course.html#gypsy-gypsy-course.description">
+<ANCHOR id="gypsy-gypsy-course.details" href="gypsy/gypsy-gypsy-course.html#gypsy-gypsy-course.details">
+<ANCHOR id="GypsyCourse-struct" href="gypsy/gypsy-gypsy-course.html#GypsyCourse-struct">
+<ANCHOR id="GYPSY-COURSE-DBUS-INTERFACE:CAPS" href="gypsy/gypsy-gypsy-course.html#GYPSY-COURSE-DBUS-INTERFACE:CAPS">
+<ANCHOR id="GYPSY-COURSE-DBUS-SERVICE:CAPS" href="gypsy/gypsy-gypsy-course.html#GYPSY-COURSE-DBUS-SERVICE:CAPS">
+<ANCHOR id="GypsyCourseFields" href="gypsy/gypsy-gypsy-course.html#GypsyCourseFields">
+<ANCHOR id="GYPSY-COURSE-FIELDS-NONE:CAPS" href="gypsy/gypsy-gypsy-course.html#GYPSY-COURSE-FIELDS-NONE:CAPS">
+<ANCHOR id="GYPSY-COURSE-FIELDS-SPEED:CAPS" href="gypsy/gypsy-gypsy-course.html#GYPSY-COURSE-FIELDS-SPEED:CAPS">
+<ANCHOR id="GYPSY-COURSE-FIELDS-DIRECTION:CAPS" href="gypsy/gypsy-gypsy-course.html#GYPSY-COURSE-FIELDS-DIRECTION:CAPS">
+<ANCHOR id="GYPSY-COURSE-FIELDS-CLIMB:CAPS" href="gypsy/gypsy-gypsy-course.html#GYPSY-COURSE-FIELDS-CLIMB:CAPS">
+<ANCHOR id="gypsy-course-new" href="gypsy/gypsy-gypsy-course.html#gypsy-course-new">
+<ANCHOR id="gypsy-course-get-course" href="gypsy/gypsy-gypsy-course.html#gypsy-course-get-course">
+<ANCHOR id="gypsy-gypsy-course.property-details" href="gypsy/gypsy-gypsy-course.html#gypsy-gypsy-course.property-details">
+<ANCHOR id="GypsyCourse--object-path" href="gypsy/gypsy-gypsy-course.html#GypsyCourse--object-path">
+<ANCHOR id="gypsy-gypsy-course.signal-details" href="gypsy/gypsy-gypsy-course.html#gypsy-gypsy-course.signal-details">
+<ANCHOR id="GypsyCourse-course-changed" href="gypsy/gypsy-gypsy-course.html#GypsyCourse-course-changed">
 <ANCHOR id="GypsyPosition" href="gypsy/GypsyPosition.html">
 <ANCHOR id="GypsyPosition.synopsis" href="gypsy/GypsyPosition.html#GypsyPosition.synopsis">
 <ANCHOR id="GypsyPosition.object-hierarchy" href="gypsy/GypsyPosition.html#GypsyPosition.object-hierarchy">
@@ -99,9 +115,13 @@
 <ANCHOR id="GypsyPosition.description" href="gypsy/GypsyPosition.html#GypsyPosition.description">
 <ANCHOR id="GypsyPosition.details" href="gypsy/GypsyPosition.html#GypsyPosition.details">
 <ANCHOR id="GypsyPosition-struct" href="gypsy/GypsyPosition.html#GypsyPosition-struct">
-<ANCHOR id="GYPSY-POSITION-DBUS-INTERFACE--CAPS" href="gypsy/GypsyPosition.html#GYPSY-POSITION-DBUS-INTERFACE--CAPS">
-<ANCHOR id="GYPSY-POSITION-DBUS-SERVICE--CAPS" href="gypsy/GypsyPosition.html#GYPSY-POSITION-DBUS-SERVICE--CAPS">
+<ANCHOR id="GYPSY-POSITION-DBUS-INTERFACE:CAPS" href="gypsy/GypsyPosition.html#GYPSY-POSITION-DBUS-INTERFACE:CAPS">
+<ANCHOR id="GYPSY-POSITION-DBUS-SERVICE:CAPS" href="gypsy/GypsyPosition.html#GYPSY-POSITION-DBUS-SERVICE:CAPS">
 <ANCHOR id="GypsyPositionFields" href="gypsy/GypsyPosition.html#GypsyPositionFields">
+<ANCHOR id="GYPSY-POSITION-FIELDS-NONE:CAPS" href="gypsy/GypsyPosition.html#GYPSY-POSITION-FIELDS-NONE:CAPS">
+<ANCHOR id="GYPSY-POSITION-FIELDS-LATITUDE:CAPS" href="gypsy/GypsyPosition.html#GYPSY-POSITION-FIELDS-LATITUDE:CAPS">
+<ANCHOR id="GYPSY-POSITION-FIELDS-LONGITUDE:CAPS" href="gypsy/GypsyPosition.html#GYPSY-POSITION-FIELDS-LONGITUDE:CAPS">
+<ANCHOR id="GYPSY-POSITION-FIELDS-ALTITUDE:CAPS" href="gypsy/GypsyPosition.html#GYPSY-POSITION-FIELDS-ALTITUDE:CAPS">
 <ANCHOR id="gypsy-position-new" href="gypsy/GypsyPosition.html#gypsy-position-new">
 <ANCHOR id="gypsy-position-get-position" href="gypsy/GypsyPosition.html#gypsy-position-get-position">
 <ANCHOR id="GypsyPosition.property-details" href="gypsy/GypsyPosition.html#GypsyPosition.property-details">
@@ -116,8 +136,8 @@
 <ANCHOR id="GypsySatellite.description" href="gypsy/GypsySatellite.html#GypsySatellite.description">
 <ANCHOR id="GypsySatellite.details" href="gypsy/GypsySatellite.html#GypsySatellite.details">
 <ANCHOR id="GypsySatellite-struct" href="gypsy/GypsySatellite.html#GypsySatellite-struct">
-<ANCHOR id="GYPSY-SATELLITE-DBUS-INTERFACE--CAPS" href="gypsy/GypsySatellite.html#GYPSY-SATELLITE-DBUS-INTERFACE--CAPS">
-<ANCHOR id="GYPSY-SATELLITE-DBUS-SERVICE--CAPS" href="gypsy/GypsySatellite.html#GYPSY-SATELLITE-DBUS-SERVICE--CAPS">
+<ANCHOR id="GYPSY-SATELLITE-DBUS-INTERFACE:CAPS" href="gypsy/GypsySatellite.html#GYPSY-SATELLITE-DBUS-INTERFACE:CAPS">
+<ANCHOR id="GYPSY-SATELLITE-DBUS-SERVICE:CAPS" href="gypsy/GypsySatellite.html#GYPSY-SATELLITE-DBUS-SERVICE:CAPS">
 <ANCHOR id="GypsySatelliteDetails" href="gypsy/GypsySatellite.html#GypsySatelliteDetails">
 <ANCHOR id="gypsy-satellite-new" href="gypsy/GypsySatellite.html#gypsy-satellite-new">
 <ANCHOR id="gypsy-satellite-get-satellites" href="gypsy/GypsySatellite.html#gypsy-satellite-get-satellites">
@@ -131,7 +151,7 @@
 <ANCHOR id="gypsy-GypsyTime.description" href="gypsy/gypsy-GypsyTime.html#gypsy-GypsyTime.description">
 <ANCHOR id="gypsy-GypsyTime.details" href="gypsy/gypsy-GypsyTime.html#gypsy-GypsyTime.details">
 <ANCHOR id="GypsyTime" href="gypsy/gypsy-GypsyTime.html#GypsyTime">
-<ANCHOR id="GYPSY-TIME-DBUS-SERVICE--CAPS" href="gypsy/gypsy-GypsyTime.html#GYPSY-TIME-DBUS-SERVICE--CAPS">
-<ANCHOR id="GYPSY-TIME-DBUS-INTERFACE--CAPS" href="gypsy/gypsy-GypsyTime.html#GYPSY-TIME-DBUS-INTERFACE--CAPS">
+<ANCHOR id="GYPSY-TIME-DBUS-SERVICE:CAPS" href="gypsy/gypsy-GypsyTime.html#GYPSY-TIME-DBUS-SERVICE:CAPS">
+<ANCHOR id="GYPSY-TIME-DBUS-INTERFACE:CAPS" href="gypsy/gypsy-GypsyTime.html#GYPSY-TIME-DBUS-INTERFACE:CAPS">
 <ANCHOR id="gypsy-time-new" href="gypsy/gypsy-GypsyTime.html#gypsy-time-new">
 <ANCHOR id="gypsy-time-get-time" href="gypsy/gypsy-GypsyTime.html#gypsy-time-get-time">
diff --git a/docs/reference/html/rn01.html b/docs/reference/html/rn01.html
index c812a86..12d1412 100644
--- a/docs/reference/html/rn01.html
+++ b/docs/reference/html/rn01.html
@@ -8,16 +8,8 @@
 <link rel="up" href="index.html" title="Gypsy Reference Manual">
 <link rel="prev" href="index.html" title="Gypsy Reference Manual">
 <link rel="next" href="gypsy-design.html" title="Gypsy's Design">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
@@ -30,7 +22,7 @@
 <div class="reference" title="Gypsy Overview">
 <div class="titlepage">
 <div><div><h1 class="title">
-<a name="id499957"></a>Gypsy Overview</h1></div></div>
+<a name="id449564"></a>Gypsy Overview</h1></div></div>
 <hr>
 </div>
 <div class="partintro" title="Gypsy Overview">
@@ -60,6 +52,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/rn02.html b/docs/reference/html/rn02.html
index 875991c..6e61656 100644
--- a/docs/reference/html/rn02.html
+++ b/docs/reference/html/rn02.html
@@ -8,16 +8,8 @@
 <link rel="up" href="index.html" title="Gypsy Reference Manual">
 <link rel="prev" href="why-not-gpsd.html" title="Design Flaws in GPSD">
 <link rel="next" href="ch01.html" title="Programming Gypsy With Python">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
@@ -30,7 +22,7 @@
 <div class="reference" title="Tutorials">
 <div class="titlepage">
 <div><div><h1 class="title">
-<a name="id499989"></a>Tutorials</h1></div></div>
+<a name="id449596"></a>Tutorials</h1></div></div>
 <hr>
 </div>
 <div class="toc">
@@ -47,6 +39,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/rn05.html b/docs/reference/html/rn05.html
index 2c92b7d..0c92b36 100644
--- a/docs/reference/html/rn05.html
+++ b/docs/reference/html/rn05.html
@@ -8,16 +8,8 @@
 <link rel="up" href="index.html" title="Gypsy Reference Manual">
 <link rel="prev" href="Time.html" title="org.freedesktop.Gypsy.Time">
 <link rel="next" href="ch02.html" title="Gypsy-Daemon Control">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
@@ -30,7 +22,7 @@
 <div class="reference" title="LibGypsy API Reference">
 <div class="titlepage">
 <div><div><h1 class="title">
-<a name="id499543"></a>LibGypsy API Reference</h1></div></div>
+<a name="id449616"></a>LibGypsy API Reference</h1></div></div>
 <hr>
 </div>
 <div class="partintro" title="LibGypsy API Reference">
@@ -45,7 +37,7 @@
 <dl>
 <dt><span class="chapter"><a href="ch02.html">Gypsy-Daemon Control</a></span></dt>
 <dd><dl><dt>
-<span class="refentrytitle"><a href="GypsyControl.html">GypsyControl</a></span><span class="refpurpose"> — Control object for gypsy-daemon</span>
+<span class="refentrytitle"><a href="gypsy-gypsy-control.html">GypsyControl</a></span><span class="refpurpose"> — Control object for gypsy-daemon</span>
 </dt></dl></dd>
 <dt><span class="chapter"><a href="ch03.html">GPS Data Objects</a></span></dt>
 <dd><dl>
@@ -56,7 +48,7 @@
 <span class="refentrytitle"><a href="GypsyAccuracy.html">GypsyAccuracy</a></span><span class="refpurpose"> — Object for obtaining accuracy information from gypsy-daemon</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="GypsyCourse.html">GypsyCourse</a></span><span class="refpurpose"> — Object for obtaining course information</span>
+<span class="refentrytitle"><a href="gypsy-gypsy-course.html">GypsyCourse</a></span><span class="refpurpose"> — Object for obtaining course information</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="GypsyPosition.html">GypsyPosition</a></span><span class="refpurpose"> — Object for obtaining positions from gypsy-daemon</span>
@@ -74,6 +66,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/style.css b/docs/reference/html/style.css
index bb44c28..d544a2c 100644
--- a/docs/reference/html/style.css
+++ b/docs/reference/html/style.css
@@ -1,13 +1,15 @@
 .synopsis, .classsynopsis
 {
-  background: #eeeeee;
-  border: solid 1px #aaaaaa;
+  /* tango:aluminium 1/2 */
+  background: #eeeeec;
+  border: solid 1px #d3d7cf;
   padding: 0.5em;
 }
 .programlisting
 {
-  background: #eeeeff;
-  border: solid 1px #aaaaff;
+  /* tango:sky blue 0/1 */
+  background: #e6f3ff;
+  border: solid 1px #729fcf;
   padding: 0.5em;
 }
 .variablelist
@@ -20,64 +22,63 @@
   vertical-align: top;
 }
 
-/* this is needed so that the local anchors are displayed below the naviagtion */
 @media screen {
   sup a.footnote
   {
     position: relative;
     top: 0em ! important;
+    
   }
-  div.refnamediv a[name], div.refsect1 a[name]
+  /* this is needed so that the local anchors are displayed below the naviagtion */
+  div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
   {
     position: relative;
-    top: -4.5em;
+    padding-top:4.5em;
   }
+  /* this seems to be a bug in the xsl style sheets when generating indexes */
+  div.index div.index
+  {
+    top: 0em;
+  }
+  /* make space for the fixed navigation bar and add space at the bottom so that
+   * link targets appear somewhat close to top
+   */
+  body
+  {
+    padding-top: 3.2em;
+    padding-bottom: 20em;
+  }
+  /* style and size the navigation bar */
   table.navigation#top
   {
-    background: #ffeeee;
-    border: solid 1px #ffaaaa;
+    position: fixed;
+    /* tango:scarlet red 0/1 */
+    background: #ffe6e6;
+    border: solid 1px #ef2929;
     margin-top: 0;
     margin-bottom: 0;
-    position: fixed;
     top: 0;
     left: 0;
-    height: 2em;
-    z-index: 1;
+    height: 3em;
+    z-index: 10;
   }
-  .navigation a
+  .navigation a, .navigation a:visited
   {
-    color: #770000;
+    /* tango:scarlet red 3 */
+    color: #a40000;
   }
-  .navigation a:visited
+  .navigation a:hover
   {
-    color: #550000;
+    /* tango:scarlet red 1 */
+    color: #ef2929;
   }
   td.shortcuts
   {
-    color: #770000;
+    /* tango:scarlet red 1 */
+    color: #ef2929;
     font-size: 80%;
     white-space: nowrap;
   }
-  div.refentry, div.chapter, div.reference, div.part, div.book, div.glossary, div.sect1, div.appendix, div.preface
-  {
-    position: relative;
-    top: 3em;
-    z-index: 0;
-  }
-  div.glossary, div.index
-  {
-    position: relative;
-    top: 2em;
-    z-index: 0;
-  }
-  div.refnamediv
-  {
-    margin-top: 2em;
-  }
-  body
-  {
-    padding-bottom: 20em;
-  }
 }
 @media print {
   table.navigation {
@@ -87,13 +88,14 @@
   div.titlepage table.navigation {
     visibility: visible;
     display: table;
-    background: #ffeeee;
-    border: solid 1px #ffaaaa;
+    /* tango:scarlet red 0/1 */
+    background: #ffe6e6;
+    border: solid 1px #ef2929;
     margin-top: 0;
     margin-bottom: 0;
     top: 0;
     left: 0;
-    height: 2em;
+    height: 3em;
   }
 }
 
@@ -102,7 +104,6 @@
   font-size: 200%;
 }
 
-
 div.gallery-float
 {
   float: left;
@@ -116,44 +117,48 @@ div.gallery-spacer
 {
   clear: both;
 }
-a
+
+a, a:visited
 {
   text-decoration: none;
+  /* tango:sky blue 2 */
+  color: #3465a4;
 }
 a:hover
 {
   text-decoration: underline;
-  color: #FF0000;
+  /* tango:sky blue 1 */
+  color: #729fcf;
 }
 
 div.table table
 {
   border-collapse: collapse;
   border-spacing: 0px;
-  border-style: solid;
-  border-color: #777777;
-  border-width: 1px;
+  /* tango:aluminium 3 */
+  border: solid 1px #babdb6;
 }
 
 div.table table td, div.table table th
 {
-  border-style: solid;
-  border-color: #777777;
-  border-width: 1px;
+  /* tango:aluminium 3 */
+  border: solid 1px #babdb6;
   padding: 3px;
   vertical-align: top;
 }
 
 div.table table th
 {
-  background-color: #eeeeee;
+  /* tango:aluminium 2 */
+  background-color: #d3d7cf;
 }
 
 hr
 {
-  color: #777777;
-  background: #777777;
-  border: 0;
+  /* tango:aluminium 3 */
+  color: #babdb6;
+  background: #babdb6;
+  border: none 0px;
   height: 1px;
   clear: both;
 }
@@ -161,7 +166,100 @@ hr
 .footer
 {
   padding-top: 3.5em;
-  color: #777777;
+  /* tango:aluminium 3 */
+  color: #babdb6;
   text-align: center;
   font-size: 80%;
 }
+
+.warning
+{
+  /* tango:orange 0/1 */
+  background: #ffeed9;
+  border-color: #ffb04f;
+}
+.note
+{
+  /* tango:chameleon 0/0.5 */
+  background: #d8ffb2;
+  border-color: #abf562;
+}
+.note, .warning
+{
+  padding: 0.5em;
+  border-width: 1px;
+  border-style: solid;
+}
+.note h3, .warning h3
+{
+  margin-top: 0.0em
+}
+.note p, .warning p
+{
+  margin-bottom: 0.0em
+}
+
+/* blob links */
+h2 .extralinks, h3 .extralinks
+{
+  float: right;
+  /* tango:aluminium 3 */
+  color: #babdb6;
+  font-size: 80%;
+  font-weight: normal;
+}
+
+.annotation
+{
+  /* tango:aluminium 5 */
+  color: #555753;
+  font-size: 80%;
+  font-weight: normal;
+}
+
+/* code listings */
+
+.listing_code .programlisting .cbracket   { color: #a40000; } /* tango: scarlet red 3 */
+.listing_code .programlisting .comment    { color: #a1a39d; } /* tango: aluminium 4 */
+.listing_code .programlisting .function   { color: #000000; font-weight: bold; }
+.listing_code .programlisting .function a { color: #11326b; font-weight: bold; } /* tango: sky blue 4 */
+.listing_code .programlisting .keyword    { color: #4e9a06; } /* tango: chameleon 3  */
+.listing_code .programlisting .linenum    { color: #babdb6; } /* tango: aluminium 3 */
+.listing_code .programlisting .normal     { color: #000000; }
+.listing_code .programlisting .number     { color: #75507b; } /* tango: plum 2 */
+.listing_code .programlisting .preproc    { color: #204a87; } /* tango: sky blue 3  */
+.listing_code .programlisting .string     { color: #c17d11; } /* tango: chocolate 2 */
+.listing_code .programlisting .type       { color: #000000; }
+.listing_code .programlisting .type a     { color: #11326b; } /* tango: sky blue 4 */
+.listing_code .programlisting .symbol     { color: #ce5c00; } /* tango: orange 3 */
+
+.listing_frame {
+  /* tango:sky blue 1 */
+  border: solid 1px #729fcf;
+  padding: 0px;
+}
+
+.listing_lines, .listing_code {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  padding: 0.5em;
+}
+.listing_lines {
+  /* tango:sky blue 0.5 */
+  background: #a6c5e3;
+  /* tango:aluminium 6 */
+  color: #2e3436;
+}
+.listing_code {
+  /* tango:sky blue 0 */
+  background: #e6f3ff;
+}
+.listing_code .programlisting {
+  /* override from previous */
+  border: none 0px;
+  padding: 0px;
+}
+.listing_lines pre, .listing_code pre {
+  margin: 0px;
+}
+
diff --git a/docs/reference/html/why-not-gpsd.html b/docs/reference/html/why-not-gpsd.html
index 6c51215..ef948be 100644
--- a/docs/reference/html/why-not-gpsd.html
+++ b/docs/reference/html/why-not-gpsd.html
@@ -8,16 +8,8 @@
 <link rel="up" href="rn01.html" title="Gypsy Overview">
 <link rel="prev" href="gypsy-design.html" title="Gypsy's Design">
 <link rel="next" href="rn02.html" title="Tutorials">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="reference" href="rn01.html" title="Gypsy Overview">
-<link rel="reference" href="rn02.html" title="Tutorials">
-<link rel="chapter" href="ch01.html" title="Programming Gypsy With Python">
-<link rel="reference" href="gypsy-server-interfaces.html" title="Gypsy Server Interface">
-<link rel="reference" href="gypsy-client-interfaces.html" title="Gypsy Client Interface">
-<link rel="reference" href="rn05.html" title="LibGypsy API Reference">
-<link rel="chapter" href="ch02.html" title="Gypsy-Daemon Control">
-<link rel="chapter" href="ch03.html" title="GPS Data Objects">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
@@ -37,13 +29,13 @@
 <td valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1" title="Why You Should Use Gypsy Over GPSD">
-<a name="id524224"></a><h2>Why You Should Use Gypsy Over GPSD</h2>
+<a name="id468006"></a><h2>Why You Should Use Gypsy Over GPSD</h2>
 <p>
 </p>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.11</div>
+          Generated by GTK-Doc V1.15</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/reference/ref-gypsy-client.xml b/docs/reference/ref-gypsy-client.xml
index 236fa73..5a48f51 100644
--- a/docs/reference/ref-gypsy-client.xml
+++ b/docs/reference/ref-gypsy-client.xml
@@ -281,7 +281,8 @@
     </refnamediv>
     <refsynopsisdiv role="synopsis">
       <title role="synopsis.title">Methods</title>
-      <synopsis><link linkend="Device.Start">Start</link>               ()
+      <synopsis><link linkend="Device.SetStartOptions">SetStartOptions</link>     (in  'a{sv}'options)
+<link linkend="Device.Start">Start</link>               ()
 <link linkend="Device.Stop">Stop</link>                ()
 <link linkend="Device.GetFixStatus">GetFixStatus</link>        (out 'i'fixtype)
 <link linkend="Device.GetConnectionStatus">GetConnectionStatus</link> (out 'b'connected)
@@ -311,6 +312,22 @@
     <refsect1 role="details">
       <title role="details.title">Details</title>
       <refsect2>
+        <title><anchor role="function" id="Device.SetStartOptions"/>SetStartOptions ()</title>
+        <indexterm>
+          <primary>SetStartOptions</primary>
+          <secondary>Device</secondary>
+        </indexterm>
+        <programlisting>SetStartOptions (in  'a{sv}' options)</programlisting>
+        <variablelist role="params">
+          <varlistentry>
+            <term><parameter>options</parameter>:</term>
+            <listitem>
+              <para/>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+      </refsect2>
+      <refsect2>
         <title><anchor role="function" id="Device.Start"/>Start ()</title>
         <indexterm>
           <primary>Start</primary>
diff --git a/docs/reference/tmpl/gypsy-accuracy.sgml b/docs/reference/tmpl/gypsy-accuracy.sgml
index c851012..c331b47 100644
--- a/docs/reference/tmpl/gypsy-accuracy.sgml
+++ b/docs/reference/tmpl/gypsy-accuracy.sgml
@@ -17,6 +17,9 @@ GypsyAccuracy
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GypsyAccuracy ##### -->
 <para>
 
diff --git a/docs/reference/tmpl/gypsy-control.sgml b/docs/reference/tmpl/gypsy-control.sgml
index ab0a151..04b3484 100644
--- a/docs/reference/tmpl/gypsy-control.sgml
+++ b/docs/reference/tmpl/gypsy-control.sgml
@@ -17,6 +17,9 @@ GypsyControl
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GypsyControl ##### -->
 <para>
 
@@ -49,6 +52,7 @@ GypsyControl
 
 </para>
 
+@void: 
 @Returns: 
 
 
diff --git a/docs/reference/tmpl/gypsy-course.sgml b/docs/reference/tmpl/gypsy-course.sgml
index d2f2b97..49608f5 100644
--- a/docs/reference/tmpl/gypsy-course.sgml
+++ b/docs/reference/tmpl/gypsy-course.sgml
@@ -17,6 +17,9 @@ GypsyCourse
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GypsyCourse ##### -->
 <para>
 
diff --git a/docs/reference/tmpl/gypsy-device.sgml b/docs/reference/tmpl/gypsy-device.sgml
index 3b58c94..421eb02 100644
--- a/docs/reference/tmpl/gypsy-device.sgml
+++ b/docs/reference/tmpl/gypsy-device.sgml
@@ -17,6 +17,9 @@ GypsyDevice
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GypsyDevice ##### -->
 <para>
 
@@ -97,6 +100,17 @@ GypsyDevice
 @Returns: 
 
 
+<!-- ##### FUNCTION gypsy_device_set_start_options ##### -->
+<para>
+
+</para>
+
+@device: 
+@options: 
+@error: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gypsy_device_start ##### -->
 <para>
 
diff --git a/docs/reference/tmpl/gypsy-position.sgml b/docs/reference/tmpl/gypsy-position.sgml
index a340957..3f73eee 100644
--- a/docs/reference/tmpl/gypsy-position.sgml
+++ b/docs/reference/tmpl/gypsy-position.sgml
@@ -17,6 +17,9 @@ GypsyPosition
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GypsyPosition ##### -->
 <para>
 
diff --git a/docs/reference/tmpl/gypsy-satellite.sgml b/docs/reference/tmpl/gypsy-satellite.sgml
index 410d92a..1452384 100644
--- a/docs/reference/tmpl/gypsy-satellite.sgml
+++ b/docs/reference/tmpl/gypsy-satellite.sgml
@@ -17,6 +17,9 @@ GypsySatellite
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GypsySatellite ##### -->
 <para>
 
diff --git a/docs/reference/tmpl/gypsy-time.sgml b/docs/reference/tmpl/gypsy-time.sgml
index 4451532..2074339 100644
--- a/docs/reference/tmpl/gypsy-time.sgml
+++ b/docs/reference/tmpl/gypsy-time.sgml
@@ -17,6 +17,9 @@ GypsyTime
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GypsyTime ##### -->
 <para>
 
diff --git a/docs/reference/version.xml b/docs/reference/version.xml
index eb49d7c..aec258d 100644
--- a/docs/reference/version.xml
+++ b/docs/reference/version.xml
@@ -1 +1 @@
-0.7
+0.8
diff --git a/docs/reference/xml/api-index-deprecated.xml b/docs/reference/xml/api-index-deprecated.xml
deleted file mode 100644
index 3041b73..0000000
--- a/docs/reference/xml/api-index-deprecated.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE indexdiv PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-
-<indexdiv>
-</indexdiv>
diff --git a/docs/reference/xml/api-index-full.xml b/docs/reference/xml/api-index-full.xml
deleted file mode 100644
index 551dbea..0000000
--- a/docs/reference/xml/api-index-full.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE indexdiv PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-
-<indexdiv>
-<indexdiv><title>G</title>
-<indexentry><primaryie linkends="GypsyAccuracy-struct"><link linkend="GypsyAccuracy">GypsyAccuracy</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsyAccuracy-accuracy-changed"><link linkend="GypsyAccuracy-accuracy-changed">GypsyAccuracy::accuracy-changed</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsyAccuracy--object-path"><link linkend="GypsyAccuracy--object-path">GypsyAccuracy:object-path</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsyAccuracyFields"><link linkend="GypsyAccuracyFields">GypsyAccuracyFields</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsyControl-struct"><link linkend="GypsyControl">GypsyControl</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsyCourse-struct"><link linkend="GypsyCourse">GypsyCourse</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsyCourse-course-changed"><link linkend="GypsyCourse-course-changed">GypsyCourse::course-changed</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsyCourse--object-path"><link linkend="GypsyCourse--object-path">GypsyCourse:object-path</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsyCourseFields"><link linkend="GypsyCourseFields">GypsyCourseFields</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsyDevice-struct"><link linkend="GypsyDevice">GypsyDevice</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsyDevice-connection-changed"><link linkend="GypsyDevice-connection-changed">GypsyDevice::connection-changed</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsyDevice-fix-status-changed"><link linkend="GypsyDevice-fix-status-changed">GypsyDevice::fix-status-changed</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsyDevice--object-path"><link linkend="GypsyDevice--object-path">GypsyDevice:object-path</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsyDeviceFixStatus"><link linkend="GypsyDeviceFixStatus">GypsyDeviceFixStatus</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsyPosition-struct"><link linkend="GypsyPosition">GypsyPosition</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsyPosition-position-changed"><link linkend="GypsyPosition-position-changed">GypsyPosition::position-changed</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsyPosition--object-path"><link linkend="GypsyPosition--object-path">GypsyPosition:object-path</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsyPositionFields"><link linkend="GypsyPositionFields">GypsyPositionFields</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsySatellite-struct"><link linkend="GypsySatellite">GypsySatellite</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsySatellite-satellites-changed"><link linkend="GypsySatellite-satellites-changed">GypsySatellite::satellites-changed</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsySatellite--object-path"><link linkend="GypsySatellite--object-path">GypsySatellite:object-path</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsySatelliteDetails"><link linkend="GypsySatelliteDetails">GypsySatelliteDetails</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GypsyTime"><link linkend="GypsyTime">GypsyTime</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GYPSY-ACCURACY-DBUS-INTERFACE--CAPS"><link linkend="GYPSY-ACCURACY-DBUS-INTERFACE--CAPS">GYPSY_ACCURACY_DBUS_INTERFACE</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GYPSY-ACCURACY-DBUS-SERVICE--CAPS"><link linkend="GYPSY-ACCURACY-DBUS-SERVICE--CAPS">GYPSY_ACCURACY_DBUS_SERVICE</link></primaryie></indexentry>
-<indexentry><primaryie linkends="gypsy-accuracy-get-accuracy"><link linkend="gypsy-accuracy-get-accuracy">gypsy_accuracy_get_accuracy</link></primaryie></indexentry>
-<indexentry><primaryie linkends="gypsy-accuracy-new"><link linkend="gypsy-accuracy-new">gypsy_accuracy_new</link></primaryie></indexentry>
-<indexentry><primaryie linkends="gypsy-control-create"><link linkend="gypsy-control-create">gypsy_control_create</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GYPSY-CONTROL-DBUS-INTERFACE--CAPS"><link linkend="GYPSY-CONTROL-DBUS-INTERFACE--CAPS">GYPSY_CONTROL_DBUS_INTERFACE</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GYPSY-CONTROL-DBUS-PATH--CAPS"><link linkend="GYPSY-CONTROL-DBUS-PATH--CAPS">GYPSY_CONTROL_DBUS_PATH</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GYPSY-CONTROL-DBUS-SERVICE--CAPS"><link linkend="GYPSY-CONTROL-DBUS-SERVICE--CAPS">GYPSY_CONTROL_DBUS_SERVICE</link></primaryie></indexentry>
-<indexentry><primaryie linkends="gypsy-control-get-default"><link linkend="gypsy-control-get-default">gypsy_control_get_default</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GYPSY-COURSE-DBUS-INTERFACE--CAPS"><link linkend="GYPSY-COURSE-DBUS-INTERFACE--CAPS">GYPSY_COURSE_DBUS_INTERFACE</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GYPSY-COURSE-DBUS-SERVICE--CAPS"><link linkend="GYPSY-COURSE-DBUS-SERVICE--CAPS">GYPSY_COURSE_DBUS_SERVICE</link></primaryie></indexentry>
-<indexentry><primaryie linkends="gypsy-course-get-course"><link linkend="gypsy-course-get-course">gypsy_course_get_course</link></primaryie></indexentry>
-<indexentry><primaryie linkends="gypsy-course-new"><link linkend="gypsy-course-new">gypsy_course_new</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GYPSY-DEVICE-DBUS-INTERFACE--CAPS"><link linkend="GYPSY-DEVICE-DBUS-INTERFACE--CAPS">GYPSY_DEVICE_DBUS_INTERFACE</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GYPSY-DEVICE-DBUS-SERVICE--CAPS"><link linkend="GYPSY-DEVICE-DBUS-SERVICE--CAPS">GYPSY_DEVICE_DBUS_SERVICE</link></primaryie></indexentry>
-<indexentry><primaryie linkends="gypsy-device-get-connection-status"><link linkend="gypsy-device-get-connection-status">gypsy_device_get_connection_status</link></primaryie></indexentry>
-<indexentry><primaryie linkends="gypsy-device-get-fix-status"><link linkend="gypsy-device-get-fix-status">gypsy_device_get_fix_status</link></primaryie></indexentry>
-<indexentry><primaryie linkends="gypsy-device-new"><link linkend="gypsy-device-new">gypsy_device_new</link></primaryie></indexentry>
-<indexentry><primaryie linkends="gypsy-device-start"><link linkend="gypsy-device-start">gypsy_device_start</link></primaryie></indexentry>
-<indexentry><primaryie linkends="gypsy-device-stop"><link linkend="gypsy-device-stop">gypsy_device_stop</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GYPSY-POSITION-DBUS-INTERFACE--CAPS"><link linkend="GYPSY-POSITION-DBUS-INTERFACE--CAPS">GYPSY_POSITION_DBUS_INTERFACE</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GYPSY-POSITION-DBUS-SERVICE--CAPS"><link linkend="GYPSY-POSITION-DBUS-SERVICE--CAPS">GYPSY_POSITION_DBUS_SERVICE</link></primaryie></indexentry>
-<indexentry><primaryie linkends="gypsy-position-get-position"><link linkend="gypsy-position-get-position">gypsy_position_get_position</link></primaryie></indexentry>
-<indexentry><primaryie linkends="gypsy-position-new"><link linkend="gypsy-position-new">gypsy_position_new</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GYPSY-SATELLITE-DBUS-INTERFACE--CAPS"><link linkend="GYPSY-SATELLITE-DBUS-INTERFACE--CAPS">GYPSY_SATELLITE_DBUS_INTERFACE</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GYPSY-SATELLITE-DBUS-SERVICE--CAPS"><link linkend="GYPSY-SATELLITE-DBUS-SERVICE--CAPS">GYPSY_SATELLITE_DBUS_SERVICE</link></primaryie></indexentry>
-<indexentry><primaryie linkends="gypsy-satellite-free-satellite-array"><link linkend="gypsy-satellite-free-satellite-array">gypsy_satellite_free_satellite_array</link></primaryie></indexentry>
-<indexentry><primaryie linkends="gypsy-satellite-get-satellites"><link linkend="gypsy-satellite-get-satellites">gypsy_satellite_get_satellites</link></primaryie></indexentry>
-<indexentry><primaryie linkends="gypsy-satellite-new"><link linkend="gypsy-satellite-new">gypsy_satellite_new</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GYPSY-TIME-DBUS-INTERFACE--CAPS"><link linkend="GYPSY-TIME-DBUS-INTERFACE--CAPS">GYPSY_TIME_DBUS_INTERFACE</link></primaryie></indexentry>
-<indexentry><primaryie linkends="GYPSY-TIME-DBUS-SERVICE--CAPS"><link linkend="GYPSY-TIME-DBUS-SERVICE--CAPS">GYPSY_TIME_DBUS_SERVICE</link></primaryie></indexentry>
-<indexentry><primaryie linkends="gypsy-time-get-time"><link linkend="gypsy-time-get-time">gypsy_time_get_time</link></primaryie></indexentry>
-<indexentry><primaryie linkends="gypsy-time-new"><link linkend="gypsy-time-new">gypsy_time_new</link></primaryie></indexentry>
-</indexdiv>
-</indexdiv>
diff --git a/docs/reference/xml/gypsy-accuracy.xml b/docs/reference/xml/gypsy-accuracy.xml
deleted file mode 100644
index e133e3a..0000000
--- a/docs/reference/xml/gypsy-accuracy.xml
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-
-<refentry id="GypsyAccuracy">
-<refmeta>
-<refentrytitle role="top_of_page" id="GypsyAccuracy.top_of_page">GypsyAccuracy</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>GYPSY Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>GypsyAccuracy</refname>
-<refpurpose>Object for obtaining accuracy information from gypsy-daemon</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv id="GypsyAccuracy.synopsis" role="synopsis">
-<title role="synopsis.title">Synopsis</title>
-
-<synopsis>
-                    <link linkend="GypsyAccuracy-struct">GypsyAccuracy</link>;
-#define             <link linkend="GYPSY-ACCURACY-DBUS-SERVICE--CAPS">GYPSY_ACCURACY_DBUS_SERVICE</link>
-#define             <link linkend="GYPSY-ACCURACY-DBUS-INTERFACE--CAPS">GYPSY_ACCURACY_DBUS_INTERFACE</link>
-enum                <link linkend="GypsyAccuracyFields">GypsyAccuracyFields</link>;
-<link linkend="GypsyAccuracy">GypsyAccuracy</link> *     <link linkend="gypsy-accuracy-new">gypsy_accuracy_new</link>                  (const <link linkend="char">char</link> *object_path);
-<link linkend="GypsyAccuracyFields">GypsyAccuracyFields</link>  <link linkend="gypsy-accuracy-get-accuracy">gypsy_accuracy_get_accuracy</link>        (<link linkend="GypsyAccuracy">GypsyAccuracy</link> *accuracy,
-                                                         <link linkend="double">double</link> *pdop,
-                                                         <link linkend="double">double</link> *hdop,
-                                                         <link linkend="double">double</link> *vdop,
-                                                         <link linkend="GError">GError</link> **error);
-</synopsis>
-</refsynopsisdiv>
-
-<refsect1 id="GypsyAccuracy.object-hierarchy" role="object_hierarchy">
-<title role="object_hierarchy.title">Object Hierarchy</title>
-<synopsis>
-  <link linkend="GObject">GObject</link>
-   +----GypsyAccuracy
-</synopsis>
-</refsect1>
-
-
-
-
-
-<refsect1 id="GypsyAccuracy.properties" role="properties">
-<title role="properties.title">Properties</title>
-<synopsis>
-  &quot;<link linkend="GypsyAccuracy--object-path">object-path</link>&quot;              <link linkend="gchar">gchar</link>*                : Write / Construct Only
-</synopsis>
-</refsect1>
-
-<refsect1 id="GypsyAccuracy.signals" role="signal_proto">
-<title role="signal_proto.title">Signals</title>
-<synopsis>
-  &quot;<link linkend="GypsyAccuracy-accuracy-changed">accuracy-changed</link>&quot;                               : Run First / No Recursion
-</synopsis>
-</refsect1>
-
-
-<refsect1 id="GypsyAccuracy.description" role="desc">
-<title role="desc.title">Description</title>
-<para>
-<link linkend="GypsyAccuracy"><type>GypsyAccuracy</type></link> is used whenever the client program wishes to know about GPS
-accuracy changes. It can report the current accuracy, and has a signal to
-notify listeners to changes. The accuracy consists of positional accuracy,
-horizontal accuracy (on the latitude/longitude plane) and vertical 
-(altitudinal) accuracy.
-</para>
-<para>
-A <link linkend="GypsyAccuracy"><type>GypsyAccuracy</type></link> object is created using <link linkend="gypsy-accuracy-new"><function>gypsy_accuracy_new()</function></link> using the 
-D-Bus path of the GPS device. This path is returned from the 
-<link linkend="gypsy-control-create"><function>gypsy_control_create()</function></link> function. The client can then find out about the
-course with <link linkend="gypsy-accuracy-get-accuracy"><function>gypsy_accuracy_get_accuracy()</function></link>.
-</para>
-<para>
-As the accuracy information changes <link linkend="GypsyAccuracy"><type>GypsyAccuracy</type></link> will emit the 
-accuracy-changed signal. This signal contains the accuracy information if 
-gypsy-daemon knows it. It has a fields paramater which is a bitmask of
-<link linkend="GypsyAccuracyFields"><type>GypsyAccuracyFields</type></link> which indicates which of the position, horizontal or
-vertical contains valid information. 
-</para>
-<para>
-<informalexample>
-<programlisting>
-GypsyAccuracy *accuracy;
-GError *error = NULL;
-
-. . .
-
-/ * path comes from the gypsy_control_create() function * /
-accuracy = gypsy_accuracy_new (path);
-g_signal_connect (accuracy, "accuracy-changed", G_CALLBACK (accuracy_changed), NULL);
-
-. . .
-
-static void 
-accuracy_changed (GypsyAccuracy *accuracy, 
-GypsyAccuracyFields fields,
-double position,
-double horizontal,
-double vertical,
-gpointer userdata)
-{
-&nbsp;&nbsp;g_print ("horizontal: %f\n", (fields &amp; GYPSY_ACCURACY_FIELDS_HORIZONTAL) ? horizontal : -1.0);
-}
-</programlisting>
-</informalexample></para>
-<para>
-</para>
-</refsect1>
-
-<refsect1 id="GypsyAccuracy.details" role="details">
-<title role="details.title">Details</title>
-<refsect2 id="GypsyAccuracy-struct" role="struct">
-<title>GypsyAccuracy</title>
-<indexterm zone="GypsyAccuracy-struct"><primary sortas="GypsyAccuracy">GypsyAccuracy</primary></indexterm><programlisting>typedef struct _GypsyAccuracy GypsyAccuracy;</programlisting>
-<para>
-There are no public fields in <link linkend="GypsyAccuracy"><type>GypsyAccuracy</type></link>.</para>
-<para>
-</para></refsect2>
-<refsect2 id="GYPSY-ACCURACY-DBUS-SERVICE--CAPS" role="macro">
-<title>GYPSY_ACCURACY_DBUS_SERVICE</title>
-<indexterm zone="GYPSY-ACCURACY-DBUS-SERVICE--CAPS"><primary sortas="GYPSY_ACCURACY_DBUS_SERVICE">GYPSY_ACCURACY_DBUS_SERVICE</primary></indexterm><programlisting>#define GYPSY_ACCURACY_DBUS_SERVICE "org.freedesktop.Gypsy"
-</programlisting>
-<para>
-A define containing the address of the Accuracy service</para>
-<para>
-</para></refsect2>
-<refsect2 id="GYPSY-ACCURACY-DBUS-INTERFACE--CAPS" role="macro">
-<title>GYPSY_ACCURACY_DBUS_INTERFACE</title>
-<indexterm zone="GYPSY-ACCURACY-DBUS-INTERFACE--CAPS"><primary sortas="GYPSY_ACCURACY_DBUS_INTERFACE">GYPSY_ACCURACY_DBUS_INTERFACE</primary></indexterm><programlisting>#define GYPSY_ACCURACY_DBUS_INTERFACE "org.freedesktop.Gypsy.Accuracy"
-</programlisting>
-<para>
-A define containing the name of the Accuracy interface</para>
-<para>
-</para></refsect2>
-<refsect2 id="GypsyAccuracyFields" role="enum">
-<title>enum GypsyAccuracyFields</title>
-<indexterm zone="GypsyAccuracyFields"><primary sortas="GypsyAccuracyFields">GypsyAccuracyFields</primary></indexterm><programlisting>typedef enum {
-	GYPSY_ACCURACY_FIELDS_NONE = 0,
-	GYPSY_ACCURACY_FIELDS_POSITION = 1 &lt;&lt; 0,
-	GYPSY_ACCURACY_FIELDS_HORIZONTAL = 1 &lt;&lt; 1,
-	GYPSY_ACCURACY_FIELDS_VERTICAL = 1 &lt;&lt; 2,
-} GypsyAccuracyFields;
-</programlisting>
-<para>
-A bitmask telling which fields in the accuracy_changed callback are valid</para>
-<para>
-</para><variablelist role="enum">
-<varlistentry id="GYPSY-ACCURACY-FIELDS-NONE--CAPS" role="constant">
-<term><literal>GYPSY_ACCURACY_FIELDS_NONE</literal></term>
-<listitem><simpara> None of the fields are valid
-</simpara></listitem>
-</varlistentry>
-<varlistentry id="GYPSY-ACCURACY-FIELDS-POSITION--CAPS" role="constant">
-<term><literal>GYPSY_ACCURACY_FIELDS_POSITION</literal></term>
-<listitem><simpara> The Position (3D) DOP field is valid
-</simpara></listitem>
-</varlistentry>
-<varlistentry id="GYPSY-ACCURACY-FIELDS-HORIZONTAL--CAPS" role="constant">
-<term><literal>GYPSY_ACCURACY_FIELDS_HORIZONTAL</literal></term>
-<listitem><simpara> The Horizonal (2D) DOP field is valid
-</simpara></listitem>
-</varlistentry>
-<varlistentry id="GYPSY-ACCURACY-FIELDS-VERTICAL--CAPS" role="constant">
-<term><literal>GYPSY_ACCURACY_FIELDS_VERTICAL</literal></term>
-<listitem><simpara> The Vertical (altitude) DOP field is valid
-</simpara></listitem>
-</varlistentry>
-</variablelist></refsect2>
-<refsect2 id="gypsy-accuracy-new" role="function">
-<title>gypsy_accuracy_new ()</title>
-<indexterm zone="gypsy-accuracy-new"><primary sortas="gypsy_accuracy_new">gypsy_accuracy_new</primary></indexterm><programlisting><link linkend="GypsyAccuracy">GypsyAccuracy</link> *     gypsy_accuracy_new                  (const <link linkend="char">char</link> *object_path);</programlisting>
-<para>
-Creates a new <link linkend="GypsyAccuracy"><type>GypsyAccuracy</type></link> object that listens for accuracy changes
-from the GPS found at <parameter>object_path</parameter>.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>object_path</parameter>&#160;:</term>
-<listitem><simpara> Object path to the GPS device
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A <link linkend="GypsyAccuracy"><type>GypsyAccuracy</type></link> object
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="gypsy-accuracy-get-accuracy" role="function">
-<title>gypsy_accuracy_get_accuracy ()</title>
-<indexterm zone="gypsy-accuracy-get-accuracy"><primary sortas="gypsy_accuracy_get_accuracy">gypsy_accuracy_get_accuracy</primary></indexterm><programlisting><link linkend="GypsyAccuracyFields">GypsyAccuracyFields</link>  gypsy_accuracy_get_accuracy        (<link linkend="GypsyAccuracy">GypsyAccuracy</link> *accuracy,
-                                                         <link linkend="double">double</link> *pdop,
-                                                         <link linkend="double">double</link> *hdop,
-                                                         <link linkend="double">double</link> *vdop,
-                                                         <link linkend="GError">GError</link> **error);</programlisting>
-<para>
-Obtains the current accuracy, if known, from the GPS device.  <parameter>pdop</parameter>, <parameter>hdop</parameter>
-and <parameter>vdop</parameter> can be <link linkend="NULL--CAPS"><type>NULL</type></link> if the result is not required.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>accuracy</parameter>&#160;:</term>
-<listitem><simpara> A <link linkend="GypsyAccuracy"><type>GypsyAccuracy</type></link>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pdop</parameter>&#160;:</term>
-<listitem><simpara> Pointer to store the position DOP
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>hdop</parameter>&#160;:</term>
-<listitem><simpara> Pointer to store the horizonal DOP
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>vdop</parameter>&#160;:</term>
-<listitem><simpara> Pointer to store the vertical DOP
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>error</parameter>&#160;:</term>
-<listitem><simpara> Pointer to store a <link linkend="GError"><type>GError</type></link>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Bitmask of <link linkend="GypsyAccuracyFields"><type>GypsyAccuracyFields</type></link> indicating what fields were set
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-<refsect1 id="GypsyAccuracy.property-details" role="property_details">
-<title role="property_details.title">Property Details</title>
-<refsect2 id="GypsyAccuracy--object-path" role="property"><title>The <literal>&quot;object-path&quot;</literal> property</title>
-<indexterm zone="GypsyAccuracy--object-path"><primary sortas="GypsyAccuracy:object-path">GypsyAccuracy:object-path</primary></indexterm><programlisting>  &quot;object-path&quot;              <link linkend="gchar">gchar</link>*                : Write / Construct Only</programlisting>
-<para>
-The path of the Gypsy GPS object</para>
-<para>
-</para><para>Default value: ""</para>
-</refsect2>
-</refsect1>
-
-<refsect1 id="GypsyAccuracy.signal-details" role="signals">
-<title role="signals.title">Signal Details</title>
-<refsect2 id="GypsyAccuracy-accuracy-changed" role="signal"><title>The <literal>&quot;accuracy-changed&quot;</literal> signal</title>
-<indexterm zone="GypsyAccuracy-accuracy-changed"><primary sortas="GypsyAccuracy::accuracy-changed">GypsyAccuracy::accuracy-changed</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="GypsyAccuracy">GypsyAccuracy</link> *fields,
-                                                        <link linkend="gint">gint</link>           pdop,
-                                                        <link linkend="gdouble">gdouble</link>        hdop,
-                                                        <link linkend="gdouble">gdouble</link>        vdop,
-                                                        <link linkend="gdouble">gdouble</link>        arg4,
-                                                        <link linkend="gpointer">gpointer</link>       user_data)      : Run First / No Recursion</programlisting>
-<para>
-The ::accuracy-changed signal is emitted when the GPS device
-indicates that one or more of the accuracy fields has changed.
-The fields which have changed will be indicated in the <parameter>fields</parameter>
-bitmask.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>fields</parameter>&#160;:</term>
-<listitem><simpara> A bitmask of <link linkend="GypsyAccuracyFields"><type>GypsyAccuracyFields</type></link> indicating which of the following fields are valid
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pdop</parameter>&#160;:</term>
-<listitem><simpara> The new position DOP
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>hdop</parameter>&#160;:</term>
-<listitem><simpara> The new horizonal DOP
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>vdop</parameter>&#160;:</term>
-<listitem><simpara> The new vertical DOP
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>user_data</parameter>&#160;:</term>
-<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-</refsect1>
-
-
-
-</refentry>
diff --git a/docs/reference/xml/gypsy-control.xml b/docs/reference/xml/gypsy-control.xml
deleted file mode 100644
index bc05fe5..0000000
--- a/docs/reference/xml/gypsy-control.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-
-<refentry id="GypsyControl">
-<refmeta>
-<refentrytitle role="top_of_page" id="GypsyControl.top_of_page">GypsyControl</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>GYPSY Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>GypsyControl</refname>
-<refpurpose>Control object for gypsy-daemon</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv id="GypsyControl.synopsis" role="synopsis">
-<title role="synopsis.title">Synopsis</title>
-
-<synopsis>
-                    <link linkend="GypsyControl-struct">GypsyControl</link>;
-#define             <link linkend="GYPSY-CONTROL-DBUS-SERVICE--CAPS">GYPSY_CONTROL_DBUS_SERVICE</link>
-#define             <link linkend="GYPSY-CONTROL-DBUS-PATH--CAPS">GYPSY_CONTROL_DBUS_PATH</link>
-#define             <link linkend="GYPSY-CONTROL-DBUS-INTERFACE--CAPS">GYPSY_CONTROL_DBUS_INTERFACE</link>
-<link linkend="GypsyControl">GypsyControl</link> *      <link linkend="gypsy-control-get-default">gypsy_control_get_default</link>           (void);
-<link linkend="char">char</link> *              <link linkend="gypsy-control-create">gypsy_control_create</link>                (<link linkend="GypsyControl">GypsyControl</link> *control,
-                                                         const <link linkend="char">char</link> *device_name,
-                                                         <link linkend="GError">GError</link> **error);
-</synopsis>
-</refsynopsisdiv>
-
-<refsect1 id="GypsyControl.object-hierarchy" role="object_hierarchy">
-<title role="object_hierarchy.title">Object Hierarchy</title>
-<synopsis>
-  <link linkend="GObject">GObject</link>
-   +----GypsyControl
-</synopsis>
-</refsect1>
-
-
-
-
-
-
-
-
-<refsect1 id="GypsyControl.description" role="desc">
-<title role="desc.title">Description</title>
-<para>
-<link linkend="GypsyControl"><type>GypsyControl</type></link> is the object that controls the gypsy-daemon process. 
-It is a singleton object, meaning that there will only be one instance of it
-per application. Once the object has been created (or referenced if it 
-had already been created for the application) with 
-<link linkend="gypsy-control-get-default"><function>gypsy_control_get_default()</function></link>, it can be used to tell gypsy-daemon what GPS
-device to connect to with <link linkend="gypsy-control-create"><function>gypsy_control_create()</function></link>. This call returns the
-D-Bus object path to the GPS object in gypsy-daemon. This object path is then used to 
-create other objects, such as <link linkend="GypsyPosition"><type>GypsyPosition</type></link>, or <link linkend="GypsyCourse"><type>GypsyCourse</type></link>.
-</para>
-<para>
-As gypsy-daemon is able to connect to multiple GPS devices, the one
-<link linkend="GypsyControl"><type>GypsyControl</type></link> can be used to create them, returning a different path for each
-GPS device. Gypsy-daemon can connect to both serial port devices which have
-an entry in <filename>/dev</filename> and Bluetooth devices natively without
-the need to use rfcomm to set up a <filename>/dev</filename> entry. To do
-this you pass either the device path or the Bluetooth address of the device
-to <link linkend="gypsy-control-create"><function>gypsy_control_create()</function></link>.
-</para>
-<para>
-Once the program has finished with the GPS, the <link linkend="GypsyControl"><type>GypsyControl</type></link> object should
-by unreferenced with <link linkend="g-object-unref"><function>g_object_unref()</function></link>.
-</para>
-<para>
-<informalexample>
-<programlisting>
-. . .
-
-<link linkend="GypsyControl">GypsyControl</link> *control;
-char *path_bt, *path_dev;
-GError *error = NULL;
-
-. . .
-
-control = gypsy_control_get_default ();
-/ * Use a Bluetooth device * /
-path_bt = gypsy_control_create (control, "aa:bb:cc:dd:ee", &amp;error);
-if (path_bt == NULL) {
-&nbsp;&nbsp;g_warning ("There was an error creating aa:bb:cc:dd:ee - %s", error->message);
-&nbsp;&nbsp;g_error_free (error);
-&nbsp;&nbsp;error = NULL;
-}
-
-/ * Use a serial port device * /
-path_dev = gypsy_control_create (control, "/dev/gps", &amp;error);
-if (path_dev == NULL) {
-&nbsp;&nbsp;g_warning ("There was an error creating /dev/gps - %s", error->message);
-&nbsp;&nbsp;g_error_free (error);
-&nbsp;&nbsp;error = NULL;
-}
-
-. . .
-
-/ * Use the paths here to create listener objects * /
-
-. . . 
-
-g_free (path_bt);
-g_free (path_dev);
-
-. . .
-
-/ * The program has finished with Gypsy now, unref the object. * /
-g_object_unref (G_OBJECT (control));
-</programlisting>
-</informalexample></para>
-<para>
-</para>
-</refsect1>
-
-<refsect1 id="GypsyControl.details" role="details">
-<title role="details.title">Details</title>
-<refsect2 id="GypsyControl-struct" role="struct">
-<title>GypsyControl</title>
-<indexterm zone="GypsyControl-struct"><primary sortas="GypsyControl">GypsyControl</primary></indexterm><programlisting>typedef struct _GypsyControl GypsyControl;</programlisting>
-<para>
-There are no public fields in <link linkend="GypsyControl"><type>GypsyControl</type></link>.</para>
-<para>
-</para></refsect2>
-<refsect2 id="GYPSY-CONTROL-DBUS-SERVICE--CAPS" role="macro">
-<title>GYPSY_CONTROL_DBUS_SERVICE</title>
-<indexterm zone="GYPSY-CONTROL-DBUS-SERVICE--CAPS"><primary sortas="GYPSY_CONTROL_DBUS_SERVICE">GYPSY_CONTROL_DBUS_SERVICE</primary></indexterm><programlisting>#define GYPSY_CONTROL_DBUS_SERVICE "org.freedesktop.Gypsy"
-</programlisting>
-<para>
-A define containing the service name of the control service</para>
-<para>
-</para></refsect2>
-<refsect2 id="GYPSY-CONTROL-DBUS-PATH--CAPS" role="macro">
-<title>GYPSY_CONTROL_DBUS_PATH</title>
-<indexterm zone="GYPSY-CONTROL-DBUS-PATH--CAPS"><primary sortas="GYPSY_CONTROL_DBUS_PATH">GYPSY_CONTROL_DBUS_PATH</primary></indexterm><programlisting>#define GYPSY_CONTROL_DBUS_PATH "/org/freedesktop/Gypsy"
-</programlisting>
-<para>
-A define containing the object path of the Gypsy object</para>
-<para>
-</para></refsect2>
-<refsect2 id="GYPSY-CONTROL-DBUS-INTERFACE--CAPS" role="macro">
-<title>GYPSY_CONTROL_DBUS_INTERFACE</title>
-<indexterm zone="GYPSY-CONTROL-DBUS-INTERFACE--CAPS"><primary sortas="GYPSY_CONTROL_DBUS_INTERFACE">GYPSY_CONTROL_DBUS_INTERFACE</primary></indexterm><programlisting>#define GYPSY_CONTROL_DBUS_INTERFACE "org.freedesktop.Gypsy.Server"
-</programlisting>
-<para>
-A define containing the name of the Control interface</para>
-<para>
-</para></refsect2>
-<refsect2 id="gypsy-control-get-default" role="function">
-<title>gypsy_control_get_default ()</title>
-<indexterm zone="gypsy-control-get-default"><primary sortas="gypsy_control_get_default">gypsy_control_get_default</primary></indexterm><programlisting><link linkend="GypsyControl">GypsyControl</link> *      gypsy_control_get_default           (void);</programlisting>
-<para>
-Retrieves the default <link linkend="GypsyControl"><type>GypsyControl</type></link> object.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A singleton <link linkend="GypsyControl"><type>GypsyControl</type></link>.  Once the program has finished using
-the <link linkend="GypsyControl"><type>GypsyControl</type></link>, it should be unreferenced with <link linkend="g-object-unref"><function>g_object_unref()</function></link>.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="gypsy-control-create" role="function">
-<title>gypsy_control_create ()</title>
-<indexterm zone="gypsy-control-create"><primary sortas="gypsy_control_create">gypsy_control_create</primary></indexterm><programlisting><link linkend="char">char</link> *              gypsy_control_create                (<link linkend="GypsyControl">GypsyControl</link> *control,
-                                                         const <link linkend="char">char</link> *device_name,
-                                                         <link linkend="GError">GError</link> **error);</programlisting>
-<para>
-Creates a object on the server that refers to the GPS device at <parameter>device_name</parameter>.
-When this object is finalized, the remote object on the server will be
-shutdown after which any calls to the object at the returned path
-are not guaranteed to work.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>control</parameter>&#160;:</term>
-<listitem><simpara> The <link linkend="GypsyControl"><type>GypsyControl</type></link> device
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>device_name</parameter>&#160;:</term>
-<listitem><simpara> The path to the device file, or Bluetooth address
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>error</parameter>&#160;:</term>
-<listitem><simpara> A <link linkend="GError"><type>GError</type></link> to return errors in, or <link linkend="NULL--CAPS"><literal>NULL</literal></link>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> The path to the created object.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-
-
-
-
-</refentry>
diff --git a/docs/reference/xml/gypsy-course.xml b/docs/reference/xml/gypsy-course.xml
deleted file mode 100644
index 898bf02..0000000
--- a/docs/reference/xml/gypsy-course.xml
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-
-<refentry id="GypsyCourse">
-<refmeta>
-<refentrytitle role="top_of_page" id="GypsyCourse.top_of_page">GypsyCourse</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>GYPSY Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>GypsyCourse</refname>
-<refpurpose>Object for obtaining course information</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv id="GypsyCourse.synopsis" role="synopsis">
-<title role="synopsis.title">Synopsis</title>
-
-<synopsis>
-                    <link linkend="GypsyCourse-struct">GypsyCourse</link>;
-#define             <link linkend="GYPSY-COURSE-DBUS-INTERFACE--CAPS">GYPSY_COURSE_DBUS_INTERFACE</link>
-#define             <link linkend="GYPSY-COURSE-DBUS-SERVICE--CAPS">GYPSY_COURSE_DBUS_SERVICE</link>
-enum                <link linkend="GypsyCourseFields">GypsyCourseFields</link>;
-<link linkend="GypsyCourse">GypsyCourse</link> *       <link linkend="gypsy-course-new">gypsy_course_new</link>                    (const <link linkend="char">char</link> *object_path);
-<link linkend="GypsyCourseFields">GypsyCourseFields</link>   <link linkend="gypsy-course-get-course">gypsy_course_get_course</link>             (<link linkend="GypsyCourse">GypsyCourse</link> *course,
-                                                         <link linkend="int">int</link> *timestamp,
-                                                         <link linkend="double">double</link> *speed,
-                                                         <link linkend="double">double</link> *direction,
-                                                         <link linkend="double">double</link> *climb,
-                                                         <link linkend="GError">GError</link> **error);
-</synopsis>
-</refsynopsisdiv>
-
-<refsect1 id="GypsyCourse.object-hierarchy" role="object_hierarchy">
-<title role="object_hierarchy.title">Object Hierarchy</title>
-<synopsis>
-  <link linkend="GObject">GObject</link>
-   +----GypsyCourse
-</synopsis>
-</refsect1>
-
-
-
-
-
-<refsect1 id="GypsyCourse.properties" role="properties">
-<title role="properties.title">Properties</title>
-<synopsis>
-  &quot;<link linkend="GypsyCourse--object-path">object-path</link>&quot;              <link linkend="gchar">gchar</link>*                : Write / Construct Only
-</synopsis>
-</refsect1>
-
-<refsect1 id="GypsyCourse.signals" role="signal_proto">
-<title role="signal_proto.title">Signals</title>
-<synopsis>
-  &quot;<link linkend="GypsyCourse-course-changed">course-changed</link>&quot;                                 : Run First / No Recursion
-</synopsis>
-</refsect1>
-
-
-<refsect1 id="GypsyCourse.description" role="desc">
-<title role="desc.title">Description</title>
-<para>
-<link linkend="GypsyCourse"><type>GypsyCourse</type></link> is used whenever the client program wishes to know about
-GPS course changes. It can report the current course, and has a signal
-to notify listeners of changes. The course consists of the speed, direction
-and rate of ascent or descent (called the climb).
-</para>
-<para>
-A <link linkend="GypsyCourse"><type>GypsyCourse</type></link> object is created using <link linkend="gypsy-course-new"><function>gypsy_course_new()</function></link> using the 
-D-Bus path of the GPS device. This path is returned from the 
-<link linkend="gypsy-control-create"><function>gypsy_control_create()</function></link> function. The client can then find out about the
-course with <link linkend="gypsy-course-get-course"><function>gypsy_course_get_course()</function></link>.
-</para>
-<para>
-As the course information changes <link linkend="GypsyCourse"><type>GypsyCourse</type></link> will emit the 
-course-changed signal. This signal contains the course information if 
-gypsy-daemon knows it. It has a fields paramater which is a bitmask of
-<link linkend="GypsyCourseFields"><type>GypsyCourseFields</type></link> which indicates which of the speed, direction or
-climb contains valid information. The timestamp will always be valid
-if it is greater than 0.
-</para>
-<para>
-<informalexample>
-<programlisting>
-GypsyCourse *course;
-GError *error = NULL;
-
-. . .
-
-/ * path comes from the gypsy_control_create() function * /
-course = gypsy_course_new (path);
-g_signal_connect (course, "course-changed", G_CALLBACK (course_changed), NULL);
-
-. . .
-
-static void 
-course_changed (GypsyCourse *course, 
-GypsyCourseFields fields,
-int timestamp,
-double speed,
-double direction,
-double climb,
-gpointer userdata)
-{
-&nbsp;&nbsp;g_print ("speed: %fm/s\n", (fields &amp; GYPSY_COURSE_FIELDS_SPEED) ? speed : -1.0);
-}
-</programlisting>
-</informalexample></para>
-<para>
-</para>
-</refsect1>
-
-<refsect1 id="GypsyCourse.details" role="details">
-<title role="details.title">Details</title>
-<refsect2 id="GypsyCourse-struct" role="struct">
-<title>GypsyCourse</title>
-<indexterm zone="GypsyCourse-struct"><primary sortas="GypsyCourse">GypsyCourse</primary></indexterm><programlisting>typedef struct _GypsyCourse GypsyCourse;</programlisting>
-<para>
-There are no public fields in <link linkend="GypsyCourse"><type>GypsyCourse</type></link>.</para>
-<para>
-</para></refsect2>
-<refsect2 id="GYPSY-COURSE-DBUS-INTERFACE--CAPS" role="macro">
-<title>GYPSY_COURSE_DBUS_INTERFACE</title>
-<indexterm zone="GYPSY-COURSE-DBUS-INTERFACE--CAPS"><primary sortas="GYPSY_COURSE_DBUS_INTERFACE">GYPSY_COURSE_DBUS_INTERFACE</primary></indexterm><programlisting>#define GYPSY_COURSE_DBUS_INTERFACE "org.freedesktop.Gypsy.Course"
-</programlisting>
-<para>
-A define containing the name of the Course interface</para>
-<para>
-</para></refsect2>
-<refsect2 id="GYPSY-COURSE-DBUS-SERVICE--CAPS" role="macro">
-<title>GYPSY_COURSE_DBUS_SERVICE</title>
-<indexterm zone="GYPSY-COURSE-DBUS-SERVICE--CAPS"><primary sortas="GYPSY_COURSE_DBUS_SERVICE">GYPSY_COURSE_DBUS_SERVICE</primary></indexterm><programlisting>#define GYPSY_COURSE_DBUS_SERVICE "org.freedesktop.Gypsy"
-</programlisting>
-<para>
-A define containing the address of the Course service</para>
-<para>
-</para></refsect2>
-<refsect2 id="GypsyCourseFields" role="enum">
-<title>enum GypsyCourseFields</title>
-<indexterm zone="GypsyCourseFields"><primary sortas="GypsyCourseFields">GypsyCourseFields</primary></indexterm><programlisting>typedef enum {
-	GYPSY_COURSE_FIELDS_NONE = 0,
-	GYPSY_COURSE_FIELDS_SPEED = 1 &lt;&lt; 0,
-	GYPSY_COURSE_FIELDS_DIRECTION = 1 &lt;&lt; 1,
-	GYPSY_COURSE_FIELDS_CLIMB = 1 &lt;&lt; 2
-} GypsyCourseFields;
-</programlisting>
-<para>
-A bitfield telling which fields in the course_changed callback are valid</para>
-<para>
-</para><variablelist role="enum">
-<varlistentry id="GYPSY-COURSE-FIELDS-NONE--CAPS" role="constant">
-<term><literal>GYPSY_COURSE_FIELDS_NONE</literal></term>
-<listitem><simpara> None of the fields are valid
-</simpara></listitem>
-</varlistentry>
-<varlistentry id="GYPSY-COURSE-FIELDS-SPEED--CAPS" role="constant">
-<term><literal>GYPSY_COURSE_FIELDS_SPEED</literal></term>
-<listitem><simpara> The speed field is valid
-</simpara></listitem>
-</varlistentry>
-<varlistentry id="GYPSY-COURSE-FIELDS-DIRECTION--CAPS" role="constant">
-<term><literal>GYPSY_COURSE_FIELDS_DIRECTION</literal></term>
-<listitem><simpara> The direction field is valid
-</simpara></listitem>
-</varlistentry>
-<varlistentry id="GYPSY-COURSE-FIELDS-CLIMB--CAPS" role="constant">
-<term><literal>GYPSY_COURSE_FIELDS_CLIMB</literal></term>
-<listitem><simpara> The climb field is valid
-</simpara></listitem>
-</varlistentry>
-</variablelist></refsect2>
-<refsect2 id="gypsy-course-new" role="function">
-<title>gypsy_course_new ()</title>
-<indexterm zone="gypsy-course-new"><primary sortas="gypsy_course_new">gypsy_course_new</primary></indexterm><programlisting><link linkend="GypsyCourse">GypsyCourse</link> *       gypsy_course_new                    (const <link linkend="char">char</link> *object_path);</programlisting>
-<para>
-Creates a new <link linkend="GypsyCourse"><type>GypsyCourse</type></link> object that listens for course changes
-from the GPS device found at <parameter>object_path</parameter>.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>object_path</parameter>&#160;:</term>
-<listitem><simpara> Object path to the GPS device.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A <link linkend="GypsyCourse"><type>GypsyCourse</type></link> object
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="gypsy-course-get-course" role="function">
-<title>gypsy_course_get_course ()</title>
-<indexterm zone="gypsy-course-get-course"><primary sortas="gypsy_course_get_course">gypsy_course_get_course</primary></indexterm><programlisting><link linkend="GypsyCourseFields">GypsyCourseFields</link>   gypsy_course_get_course             (<link linkend="GypsyCourse">GypsyCourse</link> *course,
-                                                         <link linkend="int">int</link> *timestamp,
-                                                         <link linkend="double">double</link> *speed,
-                                                         <link linkend="double">double</link> *direction,
-                                                         <link linkend="double">double</link> *climb,
-                                                         <link linkend="GError">GError</link> **error);</programlisting>
-<para>
-Obtains the course details from <parameter>course</parameter>. <parameter>timestamp</parameter>, <parameter>speed</parameter>, <parameter>direction</parameter> and
-<parameter>climb</parameter> can be <link linkend="NULL--CAPS"><type>NULL</type></link> if that detail is not required.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>course</parameter>&#160;:</term>
-<listitem><simpara> A <link linkend="GypsyCourse"><type>GypsyCourse</type></link> object
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>timestamp</parameter>&#160;:</term>
-<listitem><simpara> Pointer for the timestamp to be returned
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>speed</parameter>&#160;:</term>
-<listitem><simpara> Pointer for the speed to be returned
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>direction</parameter>&#160;:</term>
-<listitem><simpara> Pointer for the direction to be returned
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>climb</parameter>&#160;:</term>
-<listitem><simpara> Pointer for the climb to be returned
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>error</parameter>&#160;:</term>
-<listitem><simpara> A <link linkend="GError"><type>GError</type></link> for error return
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A bitmask of the fields that are set.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-<refsect1 id="GypsyCourse.property-details" role="property_details">
-<title role="property_details.title">Property Details</title>
-<refsect2 id="GypsyCourse--object-path" role="property"><title>The <literal>&quot;object-path&quot;</literal> property</title>
-<indexterm zone="GypsyCourse--object-path"><primary sortas="GypsyCourse:object-path">GypsyCourse:object-path</primary></indexterm><programlisting>  &quot;object-path&quot;              <link linkend="gchar">gchar</link>*                : Write / Construct Only</programlisting>
-<para>
-The path of the Gypsy GPS object</para>
-<para>
-</para><para>Default value: ""</para>
-</refsect2>
-</refsect1>
-
-<refsect1 id="GypsyCourse.signal-details" role="signals">
-<title role="signals.title">Signal Details</title>
-<refsect2 id="GypsyCourse-course-changed" role="signal"><title>The <literal>&quot;course-changed&quot;</literal> signal</title>
-<indexterm zone="GypsyCourse-course-changed"><primary sortas="GypsyCourse::course-changed">GypsyCourse::course-changed</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="GypsyCourse">GypsyCourse</link> *fields,
-                                                        <link linkend="gint">gint</link>         timestamp,
-                                                        <link linkend="gint">gint</link>         speed,
-                                                        <link linkend="gdouble">gdouble</link>      direction,
-                                                        <link linkend="gdouble">gdouble</link>      climb,
-                                                        <link linkend="gdouble">gdouble</link>      arg5,
-                                                        <link linkend="gpointer">gpointer</link>     user_data)      : Run First / No Recursion</programlisting>
-<para>
-The ::course-changed signal is emitted when the GPS device
-indicates that one or more of the course fields has changed.
-The fields which have changed will be indicated in the <parameter>fields</parameter>
-bitmask.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>fields</parameter>&#160;:</term>
-<listitem><simpara> A bitmask of <link linkend="GypsyCourseFields"><type>GypsyCourseFields</type></link> indicating which of the following fields are valid
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>timestamp</parameter>&#160;:</term>
-<listitem><simpara> The time this change occurred
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>speed</parameter>&#160;:</term>
-<listitem><simpara> The new speed
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>direction</parameter>&#160;:</term>
-<listitem><simpara> The new direction
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>climb</parameter>&#160;:</term>
-<listitem><simpara> The new rate of climb
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>user_data</parameter>&#160;:</term>
-<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-</refsect1>
-
-
-
-</refentry>
diff --git a/docs/reference/xml/gypsy-device.xml b/docs/reference/xml/gypsy-device.xml
deleted file mode 100644
index 26cb876..0000000
--- a/docs/reference/xml/gypsy-device.xml
+++ /dev/null
@@ -1,304 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-
-<refentry id="GypsyDevice">
-<refmeta>
-<refentrytitle role="top_of_page" id="GypsyDevice.top_of_page">GypsyDevice</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>GYPSY Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>GypsyDevice</refname>
-<refpurpose>Object for obtaining device information</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv id="GypsyDevice.synopsis" role="synopsis">
-<title role="synopsis.title">Synopsis</title>
-
-<synopsis>
-                    <link linkend="GypsyDevice-struct">GypsyDevice</link>;
-#define             <link linkend="GYPSY-DEVICE-DBUS-SERVICE--CAPS">GYPSY_DEVICE_DBUS_SERVICE</link>
-#define             <link linkend="GYPSY-DEVICE-DBUS-INTERFACE--CAPS">GYPSY_DEVICE_DBUS_INTERFACE</link>
-enum                <link linkend="GypsyDeviceFixStatus">GypsyDeviceFixStatus</link>;
-<link linkend="GypsyDevice">GypsyDevice</link> *       <link linkend="gypsy-device-new">gypsy_device_new</link>                    (const <link linkend="char">char</link> *object_path);
-<link linkend="gboolean">gboolean</link>            <link linkend="gypsy-device-get-connection-status">gypsy_device_get_connection_status</link>  (<link linkend="GypsyDevice">GypsyDevice</link> *device,
-                                                         <link linkend="GError">GError</link> **error);
-<link linkend="GypsyDeviceFixStatus">GypsyDeviceFixStatus</link>  <link linkend="gypsy-device-get-fix-status">gypsy_device_get_fix_status</link>       (<link linkend="GypsyDevice">GypsyDevice</link> *device,
-                                                         <link linkend="GError">GError</link> **error);
-<link linkend="gboolean">gboolean</link>            <link linkend="gypsy-device-start">gypsy_device_start</link>                  (<link linkend="GypsyDevice">GypsyDevice</link> *device,
-                                                         <link linkend="GError">GError</link> **error);
-<link linkend="gboolean">gboolean</link>            <link linkend="gypsy-device-stop">gypsy_device_stop</link>                   (<link linkend="GypsyDevice">GypsyDevice</link> *device,
-                                                         <link linkend="GError">GError</link> **error);
-</synopsis>
-</refsynopsisdiv>
-
-<refsect1 id="GypsyDevice.object-hierarchy" role="object_hierarchy">
-<title role="object_hierarchy.title">Object Hierarchy</title>
-<synopsis>
-  <link linkend="GObject">GObject</link>
-   +----GypsyDevice
-</synopsis>
-</refsect1>
-
-
-
-
-
-<refsect1 id="GypsyDevice.properties" role="properties">
-<title role="properties.title">Properties</title>
-<synopsis>
-  &quot;<link linkend="GypsyDevice--object-path">object-path</link>&quot;              <link linkend="gchar">gchar</link>*                : Write / Construct Only
-</synopsis>
-</refsect1>
-
-<refsect1 id="GypsyDevice.signals" role="signal_proto">
-<title role="signal_proto.title">Signals</title>
-<synopsis>
-  &quot;<link linkend="GypsyDevice-connection-changed">connection-changed</link>&quot;                             : Run First / No Recursion
-  &quot;<link linkend="GypsyDevice-fix-status-changed">fix-status-changed</link>&quot;                             : Run First / No Recursion
-</synopsis>
-</refsect1>
-
-
-<refsect1 id="GypsyDevice.description" role="desc">
-<title role="desc.title">Description</title>
-<para>
-<link linkend="GypsyDevice"><type>GypsyDevice</type></link> is used whenever the client program wishes to know about
-changes in the device's status. It has signals for connection status and
-fix status. It can also be used to tell gypsy-daemon to start or stop parsing
-sentences from the GPS device.
-</para>
-<para>
-A <link linkend="GypsyDevice"><type>GypsyDevice</type></link> object is created using <link linkend="gypsy-device-new"><function>gypsy_device_new()</function></link> using the D-Bus path of
-the GPS device. This path is returned from the <link linkend="gypsy-control-create"><function>gypsy_control_create()</function></link> 
-function. The client can start the GPS data stream with <link linkend="gypsy-device-start"><function>gypsy_device_start()</function></link>,
-stop it with <link linkend="gypsy-device-stop"><function>gypsy_device_stop()</function></link>, or find out about the status with
-<link linkend="gypsy-device-get-fix-status"><function>gypsy_device_get_fix_status()</function></link> and <link linkend="gypsy-device-get-connection-status"><function>gypsy_device_get_connection_status()</function></link>.
-</para>
-<para>
-As the fix status and connection status change, <link linkend="GypsyDevice"><type>GypsyDevice</type></link> will emit the
-<link linkend="GypsyDevice-fix-status-changed"><type>"fix-status-changed"</type></link> and <link linkend="GypsyDevice-connection-changed"><type>"connection-changed"</type></link> signals
-respectively.
-</para>
-<para>
-<informalexample>
-<programlisting>
-GypsyDevice *device;
-GError *error = NULL;
-
-. . .
-
-/<!-- -->* path comes from the <link linkend="gypsy-control-create">gypsy_control_create</link>() function *<!-- -->/
-device = <link linkend="gypsy-device-new">gypsy_device_new</link> (path);
-g_signal_connect (device, "connection-changed", G_CALLBACK (connection_changed), NULL);
-<link linkend="gypsy-device-start">gypsy_device_start</link> (device, &amp;error);
-if (error != NULL) {
-&nbsp;&nbsp;g_warning ("Error starting GPS: %s", error->message);
-&nbsp;&nbsp;g_error_free (error);
-}
-
-. . .
-
-static void connection_changed (GypsyDevice *device, gboolean connected, gpointer data)
-{
-&nbsp;&nbsp;g_print ("Connection status: %s\n", connected ? "Connected" : "Disconnected");
-}
-</programlisting>
-</informalexample></para>
-<para>
-</para>
-</refsect1>
-
-<refsect1 id="GypsyDevice.details" role="details">
-<title role="details.title">Details</title>
-<refsect2 id="GypsyDevice-struct" role="struct">
-<title>GypsyDevice</title>
-<indexterm zone="GypsyDevice-struct"><primary sortas="GypsyDevice">GypsyDevice</primary></indexterm><programlisting>typedef struct _GypsyDevice GypsyDevice;</programlisting>
-<para>
-There are no public fields in <link linkend="GypsyDevice"><type>GypsyDevice</type></link>.</para>
-<para>
-</para></refsect2>
-<refsect2 id="GYPSY-DEVICE-DBUS-SERVICE--CAPS" role="macro">
-<title>GYPSY_DEVICE_DBUS_SERVICE</title>
-<indexterm zone="GYPSY-DEVICE-DBUS-SERVICE--CAPS"><primary sortas="GYPSY_DEVICE_DBUS_SERVICE">GYPSY_DEVICE_DBUS_SERVICE</primary></indexterm><programlisting>#define GYPSY_DEVICE_DBUS_SERVICE "org.freedesktop.Gypsy"
-</programlisting>
-<para>
-A define containing the name of the Device service</para>
-<para>
-</para></refsect2>
-<refsect2 id="GYPSY-DEVICE-DBUS-INTERFACE--CAPS" role="macro">
-<title>GYPSY_DEVICE_DBUS_INTERFACE</title>
-<indexterm zone="GYPSY-DEVICE-DBUS-INTERFACE--CAPS"><primary sortas="GYPSY_DEVICE_DBUS_INTERFACE">GYPSY_DEVICE_DBUS_INTERFACE</primary></indexterm><programlisting>#define GYPSY_DEVICE_DBUS_INTERFACE "org.freedesktop.Gypsy.Device"
-</programlisting>
-<para>
-A define containing the name of the Device interface</para>
-<para>
-</para></refsect2>
-<refsect2 id="GypsyDeviceFixStatus" role="enum">
-<title>enum GypsyDeviceFixStatus</title>
-<indexterm zone="GypsyDeviceFixStatus"><primary sortas="GypsyDeviceFixStatus">GypsyDeviceFixStatus</primary></indexterm><programlisting>typedef enum {
-	GYPSY_DEVICE_FIX_STATUS_INVALID = 0,
-	GYPSY_DEVICE_FIX_STATUS_NONE,
-	GYPSY_DEVICE_FIX_STATUS_2D,
-	GYPSY_DEVICE_FIX_STATUS_3D
-} GypsyDeviceFixStatus;
-</programlisting>
-<para>
-An enumeration representing the various fix states that a GPS device can be in.</para>
-<para>
-</para><variablelist role="enum">
-<varlistentry id="GYPSY-DEVICE-FIX-STATUS-INVALID--CAPS" role="constant">
-<term><literal>GYPSY_DEVICE_FIX_STATUS_INVALID</literal></term>
-<listitem><simpara> The fix is invalid
-</simpara></listitem>
-</varlistentry>
-<varlistentry id="GYPSY-DEVICE-FIX-STATUS-NONE--CAPS" role="constant">
-<term><literal>GYPSY_DEVICE_FIX_STATUS_NONE</literal></term>
-<listitem><simpara> A fix has not yet been obtained
-</simpara></listitem>
-</varlistentry>
-<varlistentry id="GYPSY-DEVICE-FIX-STATUS-2D--CAPS" role="constant">
-<term><literal>GYPSY_DEVICE_FIX_STATUS_2D</literal></term>
-<listitem><simpara> A fix with latitude and longitude has been obtained
-</simpara></listitem>
-</varlistentry>
-<varlistentry id="GYPSY-DEVICE-FIX-STATUS-3D--CAPS" role="constant">
-<term><literal>GYPSY_DEVICE_FIX_STATUS_3D</literal></term>
-<listitem><simpara> A fix with latitude, longitude and altitude has been obtained
-</simpara></listitem>
-</varlistentry>
-</variablelist></refsect2>
-<refsect2 id="gypsy-device-new" role="function">
-<title>gypsy_device_new ()</title>
-<indexterm zone="gypsy-device-new"><primary sortas="gypsy_device_new">gypsy_device_new</primary></indexterm><programlisting><link linkend="GypsyDevice">GypsyDevice</link> *       gypsy_device_new                    (const <link linkend="char">char</link> *object_path);</programlisting>
-<para>
-Creates a new <link linkend="GypsyDevice"><type>GypsyDevice</type></link> that points to <parameter>object_path</parameter></para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>object_path</parameter>&#160;:</term>
-<listitem><simpara> Object path to the device
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A pointer to a <link linkend="GypsyDevice"><type>GypsyDevice</type></link>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="gypsy-device-get-connection-status" role="function">
-<title>gypsy_device_get_connection_status ()</title>
-<indexterm zone="gypsy-device-get-connection-status"><primary sortas="gypsy_device_get_connection_status">gypsy_device_get_connection_status</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            gypsy_device_get_connection_status  (<link linkend="GypsyDevice">GypsyDevice</link> *device,
-                                                         <link linkend="GError">GError</link> **error);</programlisting>
-<para>
-Obtains the connection status of <parameter>device</parameter>.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>device</parameter>&#160;:</term>
-<listitem><simpara> A <link linkend="GypsyDevice"><type>GypsyDevice</type></link>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>error</parameter>&#160;:</term>
-<listitem><simpara> A pointer to a <link linkend="GError"><type>GError</type></link> to return an error in.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> <link linkend="TRUE--CAPS"><type>TRUE</type></link> if the device is connected, <link linkend="FALSE--CAPS"><type>FALSE</type></link> otherwise.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="gypsy-device-get-fix-status" role="function">
-<title>gypsy_device_get_fix_status ()</title>
-<indexterm zone="gypsy-device-get-fix-status"><primary sortas="gypsy_device_get_fix_status">gypsy_device_get_fix_status</primary></indexterm><programlisting><link linkend="GypsyDeviceFixStatus">GypsyDeviceFixStatus</link>  gypsy_device_get_fix_status       (<link linkend="GypsyDevice">GypsyDevice</link> *device,
-                                                         <link linkend="GError">GError</link> **error);</programlisting>
-<para>
-Obtains the current fix status of <parameter>device</parameter>.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>device</parameter>&#160;:</term>
-<listitem><simpara> A <link linkend="GypsyDevice"><type>GypsyDevice</type></link>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>error</parameter>&#160;:</term>
-<listitem><simpara> A pointer to a <link linkend="GError"><type>GError</type></link> to return a error in.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A <link linkend="GypsyDeviceFixStatus"><type>GypsyDeviceFixStatus</type></link>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="gypsy-device-start" role="function">
-<title>gypsy_device_start ()</title>
-<indexterm zone="gypsy-device-start"><primary sortas="gypsy_device_start">gypsy_device_start</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            gypsy_device_start                  (<link linkend="GypsyDevice">GypsyDevice</link> *device,
-                                                         <link linkend="GError">GError</link> **error);</programlisting>
-<para>
-Starts the connection to the physical device pointed to by <parameter>device</parameter>, and
-listens for incoming messages.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>device</parameter>&#160;:</term>
-<listitem><simpara> A <link linkend="GypsyDevice"><type>GypsyDevice</type></link>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>error</parameter>&#160;:</term>
-<listitem><simpara> A pointer to a <link linkend="GError"><type>GError</type></link> to return the error in
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> <link linkend="TRUE--CAPS"><type>TRUE</type></link> on success, <link linkend="FALSE--CAPS"><type>FALSE</type></link> otherwise.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="gypsy-device-stop" role="function">
-<title>gypsy_device_stop ()</title>
-<indexterm zone="gypsy-device-stop"><primary sortas="gypsy_device_stop">gypsy_device_stop</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            gypsy_device_stop                   (<link linkend="GypsyDevice">GypsyDevice</link> *device,
-                                                         <link linkend="GError">GError</link> **error);</programlisting>
-<para>
-Stops the physical device pointed to by <parameter>device</parameter>.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>device</parameter>&#160;:</term>
-<listitem><simpara> A <link linkend="GypsyDevice"><type>GypsyDevice</type></link>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>error</parameter>&#160;:</term>
-<listitem><simpara> A pointer to a <link linkend="GError"><type>GError</type></link> to return the error in
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> <link linkend="TRUE--CAPS"><type>TRUE</type></link> on success, <link linkend="FALSE--CAPS"><type>FALSE</type></link> otherwise.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-<refsect1 id="GypsyDevice.property-details" role="property_details">
-<title role="property_details.title">Property Details</title>
-<refsect2 id="GypsyDevice--object-path" role="property"><title>The <literal>&quot;object-path&quot;</literal> property</title>
-<indexterm zone="GypsyDevice--object-path"><primary sortas="GypsyDevice:object-path">GypsyDevice:object-path</primary></indexterm><programlisting>  &quot;object-path&quot;              <link linkend="gchar">gchar</link>*                : Write / Construct Only</programlisting>
-<para>
-The path of the Gypsy GPS object</para>
-<para>
-</para><para>Default value: ""</para>
-</refsect2>
-</refsect1>
-
-<refsect1 id="GypsyDevice.signal-details" role="signals">
-<title role="signals.title">Signal Details</title>
-<refsect2 id="GypsyDevice-connection-changed" role="signal"><title>The <literal>&quot;connection-changed&quot;</literal> signal</title>
-<indexterm zone="GypsyDevice-connection-changed"><primary sortas="GypsyDevice::connection-changed">GypsyDevice::connection-changed</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="GypsyDevice">GypsyDevice</link> *connected,
-                                                        <link linkend="gboolean">gboolean</link>     arg1,
-                                                        <link linkend="gpointer">gpointer</link>     user_data)      : Run First / No Recursion</programlisting>
-<para>
-The ::connection-changed signal is emitted whenever the device
-connection changes.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>connected</parameter>&#160;:</term>
-<listitem><simpara> Whether or not the device is connected
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>user_data</parameter>&#160;:</term>
-<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
-</variablelist></refsect2><refsect2 id="GypsyDevice-fix-status-changed" role="signal"><title>The <literal>&quot;fix-status-changed&quot;</literal> signal</title>
-<indexterm zone="GypsyDevice-fix-status-changed"><primary sortas="GypsyDevice::fix-status-changed">GypsyDevice::fix-status-changed</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="GypsyDevice">GypsyDevice</link> *fix_status,
-                                                        <link linkend="gint">gint</link>         arg1,
-                                                        <link linkend="gpointer">gpointer</link>     user_data)       : Run First / No Recursion</programlisting>
-<para>
-The ::fix-status-changed signal is emitted whenever the GPS device
-reports that its fix status has changed. <parameter>fix_status</parameter> is a
-<link linkend="GypsyDeviceFixStatus"><type>GypsyDeviceFixStatus</type></link></para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>fix_status</parameter>&#160;:</term>
-<listitem><simpara> The new fix status
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>user_data</parameter>&#160;:</term>
-<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-</refsect1>
-
-
-
-</refentry>
diff --git a/docs/reference/xml/gypsy-position.xml b/docs/reference/xml/gypsy-position.xml
deleted file mode 100644
index 5201d7a..0000000
--- a/docs/reference/xml/gypsy-position.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-
-<refentry id="GypsyPosition">
-<refmeta>
-<refentrytitle role="top_of_page" id="GypsyPosition.top_of_page">GypsyPosition</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>GYPSY Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>GypsyPosition</refname>
-<refpurpose>Object for obtaining positions from gypsy-daemon</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv id="GypsyPosition.synopsis" role="synopsis">
-<title role="synopsis.title">Synopsis</title>
-
-<synopsis>
-                    <link linkend="GypsyPosition-struct">GypsyPosition</link>;
-#define             <link linkend="GYPSY-POSITION-DBUS-INTERFACE--CAPS">GYPSY_POSITION_DBUS_INTERFACE</link>
-#define             <link linkend="GYPSY-POSITION-DBUS-SERVICE--CAPS">GYPSY_POSITION_DBUS_SERVICE</link>
-enum                <link linkend="GypsyPositionFields">GypsyPositionFields</link>;
-<link linkend="GypsyPosition">GypsyPosition</link> *     <link linkend="gypsy-position-new">gypsy_position_new</link>                  (const <link linkend="char">char</link> *object_path);
-<link linkend="GypsyPositionFields">GypsyPositionFields</link>  <link linkend="gypsy-position-get-position">gypsy_position_get_position</link>        (<link linkend="GypsyPosition">GypsyPosition</link> *position,
-                                                         <link linkend="int">int</link> *timestamp,
-                                                         <link linkend="double">double</link> *latitude,
-                                                         <link linkend="double">double</link> *longitude,
-                                                         <link linkend="double">double</link> *altitude,
-                                                         <link linkend="GError">GError</link> **error);
-</synopsis>
-</refsynopsisdiv>
-
-<refsect1 id="GypsyPosition.object-hierarchy" role="object_hierarchy">
-<title role="object_hierarchy.title">Object Hierarchy</title>
-<synopsis>
-  <link linkend="GObject">GObject</link>
-   +----GypsyPosition
-</synopsis>
-</refsect1>
-
-
-
-
-
-<refsect1 id="GypsyPosition.properties" role="properties">
-<title role="properties.title">Properties</title>
-<synopsis>
-  &quot;<link linkend="GypsyPosition--object-path">object-path</link>&quot;              <link linkend="gchar">gchar</link>*                : Write / Construct Only
-</synopsis>
-</refsect1>
-
-<refsect1 id="GypsyPosition.signals" role="signal_proto">
-<title role="signal_proto.title">Signals</title>
-<synopsis>
-  &quot;<link linkend="GypsyPosition-position-changed">position-changed</link>&quot;                               : Run First / No Recursion
-</synopsis>
-</refsect1>
-
-
-<refsect1 id="GypsyPosition.description" role="desc">
-<title role="desc.title">Description</title>
-<para>
-<link linkend="GypsyPosition"><type>GypsyPosition</type></link> is used whenever the client program wishes to know about
-GPS position changes. It can report the current position, and has a signal
-to notify listeners of changes.
-</para>
-<para>
-A <link linkend="GypsyPosition"><type>GypsyPosition</type></link> object is created using <link linkend="gypsy-position-new"><function>gypsy_position_new()</function></link> using the 
-D-Bus path of the GPS device. This path is returned from the 
-<link linkend="gypsy-control-create"><function>gypsy_control_create()</function></link> function. The client can then find out about the
-position with <link linkend="gypsy-position-get-position"><function>gypsy_position_get_position()</function></link>.
-</para>
-<para>
-As the position information changes <link linkend="GypsyPosition"><type>GypsyPosition</type></link> will emit the 
-position-changed signal. This signal contains the fix position if 
-gypsy-daemon knows it. It has a fields paramater which is a bitmask of
-<link linkend="GypsyPositionFields"><type>GypsyPositionFields</type></link> which indicates which of the latitude, longitude or
-altitude contains valid information. The timestamp will always be valid
-if it is greater than 0.
-</para>
-<para>
-<informalexample>
-<programlisting>
-GypsyPosition *position;
-GError *error = NULL;
-
-. . .
-
-/ * path comes from the gypsy_control_create() function * /
-position = gypsy_position_new (path);
-g_signal_connect (position, "position-changed", G_CALLBACK (position_changed), NULL);
-
-. . .
-
-static void position_changed (GypsyPosition *position, 
-GypsyPositionFields fields,
-int timestamp,
-double latitude,
-double longitude,
-double altitude,
-gpointer userdata)
-{
-&nbsp;&nbsp;g_print ("latitude, longitude (%f, %f)\n", (fields &amp; GYPSY_POSITION_FIELDS_LATITUDE) ? latitude : -1.0, (fields &amp; GYPSY_POSITION_FIELDS_LONGITUDE) ? longitude : -1.0);
-}
-</programlisting>
-</informalexample></para>
-<para>
-</para>
-</refsect1>
-
-<refsect1 id="GypsyPosition.details" role="details">
-<title role="details.title">Details</title>
-<refsect2 id="GypsyPosition-struct" role="struct">
-<title>GypsyPosition</title>
-<indexterm zone="GypsyPosition-struct"><primary sortas="GypsyPosition">GypsyPosition</primary></indexterm><programlisting>typedef struct _GypsyPosition GypsyPosition;</programlisting>
-<para>
-There are no public fields in <link linkend="GypsyPosition"><type>GypsyPosition</type></link>.</para>
-<para>
-</para></refsect2>
-<refsect2 id="GYPSY-POSITION-DBUS-INTERFACE--CAPS" role="macro">
-<title>GYPSY_POSITION_DBUS_INTERFACE</title>
-<indexterm zone="GYPSY-POSITION-DBUS-INTERFACE--CAPS"><primary sortas="GYPSY_POSITION_DBUS_INTERFACE">GYPSY_POSITION_DBUS_INTERFACE</primary></indexterm><programlisting>#define GYPSY_POSITION_DBUS_INTERFACE "org.freedesktop.Gypsy.Position"
-</programlisting>
-<para>
-A define containing the name of the Position interface</para>
-<para>
-</para></refsect2>
-<refsect2 id="GYPSY-POSITION-DBUS-SERVICE--CAPS" role="macro">
-<title>GYPSY_POSITION_DBUS_SERVICE</title>
-<indexterm zone="GYPSY-POSITION-DBUS-SERVICE--CAPS"><primary sortas="GYPSY_POSITION_DBUS_SERVICE">GYPSY_POSITION_DBUS_SERVICE</primary></indexterm><programlisting>#define GYPSY_POSITION_DBUS_SERVICE "org.freedesktop.Gypsy"
-</programlisting>
-<para>
-A define containing the address of the Position service</para>
-<para>
-</para></refsect2>
-<refsect2 id="GypsyPositionFields" role="enum">
-<title>enum GypsyPositionFields</title>
-<indexterm zone="GypsyPositionFields"><primary sortas="GypsyPositionFields">GypsyPositionFields</primary></indexterm><programlisting>typedef enum {
-	GYPSY_POSITION_FIELDS_NONE = 0,
-	GYPSY_POSITION_FIELDS_LATITUDE = 1 &lt;&lt; 0,
-	GYPSY_POSITION_FIELDS_LONGITUDE = 1 &lt;&lt; 1,
-	GYPSY_POSITION_FIELDS_ALTITUDE = 1 &lt;&lt; 2
-} GypsyPositionFields;
-</programlisting>
-<para>
-A bitmask telling which fields in the position_changed callback are valid</para>
-<para>
-</para><variablelist role="enum">
-<varlistentry id="GYPSY-POSITION-FIELDS-NONE--CAPS" role="constant">
-<term><literal>GYPSY_POSITION_FIELDS_NONE</literal></term>
-<listitem><simpara> None of the fields are valid
-</simpara></listitem>
-</varlistentry>
-<varlistentry id="GYPSY-POSITION-FIELDS-LATITUDE--CAPS" role="constant">
-<term><literal>GYPSY_POSITION_FIELDS_LATITUDE</literal></term>
-<listitem><simpara> The latitude field is valid
-</simpara></listitem>
-</varlistentry>
-<varlistentry id="GYPSY-POSITION-FIELDS-LONGITUDE--CAPS" role="constant">
-<term><literal>GYPSY_POSITION_FIELDS_LONGITUDE</literal></term>
-<listitem><simpara> The longitude field is valid
-</simpara></listitem>
-</varlistentry>
-<varlistentry id="GYPSY-POSITION-FIELDS-ALTITUDE--CAPS" role="constant">
-<term><literal>GYPSY_POSITION_FIELDS_ALTITUDE</literal></term>
-<listitem><simpara> The altitude field is valid
-</simpara></listitem>
-</varlistentry>
-</variablelist></refsect2>
-<refsect2 id="gypsy-position-new" role="function">
-<title>gypsy_position_new ()</title>
-<indexterm zone="gypsy-position-new"><primary sortas="gypsy_position_new">gypsy_position_new</primary></indexterm><programlisting><link linkend="GypsyPosition">GypsyPosition</link> *     gypsy_position_new                  (const <link linkend="char">char</link> *object_path);</programlisting>
-<para>
-Creates a new <link linkend="GypsyPosition"><type>GypsyPosition</type></link> object that listens for position changes
-from the GPS found at <parameter>object_path</parameter>.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>object_path</parameter>&#160;:</term>
-<listitem><simpara> Object path to the GPS device
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A <link linkend="GypsyPosition"><type>GypsyPosition</type></link> object
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="gypsy-position-get-position" role="function">
-<title>gypsy_position_get_position ()</title>
-<indexterm zone="gypsy-position-get-position"><primary sortas="gypsy_position_get_position">gypsy_position_get_position</primary></indexterm><programlisting><link linkend="GypsyPositionFields">GypsyPositionFields</link>  gypsy_position_get_position        (<link linkend="GypsyPosition">GypsyPosition</link> *position,
-                                                         <link linkend="int">int</link> *timestamp,
-                                                         <link linkend="double">double</link> *latitude,
-                                                         <link linkend="double">double</link> *longitude,
-                                                         <link linkend="double">double</link> *altitude,
-                                                         <link linkend="GError">GError</link> **error);</programlisting>
-<para>
-Obtains the current position, if known, from the GPS device.
-<parameter>timestamp</parameter>, <parameter>latitude</parameter>, <parameter>longitude</parameter> and <parameter>altitude</parameter> can be <link linkend="NULL--CAPS"><type>NULL</type></link> if the result
-is not required.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>position</parameter>&#160;:</term>
-<listitem><simpara> A <link linkend="GypsyPosition"><type>GypsyPosition</type></link>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>timestamp</parameter>&#160;:</term>
-<listitem><simpara> Pointer to store the timestamp
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>latitude</parameter>&#160;:</term>
-<listitem><simpara> Pointer to store the latitude
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>longitude</parameter>&#160;:</term>
-<listitem><simpara> Pointer to store the longitude
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>altitude</parameter>&#160;:</term>
-<listitem><simpara> Pointer to store the altitude
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>error</parameter>&#160;:</term>
-<listitem><simpara> Pointer to store a <link linkend="GError"><type>GError</type></link>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Bitmask of <link linkend="GypsyPositionFields"><type>GypsyPositionFields</type></link> indicating what field was set
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-<refsect1 id="GypsyPosition.property-details" role="property_details">
-<title role="property_details.title">Property Details</title>
-<refsect2 id="GypsyPosition--object-path" role="property"><title>The <literal>&quot;object-path&quot;</literal> property</title>
-<indexterm zone="GypsyPosition--object-path"><primary sortas="GypsyPosition:object-path">GypsyPosition:object-path</primary></indexterm><programlisting>  &quot;object-path&quot;              <link linkend="gchar">gchar</link>*                : Write / Construct Only</programlisting>
-<para>
-The path of the Gypsy GPS object</para>
-<para>
-</para><para>Default value: ""</para>
-</refsect2>
-</refsect1>
-
-<refsect1 id="GypsyPosition.signal-details" role="signals">
-<title role="signals.title">Signal Details</title>
-<refsect2 id="GypsyPosition-position-changed" role="signal"><title>The <literal>&quot;position-changed&quot;</literal> signal</title>
-<indexterm zone="GypsyPosition-position-changed"><primary sortas="GypsyPosition::position-changed">GypsyPosition::position-changed</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="GypsyPosition">GypsyPosition</link> *fields,
-                                                        <link linkend="gint">gint</link>           timestamp,
-                                                        <link linkend="gint">gint</link>           latitude,
-                                                        <link linkend="gdouble">gdouble</link>        longitude,
-                                                        <link linkend="gdouble">gdouble</link>        altitude,
-                                                        <link linkend="gdouble">gdouble</link>        arg5,
-                                                        <link linkend="gpointer">gpointer</link>       user_data)      : Run First / No Recursion</programlisting>
-<para>
-The ::position-changed signal is emitted when the GPS device
-indicates that one or more of the position fields has changed.
-The fields which have changed will be indicated in the <parameter>fields</parameter>
-bitmask.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>fields</parameter>&#160;:</term>
-<listitem><simpara> A bitmask of <link linkend="GypsyPositionFields"><type>GypsyPositionFields</type></link> indicating which of the following fields are valid
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>timestamp</parameter>&#160;:</term>
-<listitem><simpara> The timestamp when this change occurred
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>latitude</parameter>&#160;:</term>
-<listitem><simpara> The new latitude
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>longitude</parameter>&#160;:</term>
-<listitem><simpara> The new longitude
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>altitude</parameter>&#160;:</term>
-<listitem><simpara> The new altitude
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>user_data</parameter>&#160;:</term>
-<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-</refsect1>
-
-
-
-</refentry>
diff --git a/docs/reference/xml/gypsy-satellite.xml b/docs/reference/xml/gypsy-satellite.xml
deleted file mode 100644
index a58af36..0000000
--- a/docs/reference/xml/gypsy-satellite.xml
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-
-<refentry id="GypsySatellite">
-<refmeta>
-<refentrytitle role="top_of_page" id="GypsySatellite.top_of_page">GypsySatellite</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>GYPSY Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>GypsySatellite</refname>
-<refpurpose>Object for obtaining satellite information</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv id="GypsySatellite.synopsis" role="synopsis">
-<title role="synopsis.title">Synopsis</title>
-
-<synopsis>
-                    <link linkend="GypsySatellite-struct">GypsySatellite</link>;
-#define             <link linkend="GYPSY-SATELLITE-DBUS-INTERFACE--CAPS">GYPSY_SATELLITE_DBUS_INTERFACE</link>
-#define             <link linkend="GYPSY-SATELLITE-DBUS-SERVICE--CAPS">GYPSY_SATELLITE_DBUS_SERVICE</link>
-                    <link linkend="GypsySatelliteDetails">GypsySatelliteDetails</link>;
-<link linkend="GypsySatellite">GypsySatellite</link> *    <link linkend="gypsy-satellite-new">gypsy_satellite_new</link>                 (const <link linkend="char">char</link> *object_path);
-<link linkend="GPtrArray">GPtrArray</link> *         <link linkend="gypsy-satellite-get-satellites">gypsy_satellite_get_satellites</link>      (<link linkend="GypsySatellite">GypsySatellite</link> *satellite,
-                                                         <link linkend="GError">GError</link> **error);
-<link linkend="void">void</link>                <link linkend="gypsy-satellite-free-satellite-array">gypsy_satellite_free_satellite_array</link>
-                                                        (<link linkend="GPtrArray">GPtrArray</link> *satellites);
-</synopsis>
-</refsynopsisdiv>
-
-<refsect1 id="GypsySatellite.object-hierarchy" role="object_hierarchy">
-<title role="object_hierarchy.title">Object Hierarchy</title>
-<synopsis>
-  <link linkend="GObject">GObject</link>
-   +----GypsySatellite
-</synopsis>
-</refsect1>
-
-
-
-
-
-<refsect1 id="GypsySatellite.properties" role="properties">
-<title role="properties.title">Properties</title>
-<synopsis>
-  &quot;<link linkend="GypsySatellite--object-path">object-path</link>&quot;              <link linkend="gchar">gchar</link>*                : Write / Construct Only
-</synopsis>
-</refsect1>
-
-<refsect1 id="GypsySatellite.signals" role="signal_proto">
-<title role="signal_proto.title">Signals</title>
-<synopsis>
-  &quot;<link linkend="GypsySatellite-satellites-changed">satellites-changed</link>&quot;                             : Run Last
-</synopsis>
-</refsect1>
-
-
-<refsect1 id="GypsySatellite.description" role="desc">
-<title role="desc.title">Description</title>
-<para>
-<link linkend="GypsySatellite"><type>GypsySatellite</type></link> is used whenever the client program wishes to know about
-changes in the satellite details. The satellite details contain the satellite
-ID number (the PRN), the elevation, the azimuth, the signal-to-noise ratio
-(SNR) and whether or not the satellite was used to calculate the fix.
-</para>
-<para>
-A <link linkend="GypsySatellite"><type>GypsySatellite</type></link> object is created using <link linkend="gypsy-satellite-new"><function>gypsy_satellite_new()</function></link> using the 
-D-Bus path of the GPS device. This path is returned from the 
-<link linkend="gypsy-control-create"><function>gypsy_control_create()</function></link> function. The client can then find out about the
-visible satellites with <link linkend="gypsy-satellite-get-satellites"><function>gypsy_satellite_get_satellites()</function></link> which returns a
-GPtrArray containing the <link linkend="GypsySatelliteDetails"><type>GypsySatelliteDetails</type></link> for each visible satellite.
-Once the client is finished with this GPtrArray 
-<link linkend="gypsy-satellite-free-satellite-array"><function>gypsy_satellite_free_satellite_array()</function></link> should be used to free the data.
-</para>
-<para>
-As the satellite information changes <link linkend="GypsySatellite"><type>GypsySatellite</type></link> will emit the 
-satellite-changed signal. This signal contains the satellite details in
-a GPtrArray. In this case the satellite array does not need to be freed
-with <link linkend="gypsy-satellite-free-satellite-array"><function>gypsy_satellite_free_satellite_array()</function></link>.
-</para>
-<para>
-Although gypsy-daemon only emits signals whenever the associated data has 
-changed, satellite data is constantly changing, so so the satellite-changed
-signal will be emitted at a rate of once every second.
-</para>
-<para>
-<informalexample>
-<programlisting>
-GypsySatellite *satellite;
-GError *error = NULL;
-
-. . .
-
-/ * path comes from the gypsy_control_create() function * /
-satellite = gypsy_satellite_new (path);
-g_signal_connect (satellite, "satellite-changed", G_CALLBACK (satellite_changed), NULL);
-
-. . .
-
-static void satellite_changed (GypsySatellite *satellite, 
-GPtrArray *satellites,
-gpointer userdata)
-{
-&nbsp;&nbsp;int i;
-
-&nbsp;&nbsp;for (i = 0; i &lt; satellites->len; i++) {
-&nbsp;&nbsp;&nbsp;&nbsp;GypsySatelliteDetails *details = satellites->pdata[i];
-&nbsp;&nbsp;&nbsp;&nbsp;g_print ("Satellite %d: %s", details->satellite_id, details->in_use ? "In use" : "Not in use");
-&nbsp;&nbsp;}
-}
-</programlisting>
-</informalexample></para>
-<para>
-</para>
-</refsect1>
-
-<refsect1 id="GypsySatellite.details" role="details">
-<title role="details.title">Details</title>
-<refsect2 id="GypsySatellite-struct" role="struct">
-<title>GypsySatellite</title>
-<indexterm zone="GypsySatellite-struct"><primary sortas="GypsySatellite">GypsySatellite</primary></indexterm><programlisting>typedef struct _GypsySatellite GypsySatellite;</programlisting>
-<para>
-There are no public fields in <link linkend="GypsySatellite"><type>GypsySatellite</type></link>.</para>
-<para>
-</para></refsect2>
-<refsect2 id="GYPSY-SATELLITE-DBUS-INTERFACE--CAPS" role="macro">
-<title>GYPSY_SATELLITE_DBUS_INTERFACE</title>
-<indexterm zone="GYPSY-SATELLITE-DBUS-INTERFACE--CAPS"><primary sortas="GYPSY_SATELLITE_DBUS_INTERFACE">GYPSY_SATELLITE_DBUS_INTERFACE</primary></indexterm><programlisting>#define GYPSY_SATELLITE_DBUS_INTERFACE "org.freedesktop.Gypsy.Satellite"
-</programlisting>
-<para>
-A define containing the name of the Satellite interface</para>
-<para>
-</para></refsect2>
-<refsect2 id="GYPSY-SATELLITE-DBUS-SERVICE--CAPS" role="macro">
-<title>GYPSY_SATELLITE_DBUS_SERVICE</title>
-<indexterm zone="GYPSY-SATELLITE-DBUS-SERVICE--CAPS"><primary sortas="GYPSY_SATELLITE_DBUS_SERVICE">GYPSY_SATELLITE_DBUS_SERVICE</primary></indexterm><programlisting>#define GYPSY_SATELLITE_DBUS_SERVICE "org.freedesktop.Gypsy"
-</programlisting>
-<para>
-A define containing the address of the Satellite service.</para>
-<para>
-</para></refsect2>
-<refsect2 id="GypsySatelliteDetails" role="struct">
-<title>GypsySatelliteDetails</title>
-<indexterm zone="GypsySatelliteDetails"><primary sortas="GypsySatelliteDetails">GypsySatelliteDetails</primary></indexterm><programlisting>typedef struct {
-	int satellite_id;
-	gboolean in_use;
-	guint elevation;
-	guint azimuth;
-	guint snr;
-} GypsySatelliteDetails;
-</programlisting>
-<para>
-A structure defining a satellite</para>
-<para>
-</para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="int">int</link>&#160;<structfield>satellite_id</structfield>;</term>
-<listitem><simpara> The satellite PRN id
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="gboolean">gboolean</link>&#160;<structfield>in_use</structfield>;</term>
-<listitem><simpara> Whether this satellite was used in calculating the fix
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="guint">guint</link>&#160;<structfield>elevation</structfield>;</term>
-<listitem><simpara> The satellite elevation
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="guint">guint</link>&#160;<structfield>azimuth</structfield>;</term>
-<listitem><simpara> The satellite azimuth
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="guint">guint</link>&#160;<structfield>snr</structfield>;</term>
-<listitem><simpara> The signal to noise ratio
-</simpara></listitem>
-</varlistentry>
-</variablelist></refsect2>
-<refsect2 id="gypsy-satellite-new" role="function">
-<title>gypsy_satellite_new ()</title>
-<indexterm zone="gypsy-satellite-new"><primary sortas="gypsy_satellite_new">gypsy_satellite_new</primary></indexterm><programlisting><link linkend="GypsySatellite">GypsySatellite</link> *    gypsy_satellite_new                 (const <link linkend="char">char</link> *object_path);</programlisting>
-<para>
-Creates a new <link linkend="GypsySatellite"><type>GypsySatellite</type></link> object that listens for satellite changes
-from the GPS found at <parameter>object_path</parameter>.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>object_path</parameter>&#160;:</term>
-<listitem><simpara> Object path to the GPS device
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A <link linkend="GypsySatellite"><type>GypsySatellite</type></link> object
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="gypsy-satellite-get-satellites" role="function">
-<title>gypsy_satellite_get_satellites ()</title>
-<indexterm zone="gypsy-satellite-get-satellites"><primary sortas="gypsy_satellite_get_satellites">gypsy_satellite_get_satellites</primary></indexterm><programlisting><link linkend="GPtrArray">GPtrArray</link> *         gypsy_satellite_get_satellites      (<link linkend="GypsySatellite">GypsySatellite</link> *satellite,
-                                                         <link linkend="GError">GError</link> **error);</programlisting>
-<para>
-Retrieves the <link linkend="GypsySatelliteDetails"><type>GypsySatelliteDetails</type></link> about the satellites that the 
-GPS is able to see.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>satellite</parameter>&#160;:</term>
-<listitem><simpara> A <link linkend="GypsySatellite"><type>GypsySatellite</type></link>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>error</parameter>&#160;:</term>
-<listitem><simpara> A <link linkend="GError"><type>GError</type></link> for error return
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A <link linkend="GPtrArray"><type>GPtrArray</type></link> of <link linkend="GypsySatelliteDetails"><type>GypsySatelliteDetails</type></link> or <link linkend="NULL--CAPS"><type>NULL</type></link> on error. 
-Should be freed using <link linkend="gypsy-satellite-free-satellite-array"><function>gypsy_satellite_free_satellite_array()</function></link>.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="gypsy-satellite-free-satellite-array" role="function">
-<title>gypsy_satellite_free_satellite_array ()</title>
-<indexterm zone="gypsy-satellite-free-satellite-array"><primary sortas="gypsy_satellite_free_satellite_array">gypsy_satellite_free_satellite_array</primary></indexterm><programlisting><link linkend="void">void</link>                gypsy_satellite_free_satellite_array
-                                                        (<link linkend="GPtrArray">GPtrArray</link> *satellites);</programlisting>
-<para>
-Frees all resources used in the array.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>satellites</parameter>&#160;:</term>
-<listitem><simpara> <link linkend="GPtrArray"><type>GPtrArray</type></link> containing <link linkend="GypsySatelliteDetails"><type>GypsySatelliteDetails</type></link>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-<refsect1 id="GypsySatellite.property-details" role="property_details">
-<title role="property_details.title">Property Details</title>
-<refsect2 id="GypsySatellite--object-path" role="property"><title>The <literal>&quot;object-path&quot;</literal> property</title>
-<indexterm zone="GypsySatellite--object-path"><primary sortas="GypsySatellite:object-path">GypsySatellite:object-path</primary></indexterm><programlisting>  &quot;object-path&quot;              <link linkend="gchar">gchar</link>*                : Write / Construct Only</programlisting>
-<para>The DBus path to the object.</para><para>Default value: ""</para>
-</refsect2>
-</refsect1>
-
-<refsect1 id="GypsySatellite.signal-details" role="signals">
-<title role="signals.title">Signal Details</title>
-<refsect2 id="GypsySatellite-satellites-changed" role="signal"><title>The <literal>&quot;satellites-changed&quot;</literal> signal</title>
-<indexterm zone="GypsySatellite-satellites-changed"><primary sortas="GypsySatellite::satellites-changed">GypsySatellite::satellites-changed</primary></indexterm><programlisting><link linkend="void">void</link>                user_function                      (<link linkend="GypsySatellite">GypsySatellite</link> *satellites,
-                                                        <link linkend="gpointer">gpointer</link>        arg1,
-                                                        <link linkend="gpointer">gpointer</link>        user_data)       : Run Last</programlisting>
-<para>
-The ::satellites-changed signal is emitted every time the GPS
-reports a change in the satellite data.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>satellites</parameter>&#160;:</term>
-<listitem><simpara> A <link linkend="GPtrArray"><type>GPtrArray</type></link> containing <link linkend="GypsySatelliteDetails"><type>GypsySatelliteDetails</type></link>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>user_data</parameter>&#160;:</term>
-<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-</refsect1>
-
-
-
-</refentry>
diff --git a/docs/reference/xml/gypsy-time.xml b/docs/reference/xml/gypsy-time.xml
deleted file mode 100644
index 11d7715..0000000
--- a/docs/reference/xml/gypsy-time.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-
-<refentry id="gypsy-GypsyTime">
-<refmeta>
-<refentrytitle role="top_of_page" id="gypsy-GypsyTime.top_of_page">GypsyTime</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>GYPSY Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>GypsyTime</refname>
-<refpurpose>Object for obtaining GPS time from gypsy-daemon</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv id="gypsy-GypsyTime.synopsis" role="synopsis">
-<title role="synopsis.title">Synopsis</title>
-
-<synopsis>
-                    <link linkend="GypsyTime">GypsyTime</link>;
-#define             <link linkend="GYPSY-TIME-DBUS-SERVICE--CAPS">GYPSY_TIME_DBUS_SERVICE</link>
-#define             <link linkend="GYPSY-TIME-DBUS-INTERFACE--CAPS">GYPSY_TIME_DBUS_INTERFACE</link>
-<link linkend="GypsyTime">GypsyTime</link> *         <link linkend="gypsy-time-new">gypsy_time_new</link>                      (const <link linkend="char">char</link> *object_path);
-<link linkend="gboolean">gboolean</link>            <link linkend="gypsy-time-get-time">gypsy_time_get_time</link>                 (<link linkend="GypsyTime">GypsyTime</link> *gps_time,
-                                                         <link linkend="int">int</link> *timestamp,
-                                                         <link linkend="GError">GError</link> **error);
-</synopsis>
-</refsynopsisdiv>
-
-
-
-
-
-
-
-
-
-<refsect1 id="gypsy-GypsyTime.description" role="desc">
-<title role="desc.title">Description</title>
-<para>
-<link linkend="GypsyTime"><type>GypsyTime</type></link> is used whenever the client program wishes to know about
-GPS time changes. It can report the current GPS time, and has a signal
-to notify listeners of changes.
-</para>
-<para>
-A <link linkend="GypsyTime"><type>GypsyTime</type></link> object is created with <link linkend="gypsy-time-new"><function>gypsy_time_new()</function></link> using the 
-D-Bus path of the GPS device. This path is returned from the 
-<link linkend="gypsy-control-create"><function>gypsy_control_create()</function></link> function. The client can then find out about the
-GPS time with <link linkend="gypsy-time-get-time"><function>gypsy_time_get_time()</function></link>.
-</para>
-<para>
-As the GPS time information changes <link linkend="GypsyTime"><type>GypsyTime</type></link> will emit the 
-time-changed signal. This signal contains the GPS time of the most recent
-GPS update that it received.
-</para>
-<para>
-<informalexample>
-<programlisting>
-GypsyTime *gps_time;
-GError *error = NULL;
-
-. . .
-
-/<!-- -->* path comes from the gypsy_control_create() function *<!-- -->/
-gps_time = gypsy_time_new (path);
-g_signal_connect (gps_time, "time-changed", G_CALLBACK (time_changed), NULL);
-
-. . .
-
-static void position_changed (GypsyTime *gps_time, 
-int timestamp,
-gpointer userdata)
-{
-&nbsp;&nbsp;g_print ("timestamp: %d\n", timestamp);
-}
-</programlisting>
-</informalexample></para>
-<para>
-</para>
-</refsect1>
-
-<refsect1 id="gypsy-GypsyTime.details" role="details">
-<title role="details.title">Details</title>
-<refsect2 id="GypsyTime" role="struct">
-<title>GypsyTime</title>
-<indexterm zone="GypsyTime"><primary sortas="GypsyTime">GypsyTime</primary></indexterm><programlisting>typedef struct {
-	GObject parent_object;
-} GypsyTime;
-</programlisting>
-<para>
-There are no public fields in <link linkend="GypsyTime"><type>GypsyTime</type></link>.</para>
-<para>
-</para></refsect2>
-<refsect2 id="GYPSY-TIME-DBUS-SERVICE--CAPS" role="macro">
-<title>GYPSY_TIME_DBUS_SERVICE</title>
-<indexterm zone="GYPSY-TIME-DBUS-SERVICE--CAPS"><primary sortas="GYPSY_TIME_DBUS_SERVICE">GYPSY_TIME_DBUS_SERVICE</primary></indexterm><programlisting>#define GYPSY_TIME_DBUS_SERVICE "org.freedesktop.Gypsy"
-</programlisting>
-<para>
-A define containing the address of the Time service</para>
-<para>
-</para></refsect2>
-<refsect2 id="GYPSY-TIME-DBUS-INTERFACE--CAPS" role="macro">
-<title>GYPSY_TIME_DBUS_INTERFACE</title>
-<indexterm zone="GYPSY-TIME-DBUS-INTERFACE--CAPS"><primary sortas="GYPSY_TIME_DBUS_INTERFACE">GYPSY_TIME_DBUS_INTERFACE</primary></indexterm><programlisting>#define GYPSY_TIME_DBUS_INTERFACE "org.freedesktop.Gypsy.Time"
-</programlisting>
-<para>
-A define containing the name of the Time interface</para>
-<para>
-</para></refsect2>
-<refsect2 id="gypsy-time-new" role="function">
-<title>gypsy_time_new ()</title>
-<indexterm zone="gypsy-time-new"><primary sortas="gypsy_time_new">gypsy_time_new</primary></indexterm><programlisting><link linkend="GypsyTime">GypsyTime</link> *         gypsy_time_new                      (const <link linkend="char">char</link> *object_path);</programlisting>
-<para>
-Creates a new <link linkend="GypsyTime"><type>GypsyTime</type></link> object that listens for time changes
-from the GPS found at <parameter>object_path</parameter>.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>object_path</parameter>&#160;:</term>
-<listitem><simpara> Object path to the GPS device
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A <link linkend="GypsyTime"><type>GypsyTime</type></link> object
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="gypsy-time-get-time" role="function">
-<title>gypsy_time_get_time ()</title>
-<indexterm zone="gypsy-time-get-time"><primary sortas="gypsy_time_get_time">gypsy_time_get_time</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            gypsy_time_get_time                 (<link linkend="GypsyTime">GypsyTime</link> *gps_time,
-                                                         <link linkend="int">int</link> *timestamp,
-                                                         <link linkend="GError">GError</link> **error);</programlisting>
-<para>
-Obtains the current time, if known, from the GPS device.</para>
-<para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>gps_time</parameter>&#160;:</term>
-<listitem><simpara> A <link linkend="GypsyTime"><type>GypsyTime</type></link>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>timestamp</parameter>&#160;:</term>
-<listitem><simpara> Pointer to store the timestamp
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>error</parameter>&#160;:</term>
-<listitem><simpara> Pointer to store a <link linkend="GError"><type>GError</type></link>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> TRUE on success, FALSE on error.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-
-
-
-
-</refentry>
diff --git a/docs/tools/Makefile.in b/docs/tools/Makefile.in
index ab20f27..277af13 100644
--- a/docs/tools/Makefile.in
+++ b/docs/tools/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -41,11 +43,19 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -72,8 +82,12 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GPSBT_CFLAGS = @GPSBT_CFLAGS@
+GPSBT_LIBS = @GPSBT_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
 GYPSY_CFLAGS = @GYPSY_CFLAGS@
 GYPSY_LIBS = @GYPSY_LIBS@
 HTML_DIR = @HTML_DIR@
@@ -108,6 +122,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -180,9 +196,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  docs/tools/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  docs/tools/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docs/tools/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign docs/tools/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -200,6 +216,7 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -229,13 +246,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -263,6 +284,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -281,6 +303,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -289,18 +313,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -334,6 +368,7 @@ uninstall-am:
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
+
 # 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.
 .NOEXPORT:
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 46149e6..53615da 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -44,44 +46,64 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
 am_simple_gps_dbus_OBJECTS =  \
 	simple_gps_dbus-simple-gps-dbus.$(OBJEXT)
 simple_gps_dbus_OBJECTS = $(am_simple_gps_dbus_OBJECTS)
 am__DEPENDENCIES_1 =
 simple_gps_dbus_DEPENDENCIES = $(am__DEPENDENCIES_1)
-simple_gps_dbus_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(simple_gps_dbus_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+simple_gps_dbus_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(simple_gps_dbus_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
 am_simple_gps_gypsy_OBJECTS =  \
 	simple_gps_gypsy-simple-gps-gypsy.$(OBJEXT)
 simple_gps_gypsy_OBJECTS = $(am_simple_gps_gypsy_OBJECTS)
 simple_gps_gypsy_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(top_builddir)/gypsy/libgypsy.la
-simple_gps_gypsy_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(simple_gps_gypsy_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+simple_gps_gypsy_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(simple_gps_gypsy_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
 am_simple_gps_satellites_OBJECTS =  \
 	simple_gps_satellites-simple-gps-satellites.$(OBJEXT)
 simple_gps_satellites_OBJECTS = $(am_simple_gps_satellites_OBJECTS)
 simple_gps_satellites_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(top_builddir)/gypsy/libgypsy.la
-simple_gps_satellites_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
+simple_gps_satellites_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(simple_gps_satellites_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(simple_gps_dbus_SOURCES) $(simple_gps_gypsy_SOURCES) \
 	$(simple_gps_satellites_SOURCES)
 DIST_SOURCES = $(simple_gps_dbus_SOURCES) $(simple_gps_gypsy_SOURCES) \
@@ -91,6 +113,7 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -117,8 +140,12 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GPSBT_CFLAGS = @GPSBT_CFLAGS@
+GPSBT_LIBS = @GPSBT_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
 GYPSY_CFLAGS = @GYPSY_CFLAGS@
 GYPSY_LIBS = @GYPSY_LIBS@
 HTML_DIR = @HTML_DIR@
@@ -153,6 +180,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -238,9 +267,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  examples/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  examples/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign examples/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -258,22 +287,25 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 simple-gps-dbus$(EXEEXT): $(simple_gps_dbus_OBJECTS) $(simple_gps_dbus_DEPENDENCIES) 
 	@rm -f simple-gps-dbus$(EXEEXT)
-	$(simple_gps_dbus_LINK) $(simple_gps_dbus_OBJECTS) $(simple_gps_dbus_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(simple_gps_dbus_LINK) $(simple_gps_dbus_OBJECTS) $(simple_gps_dbus_LDADD) $(LIBS)
 simple-gps-gypsy$(EXEEXT): $(simple_gps_gypsy_OBJECTS) $(simple_gps_gypsy_DEPENDENCIES) 
 	@rm -f simple-gps-gypsy$(EXEEXT)
-	$(simple_gps_gypsy_LINK) $(simple_gps_gypsy_OBJECTS) $(simple_gps_gypsy_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(simple_gps_gypsy_LINK) $(simple_gps_gypsy_OBJECTS) $(simple_gps_gypsy_LDADD) $(LIBS)
 simple-gps-satellites$(EXEEXT): $(simple_gps_satellites_OBJECTS) $(simple_gps_satellites_DEPENDENCIES) 
 	@rm -f simple-gps-satellites$(EXEEXT)
-	$(simple_gps_satellites_LINK) $(simple_gps_satellites_OBJECTS) $(simple_gps_satellites_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(simple_gps_satellites_LINK) $(simple_gps_satellites_OBJECTS) $(simple_gps_satellites_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -286,64 +318,73 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_gps_satellites-simple-gps-satellites.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 simple_gps_dbus-simple-gps-dbus.o: simple-gps-dbus.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_gps_dbus_CFLAGS) $(CFLAGS) -MT simple_gps_dbus-simple-gps-dbus.o -MD -MP -MF $(DEPDIR)/simple_gps_dbus-simple-gps-dbus.Tpo -c -o simple_gps_dbus-simple-gps-dbus.o `test -f 'simple-gps-dbus.c' || echo '$(srcdir)/'`simple-gps-dbus.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/simple_gps_dbus-simple-gps-dbus.Tpo $(DEPDIR)/simple_gps_dbus-simple-gps-dbus.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_gps_dbus_CFLAGS) $(CFLAGS) -MT simple_gps_dbus-simple-gps-dbus.o -MD -MP -MF $(DEPDIR)/simple_gps_dbus-simple-gps-dbus.Tpo -c -o simple_gps_dbus-simple-gps-dbus.o `test -f 'simple-gps-dbus.c' || echo '$(srcdir)/'`simple-gps-dbus.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_gps_dbus-simple-gps-dbus.Tpo $(DEPDIR)/simple_gps_dbus-simple-gps-dbus.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='simple-gps-dbus.c' object='simple_gps_dbus-simple-gps-dbus.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_gps_dbus_CFLAGS) $(CFLAGS) -c -o simple_gps_dbus-simple-gps-dbus.o `test -f 'simple-gps-dbus.c' || echo '$(srcdir)/'`simple-gps-dbus.c
 
 simple_gps_dbus-simple-gps-dbus.obj: simple-gps-dbus.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_gps_dbus_CFLAGS) $(CFLAGS) -MT simple_gps_dbus-simple-gps-dbus.obj -MD -MP -MF $(DEPDIR)/simple_gps_dbus-simple-gps-dbus.Tpo -c -o simple_gps_dbus-simple-gps-dbus.obj `if test -f 'simple-gps-dbus.c'; then $(CYGPATH_W) 'simple-gps-dbus.c'; else $(CYGPATH_W) '$(srcdir)/simple-gps-dbus.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/simple_gps_dbus-simple-gps-dbus.Tpo $(DEPDIR)/simple_gps_dbus-simple-gps-dbus.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_gps_dbus_CFLAGS) $(CFLAGS) -MT simple_gps_dbus-simple-gps-dbus.obj -MD -MP -MF $(DEPDIR)/simple_gps_dbus-simple-gps-dbus.Tpo -c -o simple_gps_dbus-simple-gps-dbus.obj `if test -f 'simple-gps-dbus.c'; then $(CYGPATH_W) 'simple-gps-dbus.c'; else $(CYGPATH_W) '$(srcdir)/simple-gps-dbus.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_gps_dbus-simple-gps-dbus.Tpo $(DEPDIR)/simple_gps_dbus-simple-gps-dbus.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='simple-gps-dbus.c' object='simple_gps_dbus-simple-gps-dbus.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_gps_dbus_CFLAGS) $(CFLAGS) -c -o simple_gps_dbus-simple-gps-dbus.obj `if test -f 'simple-gps-dbus.c'; then $(CYGPATH_W) 'simple-gps-dbus.c'; else $(CYGPATH_W) '$(srcdir)/simple-gps-dbus.c'; fi`
 
 simple_gps_gypsy-simple-gps-gypsy.o: simple-gps-gypsy.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_gps_gypsy_CFLAGS) $(CFLAGS) -MT simple_gps_gypsy-simple-gps-gypsy.o -MD -MP -MF $(DEPDIR)/simple_gps_gypsy-simple-gps-gypsy.Tpo -c -o simple_gps_gypsy-simple-gps-gypsy.o `test -f 'simple-gps-gypsy.c' || echo '$(srcdir)/'`simple-gps-gypsy.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/simple_gps_gypsy-simple-gps-gypsy.Tpo $(DEPDIR)/simple_gps_gypsy-simple-gps-gypsy.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_gps_gypsy_CFLAGS) $(CFLAGS) -MT simple_gps_gypsy-simple-gps-gypsy.o -MD -MP -MF $(DEPDIR)/simple_gps_gypsy-simple-gps-gypsy.Tpo -c -o simple_gps_gypsy-simple-gps-gypsy.o `test -f 'simple-gps-gypsy.c' || echo '$(srcdir)/'`simple-gps-gypsy.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_gps_gypsy-simple-gps-gypsy.Tpo $(DEPDIR)/simple_gps_gypsy-simple-gps-gypsy.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='simple-gps-gypsy.c' object='simple_gps_gypsy-simple-gps-gypsy.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_gps_gypsy_CFLAGS) $(CFLAGS) -c -o simple_gps_gypsy-simple-gps-gypsy.o `test -f 'simple-gps-gypsy.c' || echo '$(srcdir)/'`simple-gps-gypsy.c
 
 simple_gps_gypsy-simple-gps-gypsy.obj: simple-gps-gypsy.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_gps_gypsy_CFLAGS) $(CFLAGS) -MT simple_gps_gypsy-simple-gps-gypsy.obj -MD -MP -MF $(DEPDIR)/simple_gps_gypsy-simple-gps-gypsy.Tpo -c -o simple_gps_gypsy-simple-gps-gypsy.obj `if test -f 'simple-gps-gypsy.c'; then $(CYGPATH_W) 'simple-gps-gypsy.c'; else $(CYGPATH_W) '$(srcdir)/simple-gps-gypsy.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/simple_gps_gypsy-simple-gps-gypsy.Tpo $(DEPDIR)/simple_gps_gypsy-simple-gps-gypsy.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_gps_gypsy_CFLAGS) $(CFLAGS) -MT simple_gps_gypsy-simple-gps-gypsy.obj -MD -MP -MF $(DEPDIR)/simple_gps_gypsy-simple-gps-gypsy.Tpo -c -o simple_gps_gypsy-simple-gps-gypsy.obj `if test -f 'simple-gps-gypsy.c'; then $(CYGPATH_W) 'simple-gps-gypsy.c'; else $(CYGPATH_W) '$(srcdir)/simple-gps-gypsy.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_gps_gypsy-simple-gps-gypsy.Tpo $(DEPDIR)/simple_gps_gypsy-simple-gps-gypsy.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='simple-gps-gypsy.c' object='simple_gps_gypsy-simple-gps-gypsy.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_gps_gypsy_CFLAGS) $(CFLAGS) -c -o simple_gps_gypsy-simple-gps-gypsy.obj `if test -f 'simple-gps-gypsy.c'; then $(CYGPATH_W) 'simple-gps-gypsy.c'; else $(CYGPATH_W) '$(srcdir)/simple-gps-gypsy.c'; fi`
 
 simple_gps_satellites-simple-gps-satellites.o: simple-gps-satellites.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_gps_satellites_CFLAGS) $(CFLAGS) -MT simple_gps_satellites-simple-gps-satellites.o -MD -MP -MF $(DEPDIR)/simple_gps_satellites-simple-gps-satellites.Tpo -c -o simple_gps_satellites-simple-gps-satellites.o `test -f 'simple-gps-satellites.c' || echo '$(srcdir)/'`simple-gps-satellites.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/simple_gps_satellites-simple-gps-satellites.Tpo $(DEPDIR)/simple_gps_satellites-simple-gps-satellites.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_gps_satellites_CFLAGS) $(CFLAGS) -MT simple_gps_satellites-simple-gps-satellites.o -MD -MP -MF $(DEPDIR)/simple_gps_satellites-simple-gps-satellites.Tpo -c -o simple_gps_satellites-simple-gps-satellites.o `test -f 'simple-gps-satellites.c' || echo '$(srcdir)/'`simple-gps-satellites.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_gps_satellites-simple-gps-satellites.Tpo $(DEPDIR)/simple_gps_satellites-simple-gps-satellites.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='simple-gps-satellites.c' object='simple_gps_satellites-simple-gps-satellites.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_gps_satellites_CFLAGS) $(CFLAGS) -c -o simple_gps_satellites-simple-gps-satellites.o `test -f 'simple-gps-satellites.c' || echo '$(srcdir)/'`simple-gps-satellites.c
 
 simple_gps_satellites-simple-gps-satellites.obj: simple-gps-satellites.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_gps_satellites_CFLAGS) $(CFLAGS) -MT simple_gps_satellites-simple-gps-satellites.obj -MD -MP -MF $(DEPDIR)/simple_gps_satellites-simple-gps-satellites.Tpo -c -o simple_gps_satellites-simple-gps-satellites.obj `if test -f 'simple-gps-satellites.c'; then $(CYGPATH_W) 'simple-gps-satellites.c'; else $(CYGPATH_W) '$(srcdir)/simple-gps-satellites.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/simple_gps_satellites-simple-gps-satellites.Tpo $(DEPDIR)/simple_gps_satellites-simple-gps-satellites.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_gps_satellites_CFLAGS) $(CFLAGS) -MT simple_gps_satellites-simple-gps-satellites.obj -MD -MP -MF $(DEPDIR)/simple_gps_satellites-simple-gps-satellites.Tpo -c -o simple_gps_satellites-simple-gps-satellites.obj `if test -f 'simple-gps-satellites.c'; then $(CYGPATH_W) 'simple-gps-satellites.c'; else $(CYGPATH_W) '$(srcdir)/simple-gps-satellites.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_gps_satellites-simple-gps-satellites.Tpo $(DEPDIR)/simple_gps_satellites-simple-gps-satellites.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='simple-gps-satellites.c' object='simple_gps_satellites-simple-gps-satellites.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_gps_satellites_CFLAGS) $(CFLAGS) -c -o simple_gps_satellites-simple-gps-satellites.obj `if test -f 'simple-gps-satellites.c'; then $(CYGPATH_W) 'simple-gps-satellites.c'; else $(CYGPATH_W) '$(srcdir)/simple-gps-satellites.c'; fi`
@@ -366,7 +407,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -374,29 +415,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -417,13 +463,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -451,6 +501,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -472,6 +523,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -480,18 +533,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -529,6 +592,7 @@ uninstall-am:
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # 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.
 .NOEXPORT:
diff --git a/gtk-doc.make b/gtk-doc.make
index 0f87cc7..57fab98 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -5,13 +5,13 @@
 ####################################
 
 if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 GTKDOC_RUN = $(LIBTOOL) --mode=execute
 else
 GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-GTKDOC_RUN = sh -c
+GTKDOC_RUN =
 endif
 
 # We set GPATH here; this gives us semantics for GNU make
@@ -31,7 +31,9 @@ EXTRA_DIST = 				\
 	$(DOC_MODULE)-overrides.txt
 
 DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+	pdf-build.stamp \
+	$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
+	$(srcdir)/pdf.stamp
 
 SCANOBJ_FILES = 		 \
 	$(DOC_MODULE).args 	 \
@@ -48,12 +50,23 @@ REPORT_FILES = \
 CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
 
 if ENABLE_GTK_DOC
-all-local: html-build.stamp
+if GTK_DOC_BUILD_HTML
+HTML_BUILD_STAMP=html-build.stamp
+else
+HTML_BUILD_STAMP=
+endif
+if GTK_DOC_BUILD_PDF
+PDF_BUILD_STAMP=pdf-build.stamp
+else
+PDF_BUILD_STAMP=
+endif
+
+all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 else
 all-local:
 endif
 
-docs: html-build.stamp
+docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 
 $(REPORT_FILES): sgml-build.stamp
 
@@ -62,9 +75,12 @@ $(REPORT_FILES): sgml-build.stamp
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	@echo 'gtk-doc: Scanning header files'
 	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	  done ; \
+	  cd $(srcdir) && \
+	  gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	@if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
 	else \
 	    cd $(srcdir) ; \
@@ -72,7 +88,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
                test -f $$i || touch $$i ; \
 	    done \
 	fi
-	touch scan-build.stamp
+	@touch scan-build.stamp
 
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
@@ -82,24 +98,26 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
 tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
 	@echo 'gtk-doc: Rebuilding template files'
 	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	touch tmpl-build.stamp
+	@cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	@touch tmpl-build.stamp
 
 tmpl.stamp: tmpl-build.stamp
 	@true
 
-tmpl/*.sgml:
+$(srcdir)/tmpl/*.sgml:
 	@true
 
-
 #### xml ####
 
-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
 	@echo 'gtk-doc: Building XML'
 	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
-	touch sgml-build.stamp
+	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	  done ; \
+	  cd $(srcdir) && \
+	  gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
+	@touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
 	@true
@@ -109,18 +127,37 @@ sgml.stamp: sgml-build.stamp
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	@echo 'gtk-doc: Building HTML'
 	@-chmod -R u+w $(srcdir)
-	rm -rf $(srcdir)/html
-	mkdir $(srcdir)/html
-	mkhtml_options=""; \
+	@rm -rf $(srcdir)/html
+	@mkdir $(srcdir)/html
+	@mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
 	if test "$(?)" = "0"; then \
 	  mkhtml_options=--path="$(srcdir)"; \
-	fi
-	cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	fi; \
+	cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
 	@echo 'gtk-doc: Fixing cross-references'
-	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	touch html-build.stamp
+	@cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	@touch html-build.stamp
+
+#### pdf ####
+
+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+	@echo 'gtk-doc: Building PDF'
+	@-chmod -R u+w $(srcdir)
+	@rm -rf $(srcdir)/$(DOC_MODULE).pdf
+	@mkpdf_imgdirs=""; \
+	if test "x$(HTML_IMAGES)" != "x"; then \
+	  for img in $(HTML_IMAGES); do \
+	    part=`dirname $$img`; \
+	    echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
+	    if test $$? != 0; then \
+	      mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
+	    fi; \
+	  done; \
+	fi; \
+	cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+	@touch pdf-build.stamp
 
 ##############
 
@@ -130,14 +167,14 @@ clean-local:
 
 distclean-local:
 	cd $(srcdir) && \
-	  rm -rf xml $(REPORT_FILES) \
+	  rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
 	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 
 maintainer-clean-local: clean
 	cd $(srcdir) && rm -rf xml html
 
 install-data-local:
-	installfiles=`echo $(srcdir)/html/*`; \
+	@installfiles=`echo $(srcdir)/html/*`; \
 	if test "$$installfiles" = '$(srcdir)/html/*'; \
 	then echo '-- Nothing to install' ; \
 	else \
@@ -157,12 +194,11 @@ install-data-local:
 	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
 	  fi; \
-	  ! which gtkdoc-rebase >/dev/null 2>&1 || \
-	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
+	  $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
 	fi
 
 uninstall-local:
-	if test -n "$(DOC_MODULE_VERSION)"; then \
+	@if test -n "$(DOC_MODULE_VERSION)"; then \
 	  installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
 	else \
 	  installdir="$(DESTDIR)$(TARGET_DIR)"; \
@@ -182,15 +218,13 @@ endif
 
 dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/xml
 	mkdir $(distdir)/html
 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/xml/*.xml $(distdir)/xml
 	cp $(srcdir)/html/* $(distdir)/html
+	-cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
 	cd $(distdir) && rm -f $(DISTCLEANFILES)
-	! which gtkdoc-rebase >/dev/null 2>&1 || \
-	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs
diff --git a/gypsy/Makefile.am b/gypsy/Makefile.am
index 9fa127f..4ce9083 100644
--- a/gypsy/Makefile.am
+++ b/gypsy/Makefile.am
@@ -41,17 +41,12 @@ libgypsy_include_HEADERS =	\
 EXTRA_DIST = gypsy-marshal.list
 CLEANFILES = $(BUILT_SOURCES)
 
-%-bindings.h: stamp-%-bindings.h
-	@true
-stamp-%-bindings.h: ../interfaces/%.xml
-	$(DBUS_BINDING_TOOL) --mode=glib-client --prefix=gypsy $< > xgen-$(@F) \
-	&& (cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%)) \
-	&& rm -f xgen-$(@F) \
-	&& echo timestamp > $(@F)
+%-bindings.h: ../interfaces/%.xml
+	$(AM_V_GEN)$(DBUS_BINDING_TOOL) --mode=glib-client --prefix=gypsy $< > $@
 
 gypsy-marshal.h: $(srcdir)/gypsy-marshal.list $(GLIB_GENMARSHAL)
-	$(GLIB_GENMARSHAL) $< --header --prefix=gypsy_marshal > $@
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=gypsy_marshal > $@
 gypsy-marshal.c: $(srcdir)/gypsy-marshal.list gypsy-marshal.h $(GLIB_GENMARSHAL)
-	echo "#include \"gypsy-marshal.h\"" > $@ \
+	$(AM_V_GEN)echo "#include \"gypsy-marshal.h\"" > $@ \
 	&& $(GLIB_GENMARSHAL) --prefix=gypsy_marshal $(srcdir)/gypsy-marshal.list --body >> $@
 
diff --git a/gypsy/Makefile.in b/gypsy/Makefile.in
index f9c4fad..e4f0a23 100644
--- a/gypsy/Makefile.in
+++ b/gypsy/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -17,8 +18,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -44,15 +46,30 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(libgypsy_includedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libgypsy_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -64,30 +81,47 @@ am_libgypsy_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
 	libgypsy_la-gypsy-position.lo libgypsy_la-gypsy-satellite.lo \
 	libgypsy_la-gypsy-time.lo
 libgypsy_la_OBJECTS = $(am_libgypsy_la_OBJECTS)
-libgypsy_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+libgypsy_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgypsy_la_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libgypsy_la_SOURCES)
 DIST_SOURCES = $(libgypsy_la_SOURCES)
-libgypsy_includeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(libgypsy_include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -114,8 +148,12 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GPSBT_CFLAGS = @GPSBT_CFLAGS@
+GPSBT_LIBS = @GPSBT_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
 GYPSY_CFLAGS = @GYPSY_CFLAGS@
 GYPSY_LIBS = @GYPSY_LIBS@
 HTML_DIR = @HTML_DIR@
@@ -150,6 +188,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -264,9 +304,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  gypsy/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  gypsy/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign gypsy/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign gypsy/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -284,23 +324,28 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
 	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    list2="$$list2 $$p"; \
 	  else :; fi; \
-	done
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -312,7 +357,7 @@ clean-libLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 libgypsy.la: $(libgypsy_la_OBJECTS) $(libgypsy_la_DEPENDENCIES) 
-	$(libgypsy_la_LINK) -rpath $(libdir) $(libgypsy_la_OBJECTS) $(libgypsy_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libgypsy_la_LINK) -rpath $(libdir) $(libgypsy_la_OBJECTS) $(libgypsy_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -330,81 +375,92 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgypsy_la-gypsy-time.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 libgypsy_la-gypsy-marshal.lo: gypsy-marshal.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -MT libgypsy_la-gypsy-marshal.lo -MD -MP -MF $(DEPDIR)/libgypsy_la-gypsy-marshal.Tpo -c -o libgypsy_la-gypsy-marshal.lo `test -f 'gypsy-marshal.c' || echo '$(srcdir)/'`gypsy-marshal.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgypsy_la-gypsy-marshal.Tpo $(DEPDIR)/libgypsy_la-gypsy-marshal.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -MT libgypsy_la-gypsy-marshal.lo -MD -MP -MF $(DEPDIR)/libgypsy_la-gypsy-marshal.Tpo -c -o libgypsy_la-gypsy-marshal.lo `test -f 'gypsy-marshal.c' || echo '$(srcdir)/'`gypsy-marshal.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgypsy_la-gypsy-marshal.Tpo $(DEPDIR)/libgypsy_la-gypsy-marshal.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gypsy-marshal.c' object='libgypsy_la-gypsy-marshal.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -c -o libgypsy_la-gypsy-marshal.lo `test -f 'gypsy-marshal.c' || echo '$(srcdir)/'`gypsy-marshal.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -c -o libgypsy_la-gypsy-marshal.lo `test -f 'gypsy-marshal.c' || echo '$(srcdir)/'`gypsy-marshal.c
 
 libgypsy_la-gypsy-accuracy.lo: gypsy-accuracy.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -MT libgypsy_la-gypsy-accuracy.lo -MD -MP -MF $(DEPDIR)/libgypsy_la-gypsy-accuracy.Tpo -c -o libgypsy_la-gypsy-accuracy.lo `test -f 'gypsy-accuracy.c' || echo '$(srcdir)/'`gypsy-accuracy.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgypsy_la-gypsy-accuracy.Tpo $(DEPDIR)/libgypsy_la-gypsy-accuracy.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -MT libgypsy_la-gypsy-accuracy.lo -MD -MP -MF $(DEPDIR)/libgypsy_la-gypsy-accuracy.Tpo -c -o libgypsy_la-gypsy-accuracy.lo `test -f 'gypsy-accuracy.c' || echo '$(srcdir)/'`gypsy-accuracy.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgypsy_la-gypsy-accuracy.Tpo $(DEPDIR)/libgypsy_la-gypsy-accuracy.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gypsy-accuracy.c' object='libgypsy_la-gypsy-accuracy.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -c -o libgypsy_la-gypsy-accuracy.lo `test -f 'gypsy-accuracy.c' || echo '$(srcdir)/'`gypsy-accuracy.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -c -o libgypsy_la-gypsy-accuracy.lo `test -f 'gypsy-accuracy.c' || echo '$(srcdir)/'`gypsy-accuracy.c
 
 libgypsy_la-gypsy-control.lo: gypsy-control.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -MT libgypsy_la-gypsy-control.lo -MD -MP -MF $(DEPDIR)/libgypsy_la-gypsy-control.Tpo -c -o libgypsy_la-gypsy-control.lo `test -f 'gypsy-control.c' || echo '$(srcdir)/'`gypsy-control.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgypsy_la-gypsy-control.Tpo $(DEPDIR)/libgypsy_la-gypsy-control.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -MT libgypsy_la-gypsy-control.lo -MD -MP -MF $(DEPDIR)/libgypsy_la-gypsy-control.Tpo -c -o libgypsy_la-gypsy-control.lo `test -f 'gypsy-control.c' || echo '$(srcdir)/'`gypsy-control.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgypsy_la-gypsy-control.Tpo $(DEPDIR)/libgypsy_la-gypsy-control.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gypsy-control.c' object='libgypsy_la-gypsy-control.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -c -o libgypsy_la-gypsy-control.lo `test -f 'gypsy-control.c' || echo '$(srcdir)/'`gypsy-control.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -c -o libgypsy_la-gypsy-control.lo `test -f 'gypsy-control.c' || echo '$(srcdir)/'`gypsy-control.c
 
 libgypsy_la-gypsy-course.lo: gypsy-course.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -MT libgypsy_la-gypsy-course.lo -MD -MP -MF $(DEPDIR)/libgypsy_la-gypsy-course.Tpo -c -o libgypsy_la-gypsy-course.lo `test -f 'gypsy-course.c' || echo '$(srcdir)/'`gypsy-course.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgypsy_la-gypsy-course.Tpo $(DEPDIR)/libgypsy_la-gypsy-course.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -MT libgypsy_la-gypsy-course.lo -MD -MP -MF $(DEPDIR)/libgypsy_la-gypsy-course.Tpo -c -o libgypsy_la-gypsy-course.lo `test -f 'gypsy-course.c' || echo '$(srcdir)/'`gypsy-course.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgypsy_la-gypsy-course.Tpo $(DEPDIR)/libgypsy_la-gypsy-course.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gypsy-course.c' object='libgypsy_la-gypsy-course.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -c -o libgypsy_la-gypsy-course.lo `test -f 'gypsy-course.c' || echo '$(srcdir)/'`gypsy-course.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -c -o libgypsy_la-gypsy-course.lo `test -f 'gypsy-course.c' || echo '$(srcdir)/'`gypsy-course.c
 
 libgypsy_la-gypsy-device.lo: gypsy-device.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -MT libgypsy_la-gypsy-device.lo -MD -MP -MF $(DEPDIR)/libgypsy_la-gypsy-device.Tpo -c -o libgypsy_la-gypsy-device.lo `test -f 'gypsy-device.c' || echo '$(srcdir)/'`gypsy-device.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgypsy_la-gypsy-device.Tpo $(DEPDIR)/libgypsy_la-gypsy-device.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -MT libgypsy_la-gypsy-device.lo -MD -MP -MF $(DEPDIR)/libgypsy_la-gypsy-device.Tpo -c -o libgypsy_la-gypsy-device.lo `test -f 'gypsy-device.c' || echo '$(srcdir)/'`gypsy-device.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgypsy_la-gypsy-device.Tpo $(DEPDIR)/libgypsy_la-gypsy-device.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gypsy-device.c' object='libgypsy_la-gypsy-device.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -c -o libgypsy_la-gypsy-device.lo `test -f 'gypsy-device.c' || echo '$(srcdir)/'`gypsy-device.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -c -o libgypsy_la-gypsy-device.lo `test -f 'gypsy-device.c' || echo '$(srcdir)/'`gypsy-device.c
 
 libgypsy_la-gypsy-position.lo: gypsy-position.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -MT libgypsy_la-gypsy-position.lo -MD -MP -MF $(DEPDIR)/libgypsy_la-gypsy-position.Tpo -c -o libgypsy_la-gypsy-position.lo `test -f 'gypsy-position.c' || echo '$(srcdir)/'`gypsy-position.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgypsy_la-gypsy-position.Tpo $(DEPDIR)/libgypsy_la-gypsy-position.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -MT libgypsy_la-gypsy-position.lo -MD -MP -MF $(DEPDIR)/libgypsy_la-gypsy-position.Tpo -c -o libgypsy_la-gypsy-position.lo `test -f 'gypsy-position.c' || echo '$(srcdir)/'`gypsy-position.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgypsy_la-gypsy-position.Tpo $(DEPDIR)/libgypsy_la-gypsy-position.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gypsy-position.c' object='libgypsy_la-gypsy-position.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -c -o libgypsy_la-gypsy-position.lo `test -f 'gypsy-position.c' || echo '$(srcdir)/'`gypsy-position.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -c -o libgypsy_la-gypsy-position.lo `test -f 'gypsy-position.c' || echo '$(srcdir)/'`gypsy-position.c
 
 libgypsy_la-gypsy-satellite.lo: gypsy-satellite.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -MT libgypsy_la-gypsy-satellite.lo -MD -MP -MF $(DEPDIR)/libgypsy_la-gypsy-satellite.Tpo -c -o libgypsy_la-gypsy-satellite.lo `test -f 'gypsy-satellite.c' || echo '$(srcdir)/'`gypsy-satellite.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgypsy_la-gypsy-satellite.Tpo $(DEPDIR)/libgypsy_la-gypsy-satellite.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -MT libgypsy_la-gypsy-satellite.lo -MD -MP -MF $(DEPDIR)/libgypsy_la-gypsy-satellite.Tpo -c -o libgypsy_la-gypsy-satellite.lo `test -f 'gypsy-satellite.c' || echo '$(srcdir)/'`gypsy-satellite.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgypsy_la-gypsy-satellite.Tpo $(DEPDIR)/libgypsy_la-gypsy-satellite.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gypsy-satellite.c' object='libgypsy_la-gypsy-satellite.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -c -o libgypsy_la-gypsy-satellite.lo `test -f 'gypsy-satellite.c' || echo '$(srcdir)/'`gypsy-satellite.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -c -o libgypsy_la-gypsy-satellite.lo `test -f 'gypsy-satellite.c' || echo '$(srcdir)/'`gypsy-satellite.c
 
 libgypsy_la-gypsy-time.lo: gypsy-time.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -MT libgypsy_la-gypsy-time.lo -MD -MP -MF $(DEPDIR)/libgypsy_la-gypsy-time.Tpo -c -o libgypsy_la-gypsy-time.lo `test -f 'gypsy-time.c' || echo '$(srcdir)/'`gypsy-time.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libgypsy_la-gypsy-time.Tpo $(DEPDIR)/libgypsy_la-gypsy-time.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -MT libgypsy_la-gypsy-time.lo -MD -MP -MF $(DEPDIR)/libgypsy_la-gypsy-time.Tpo -c -o libgypsy_la-gypsy-time.lo `test -f 'gypsy-time.c' || echo '$(srcdir)/'`gypsy-time.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgypsy_la-gypsy-time.Tpo $(DEPDIR)/libgypsy_la-gypsy-time.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gypsy-time.c' object='libgypsy_la-gypsy-time.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -c -o libgypsy_la-gypsy-time.lo `test -f 'gypsy-time.c' || echo '$(srcdir)/'`gypsy-time.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgypsy_la_CFLAGS) $(CFLAGS) -c -o libgypsy_la-gypsy-time.lo `test -f 'gypsy-time.c' || echo '$(srcdir)/'`gypsy-time.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -414,20 +470,23 @@ clean-libtool:
 install-libgypsy_includeHEADERS: $(libgypsy_include_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libgypsy_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libgypsy_includedir)"
-	@list='$(libgypsy_include_HEADERS)'; for p in $$list; do \
+	@list='$(libgypsy_include_HEADERS)'; test -n "$(libgypsy_includedir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(libgypsy_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgypsy_includedir)/$$f'"; \
-	  $(libgypsy_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgypsy_includedir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgypsy_includedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgypsy_includedir)" || exit $$?; \
 	done
 
 uninstall-libgypsy_includeHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libgypsy_include_HEADERS)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(libgypsy_includedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libgypsy_includedir)/$$f"; \
-	done
+	@list='$(libgypsy_include_HEADERS)'; test -n "$(libgypsy_includedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libgypsy_includedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libgypsy_includedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -441,7 +500,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -449,29 +508,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -492,13 +556,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -532,6 +600,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -554,6 +623,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -562,18 +633,28 @@ install-data-am: install-libgypsy_includeHEADERS
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libLTLIBRARIES
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -597,7 +678,7 @@ ps-am:
 uninstall-am: uninstall-libLTLIBRARIES \
 	uninstall-libgypsy_includeHEADERS
 
-.MAKE: install-am install-strip
+.MAKE: all check install install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
@@ -616,19 +697,15 @@ uninstall-am: uninstall-libLTLIBRARIES \
 	uninstall-libgypsy_includeHEADERS
 
 
-%-bindings.h: stamp-%-bindings.h
-	@true
-stamp-%-bindings.h: ../interfaces/%.xml
-	$(DBUS_BINDING_TOOL) --mode=glib-client --prefix=gypsy $< > xgen-$(@F) \
-	&& (cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%)) \
-	&& rm -f xgen-$(@F) \
-	&& echo timestamp > $(@F)
+%-bindings.h: ../interfaces/%.xml
+	$(AM_V_GEN)$(DBUS_BINDING_TOOL) --mode=glib-client --prefix=gypsy $< > $@
 
 gypsy-marshal.h: $(srcdir)/gypsy-marshal.list $(GLIB_GENMARSHAL)
-	$(GLIB_GENMARSHAL) $< --header --prefix=gypsy_marshal > $@
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=gypsy_marshal > $@
 gypsy-marshal.c: $(srcdir)/gypsy-marshal.list gypsy-marshal.h $(GLIB_GENMARSHAL)
-	echo "#include \"gypsy-marshal.h\"" > $@ \
+	$(AM_V_GEN)echo "#include \"gypsy-marshal.h\"" > $@ \
 	&& $(GLIB_GENMARSHAL) --prefix=gypsy_marshal $(srcdir)/gypsy-marshal.list --body >> $@
+
 # 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.
 .NOEXPORT:
diff --git a/gypsy/gypsy-client-bindings.h b/gypsy/gypsy-client-bindings.h
index bf6a8da..55393b8 100644
--- a/gypsy/gypsy-client-bindings.h
+++ b/gypsy/gypsy-client-bindings.h
@@ -119,6 +119,43 @@ static
 inline
 #endif
 gboolean
+org_freedesktop_Gypsy_Device_set_start_options (DBusGProxy *proxy, const GHashTable* IN_options, GError **error)
+
+{
+  return dbus_g_proxy_call (proxy, "SetStartOptions", error, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), IN_options, G_TYPE_INVALID, G_TYPE_INVALID);
+}
+
+typedef void (*org_freedesktop_Gypsy_Device_set_start_options_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
+
+static void
+org_freedesktop_Gypsy_Device_set_start_options_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+{
+  DBusGAsyncData *data = (DBusGAsyncData*) user_data;
+  GError *error = NULL;
+  dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
+  (*(org_freedesktop_Gypsy_Device_set_start_options_reply)data->cb) (proxy, error, data->userdata);
+  return;
+}
+
+static
+#ifdef G_HAVE_INLINE
+inline
+#endif
+DBusGProxyCall*
+org_freedesktop_Gypsy_Device_set_start_options_async (DBusGProxy *proxy, const GHashTable* IN_options, org_freedesktop_Gypsy_Device_set_start_options_reply callback, gpointer userdata)
+
+{
+  DBusGAsyncData *stuff;
+  stuff = g_slice_new (DBusGAsyncData);
+  stuff->cb = G_CALLBACK (callback);
+  stuff->userdata = userdata;
+  return dbus_g_proxy_begin_call (proxy, "SetStartOptions", org_freedesktop_Gypsy_Device_set_start_options_async_callback, stuff, _dbus_glib_async_data_free, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), IN_options, G_TYPE_INVALID);
+}
+static
+#ifdef G_HAVE_INLINE
+inline
+#endif
+gboolean
 org_freedesktop_Gypsy_Device_start (DBusGProxy *proxy, GError **error)
 
 {
diff --git a/gypsy/gypsy-device.c b/gypsy/gypsy-device.c
index a6f18f9..ba9b51d 100644
--- a/gypsy/gypsy-device.c
+++ b/gypsy/gypsy-device.c
@@ -335,6 +335,35 @@ gypsy_device_new (const char *object_path)
 }
 
 /**
+ * gypsy_device_set_start_options:
+ * @device: #GypsyDevice
+ * @options: a #GHashTable of string keys and #GValue values
+ * @error: A pointer to a #GError to return the error in
+ *
+ * Sets options on the device before calling #gypsy_device_start.
+ * The only valid option currently is "BaudRate", used for serial devices.
+ *
+ * Return value: #TRUE on success, #FALSE otherwise.
+ */
+gboolean
+gypsy_device_set_start_options (GypsyDevice *device,
+				GHashTable  *options,
+				GError     **error)
+{
+	GypsyDevicePrivate *priv;
+
+	g_return_val_if_fail (GYPSY_IS_DEVICE (device), FALSE);
+
+	priv = GET_PRIVATE (device);
+
+	if (!org_freedesktop_Gypsy_Device_set_start_options (priv->proxy, options, error)) {
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+/**
  * gypsy_device_start:
  * @device: A #GypsyDevice
  * @error: A pointer to a #GError to return the error in
diff --git a/gypsy/gypsy-device.h b/gypsy/gypsy-device.h
index 6907ae8..a632e06 100644
--- a/gypsy/gypsy-device.h
+++ b/gypsy/gypsy-device.h
@@ -86,6 +86,9 @@ GType gypsy_device_get_type (void);
 
 GypsyDevice *gypsy_device_new (const char *object_path);
 
+gboolean gypsy_device_set_start_options (GypsyDevice *device,
+					 GHashTable  *options,
+					 GError     **error);
 gboolean gypsy_device_start (GypsyDevice *device,
 			    GError     **error);
 gboolean gypsy_device_stop (GypsyDevice *device,
diff --git a/interfaces/Makefile.am b/interfaces/Makefile.am
index 36fa17e..9d916f9 100644
--- a/interfaces/Makefile.am
+++ b/interfaces/Makefile.am
@@ -1,5 +1,5 @@
 %.xml: %-full.xml
-	$(XSLT) -o $@ $(top_srcdir)/docs/tools/spec-strip-docs.xsl $<
+	$(AM_V_GEN)$(XSLT) -o $@ $(top_srcdir)/docs/tools/spec-strip-docs.xsl $<
 
 noinst_DATA = gypsy-server.xml gypsy-client.xml
 
diff --git a/interfaces/Makefile.in b/interfaces/Makefile.in
index e934f57..37d9f22 100644
--- a/interfaces/Makefile.in
+++ b/interfaces/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,12 +44,20 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 DATA = $(noinst_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -74,8 +84,12 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GPSBT_CFLAGS = @GPSBT_CFLAGS@
+GPSBT_LIBS = @GPSBT_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
 GYPSY_CFLAGS = @GYPSY_CFLAGS@
 GYPSY_LIBS = @GYPSY_LIBS@
 HTML_DIR = @HTML_DIR@
@@ -110,6 +124,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -186,9 +202,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  interfaces/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  interfaces/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign interfaces/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign interfaces/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -206,6 +222,7 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -235,13 +252,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -272,6 +293,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -291,6 +313,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -299,18 +323,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -331,7 +365,7 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: install-am install-strip
+.MAKE: all check install install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
@@ -345,7 +379,8 @@ uninstall-am:
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
 %.xml: %-full.xml
-	$(XSLT) -o $@ $(top_srcdir)/docs/tools/spec-strip-docs.xsl $<
+	$(AM_V_GEN)$(XSLT) -o $@ $(top_srcdir)/docs/tools/spec-strip-docs.xsl $<
+
 # 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.
 .NOEXPORT:
diff --git a/interfaces/gypsy-client-full.xml b/interfaces/gypsy-client-full.xml
index dc30358..591ad73 100644
--- a/interfaces/gypsy-client-full.xml
+++ b/interfaces/gypsy-client-full.xml
@@ -81,6 +81,9 @@
   </interface>
 
   <interface name="org.freedesktop.Gypsy.Device">
+    <method name="SetStartOptions">
+      <arg type="a{sv}" name="options" direction="in" />
+    </method>
     <method name="Start" />
     <method name="Stop" />
     
diff --git a/ltmain.sh b/ltmain.sh
index 3506ead..d88da2c 100755
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,6 +1,6 @@
 # Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool) 2.2.6
+# ltmain.sh (GNU libtool) 2.2.6b
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -65,7 +65,7 @@
 #       compiler:		$LTCC
 #       compiler flags:		$LTCFLAGS
 #       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-4
+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2
 #       automake:		$automake_version
 #       autoconf:		$autoconf_version
 #
@@ -73,9 +73,9 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="2.2.6 Debian-2.2.6a-4"
+VERSION="2.2.6b Debian-2.2.6b-2"
 TIMESTAMP=""
-package_revision=1.3012
+package_revision=1.3017
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
diff --git a/src/Makefile.am b/src/Makefile.am
index 4992c33..1c2e6ac 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,10 +5,12 @@ gypsy_daemon_CFLAGS =		\
 	-I$(srcdir)		\
 	-I$(top_builddir)	\
 	-DLOCALSTATEDIR=\"$(localstatedir)\"	\
-	$(GYPSY_CFLAGS)
+	$(GYPSY_CFLAGS)		\
+	$(GPSBT_CFLAGS)
 
 gypsy_daemon_LDADD =		\
 	$(GYPSY_LIBS)		\
+	$(GPSBT_LIBS)		\
 	-lm
 
 NOINST_H_FILES =		\
@@ -38,26 +40,16 @@ BUILT_SOURCES =			\
 EXTRA_DIST = gypsy-marshal.list \
 	$(BUILT_SOURCES)
 
-CLEANFILES = $(BUILT_SOURCES) \
-	stamp-gypsy-client-glue.h	\
-	stamp-gypsy-server-glue.h
+CLEANFILES = $(BUILT_SOURCES)
 
 gypsy-marshal-internal.h: gypsy-marshal.list $(GLIB_GENMARSHAL)
-	$(GLIB_GENMARSHAL) $< --header --prefix=gypsy_marshal > $@
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=gypsy_marshal > $@
 gypsy-marshal-internal.c: gypsy-marshal.list gypsy-marshal-internal.h $(GLIB_GENMARSHAL)
-	echo "#include \"gypsy-marshal-internal.h\"" > $@ \
+	$(AM_V_GEN)echo "#include \"gypsy-marshal-internal.h\"" > $@ \
 	&& $(GLIB_GENMARSHAL) --prefix=gypsy_marshal $(srcdir)/gypsy-marshal.list --body >> $@
 
-%-glue.h: stamp-%-glue.h
-	@true
-stamp-gypsy-server-glue.h: ../interfaces/gypsy-server.xml
-	$(DBUS_BINDING_TOOL) --prefix=gypsy_server --mode=glib-server $< > xgen-$(@F) \
-	&& (cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%)) \
-	&& rm -f xgen-$(@F)	\
-	&& echo timestamp > $(@F)
-
-stamp-gypsy-client-glue.h: ../interfaces/gypsy-client.xml
-	$(DBUS_BINDING_TOOL) --prefix=gypsy_client --mode=glib-server $< > xgen-$(@F) \
-	&& (cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%)) \
-	&& rm -f xgen-$(@F) \
-	&& echo timestamp > $(@F)
+gypsy-server-glue.h: ../interfaces/gypsy-server.xml
+	$(AM_V_GEN)$(DBUS_BINDING_TOOL) --prefix=gypsy_server --mode=glib-server $< > $@
+
+gypsy-client-glue.h: ../interfaces/gypsy-client.xml
+	$(AM_V_GEN)$(DBUS_BINDING_TOOL) --prefix=gypsy_client --mode=glib-server $< > $@
diff --git a/src/Makefile.in b/src/Makefile.in
index f04c0ac..dfe4fde 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in 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.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -43,8 +45,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am__objects_1 =
 am_gypsy_daemon_OBJECTS = gypsy_daemon-gypsy-client.$(OBJEXT) \
@@ -54,22 +56,40 @@ am_gypsy_daemon_OBJECTS = gypsy_daemon-gypsy-client.$(OBJEXT) \
 	gypsy_daemon-nmea-gen.$(OBJEXT) $(am__objects_1)
 gypsy_daemon_OBJECTS = $(am_gypsy_daemon_OBJECTS)
 am__DEPENDENCIES_1 =
-gypsy_daemon_DEPENDENCIES = $(am__DEPENDENCIES_1)
-gypsy_daemon_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+gypsy_daemon_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+gypsy_daemon_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(gypsy_daemon_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(gypsy_daemon_SOURCES)
 DIST_SOURCES = $(gypsy_daemon_SOURCES)
 ETAGS = etags
@@ -77,6 +97,7 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -103,8 +124,12 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GPSBT_CFLAGS = @GPSBT_CFLAGS@
+GPSBT_LIBS = @GPSBT_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
 GYPSY_CFLAGS = @GYPSY_CFLAGS@
 GYPSY_LIBS = @GYPSY_LIBS@
 HTML_DIR = @HTML_DIR@
@@ -139,6 +164,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -203,10 +230,12 @@ gypsy_daemon_CFLAGS = \
 	-I$(srcdir)		\
 	-I$(top_builddir)	\
 	-DLOCALSTATEDIR=\"$(localstatedir)\"	\
-	$(GYPSY_CFLAGS)
+	$(GYPSY_CFLAGS)		\
+	$(GPSBT_CFLAGS)
 
 gypsy_daemon_LDADD = \
 	$(GYPSY_LIBS)		\
+	$(GPSBT_LIBS)		\
 	-lm
 
 NOINST_H_FILES = \
@@ -236,10 +265,7 @@ BUILT_SOURCES = \
 EXTRA_DIST = gypsy-marshal.list \
 	$(BUILT_SOURCES)
 
-CLEANFILES = $(BUILT_SOURCES) \
-	stamp-gypsy-client-glue.h	\
-	stamp-gypsy-server-glue.h
-
+CLEANFILES = $(BUILT_SOURCES)
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -254,9 +280,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -274,37 +300,53 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 gypsy-daemon$(EXEEXT): $(gypsy_daemon_OBJECTS) $(gypsy_daemon_DEPENDENCIES) 
 	@rm -f gypsy-daemon$(EXEEXT)
-	$(gypsy_daemon_LINK) $(gypsy_daemon_OBJECTS) $(gypsy_daemon_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(gypsy_daemon_LINK) $(gypsy_daemon_OBJECTS) $(gypsy_daemon_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -320,106 +362,121 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gypsy_daemon-nmea-parser.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 gypsy_daemon-gypsy-client.o: gypsy-client.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-gypsy-client.o -MD -MP -MF $(DEPDIR)/gypsy_daemon-gypsy-client.Tpo -c -o gypsy_daemon-gypsy-client.o `test -f 'gypsy-client.c' || echo '$(srcdir)/'`gypsy-client.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gypsy_daemon-gypsy-client.Tpo $(DEPDIR)/gypsy_daemon-gypsy-client.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-gypsy-client.o -MD -MP -MF $(DEPDIR)/gypsy_daemon-gypsy-client.Tpo -c -o gypsy_daemon-gypsy-client.o `test -f 'gypsy-client.c' || echo '$(srcdir)/'`gypsy-client.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gypsy_daemon-gypsy-client.Tpo $(DEPDIR)/gypsy_daemon-gypsy-client.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gypsy-client.c' object='gypsy_daemon-gypsy-client.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -c -o gypsy_daemon-gypsy-client.o `test -f 'gypsy-client.c' || echo '$(srcdir)/'`gypsy-client.c
 
 gypsy_daemon-gypsy-client.obj: gypsy-client.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-gypsy-client.obj -MD -MP -MF $(DEPDIR)/gypsy_daemon-gypsy-client.Tpo -c -o gypsy_daemon-gypsy-client.obj `if test -f 'gypsy-client.c'; then $(CYGPATH_W) 'gypsy-client.c'; else $(CYGPATH_W) '$(srcdir)/gypsy-client.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gypsy_daemon-gypsy-client.Tpo $(DEPDIR)/gypsy_daemon-gypsy-client.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-gypsy-client.obj -MD -MP -MF $(DEPDIR)/gypsy_daemon-gypsy-client.Tpo -c -o gypsy_daemon-gypsy-client.obj `if test -f 'gypsy-client.c'; then $(CYGPATH_W) 'gypsy-client.c'; else $(CYGPATH_W) '$(srcdir)/gypsy-client.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gypsy_daemon-gypsy-client.Tpo $(DEPDIR)/gypsy_daemon-gypsy-client.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gypsy-client.c' object='gypsy_daemon-gypsy-client.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -c -o gypsy_daemon-gypsy-client.obj `if test -f 'gypsy-client.c'; then $(CYGPATH_W) 'gypsy-client.c'; else $(CYGPATH_W) '$(srcdir)/gypsy-client.c'; fi`
 
 gypsy_daemon-gypsy-marshal-internal.o: gypsy-marshal-internal.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-gypsy-marshal-internal.o -MD -MP -MF $(DEPDIR)/gypsy_daemon-gypsy-marshal-internal.Tpo -c -o gypsy_daemon-gypsy-marshal-internal.o `test -f 'gypsy-marshal-internal.c' || echo '$(srcdir)/'`gypsy-marshal-internal.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gypsy_daemon-gypsy-marshal-internal.Tpo $(DEPDIR)/gypsy_daemon-gypsy-marshal-internal.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-gypsy-marshal-internal.o -MD -MP -MF $(DEPDIR)/gypsy_daemon-gypsy-marshal-internal.Tpo -c -o gypsy_daemon-gypsy-marshal-internal.o `test -f 'gypsy-marshal-internal.c' || echo '$(srcdir)/'`gypsy-marshal-internal.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gypsy_daemon-gypsy-marshal-internal.Tpo $(DEPDIR)/gypsy_daemon-gypsy-marshal-internal.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gypsy-marshal-internal.c' object='gypsy_daemon-gypsy-marshal-internal.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -c -o gypsy_daemon-gypsy-marshal-internal.o `test -f 'gypsy-marshal-internal.c' || echo '$(srcdir)/'`gypsy-marshal-internal.c
 
 gypsy_daemon-gypsy-marshal-internal.obj: gypsy-marshal-internal.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-gypsy-marshal-internal.obj -MD -MP -MF $(DEPDIR)/gypsy_daemon-gypsy-marshal-internal.Tpo -c -o gypsy_daemon-gypsy-marshal-internal.obj `if test -f 'gypsy-marshal-internal.c'; then $(CYGPATH_W) 'gypsy-marshal-internal.c'; else $(CYGPATH_W) '$(srcdir)/gypsy-marshal-internal.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gypsy_daemon-gypsy-marshal-internal.Tpo $(DEPDIR)/gypsy_daemon-gypsy-marshal-internal.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-gypsy-marshal-internal.obj -MD -MP -MF $(DEPDIR)/gypsy_daemon-gypsy-marshal-internal.Tpo -c -o gypsy_daemon-gypsy-marshal-internal.obj `if test -f 'gypsy-marshal-internal.c'; then $(CYGPATH_W) 'gypsy-marshal-internal.c'; else $(CYGPATH_W) '$(srcdir)/gypsy-marshal-internal.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gypsy_daemon-gypsy-marshal-internal.Tpo $(DEPDIR)/gypsy_daemon-gypsy-marshal-internal.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gypsy-marshal-internal.c' object='gypsy_daemon-gypsy-marshal-internal.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -c -o gypsy_daemon-gypsy-marshal-internal.obj `if test -f 'gypsy-marshal-internal.c'; then $(CYGPATH_W) 'gypsy-marshal-internal.c'; else $(CYGPATH_W) '$(srcdir)/gypsy-marshal-internal.c'; fi`
 
 gypsy_daemon-gypsy-server.o: gypsy-server.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-gypsy-server.o -MD -MP -MF $(DEPDIR)/gypsy_daemon-gypsy-server.Tpo -c -o gypsy_daemon-gypsy-server.o `test -f 'gypsy-server.c' || echo '$(srcdir)/'`gypsy-server.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gypsy_daemon-gypsy-server.Tpo $(DEPDIR)/gypsy_daemon-gypsy-server.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-gypsy-server.o -MD -MP -MF $(DEPDIR)/gypsy_daemon-gypsy-server.Tpo -c -o gypsy_daemon-gypsy-server.o `test -f 'gypsy-server.c' || echo '$(srcdir)/'`gypsy-server.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gypsy_daemon-gypsy-server.Tpo $(DEPDIR)/gypsy_daemon-gypsy-server.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gypsy-server.c' object='gypsy_daemon-gypsy-server.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -c -o gypsy_daemon-gypsy-server.o `test -f 'gypsy-server.c' || echo '$(srcdir)/'`gypsy-server.c
 
 gypsy_daemon-gypsy-server.obj: gypsy-server.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-gypsy-server.obj -MD -MP -MF $(DEPDIR)/gypsy_daemon-gypsy-server.Tpo -c -o gypsy_daemon-gypsy-server.obj `if test -f 'gypsy-server.c'; then $(CYGPATH_W) 'gypsy-server.c'; else $(CYGPATH_W) '$(srcdir)/gypsy-server.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gypsy_daemon-gypsy-server.Tpo $(DEPDIR)/gypsy_daemon-gypsy-server.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-gypsy-server.obj -MD -MP -MF $(DEPDIR)/gypsy_daemon-gypsy-server.Tpo -c -o gypsy_daemon-gypsy-server.obj `if test -f 'gypsy-server.c'; then $(CYGPATH_W) 'gypsy-server.c'; else $(CYGPATH_W) '$(srcdir)/gypsy-server.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gypsy_daemon-gypsy-server.Tpo $(DEPDIR)/gypsy_daemon-gypsy-server.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gypsy-server.c' object='gypsy_daemon-gypsy-server.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -c -o gypsy_daemon-gypsy-server.obj `if test -f 'gypsy-server.c'; then $(CYGPATH_W) 'gypsy-server.c'; else $(CYGPATH_W) '$(srcdir)/gypsy-server.c'; fi`
 
 gypsy_daemon-main.o: main.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-main.o -MD -MP -MF $(DEPDIR)/gypsy_daemon-main.Tpo -c -o gypsy_daemon-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gypsy_daemon-main.Tpo $(DEPDIR)/gypsy_daemon-main.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-main.o -MD -MP -MF $(DEPDIR)/gypsy_daemon-main.Tpo -c -o gypsy_daemon-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gypsy_daemon-main.Tpo $(DEPDIR)/gypsy_daemon-main.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='gypsy_daemon-main.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -c -o gypsy_daemon-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
 
 gypsy_daemon-main.obj: main.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-main.obj -MD -MP -MF $(DEPDIR)/gypsy_daemon-main.Tpo -c -o gypsy_daemon-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gypsy_daemon-main.Tpo $(DEPDIR)/gypsy_daemon-main.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-main.obj -MD -MP -MF $(DEPDIR)/gypsy_daemon-main.Tpo -c -o gypsy_daemon-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gypsy_daemon-main.Tpo $(DEPDIR)/gypsy_daemon-main.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='gypsy_daemon-main.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -c -o gypsy_daemon-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
 
 gypsy_daemon-nmea-parser.o: nmea-parser.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-nmea-parser.o -MD -MP -MF $(DEPDIR)/gypsy_daemon-nmea-parser.Tpo -c -o gypsy_daemon-nmea-parser.o `test -f 'nmea-parser.c' || echo '$(srcdir)/'`nmea-parser.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gypsy_daemon-nmea-parser.Tpo $(DEPDIR)/gypsy_daemon-nmea-parser.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-nmea-parser.o -MD -MP -MF $(DEPDIR)/gypsy_daemon-nmea-parser.Tpo -c -o gypsy_daemon-nmea-parser.o `test -f 'nmea-parser.c' || echo '$(srcdir)/'`nmea-parser.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gypsy_daemon-nmea-parser.Tpo $(DEPDIR)/gypsy_daemon-nmea-parser.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nmea-parser.c' object='gypsy_daemon-nmea-parser.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -c -o gypsy_daemon-nmea-parser.o `test -f 'nmea-parser.c' || echo '$(srcdir)/'`nmea-parser.c
 
 gypsy_daemon-nmea-parser.obj: nmea-parser.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-nmea-parser.obj -MD -MP -MF $(DEPDIR)/gypsy_daemon-nmea-parser.Tpo -c -o gypsy_daemon-nmea-parser.obj `if test -f 'nmea-parser.c'; then $(CYGPATH_W) 'nmea-parser.c'; else $(CYGPATH_W) '$(srcdir)/nmea-parser.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gypsy_daemon-nmea-parser.Tpo $(DEPDIR)/gypsy_daemon-nmea-parser.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-nmea-parser.obj -MD -MP -MF $(DEPDIR)/gypsy_daemon-nmea-parser.Tpo -c -o gypsy_daemon-nmea-parser.obj `if test -f 'nmea-parser.c'; then $(CYGPATH_W) 'nmea-parser.c'; else $(CYGPATH_W) '$(srcdir)/nmea-parser.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gypsy_daemon-nmea-parser.Tpo $(DEPDIR)/gypsy_daemon-nmea-parser.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nmea-parser.c' object='gypsy_daemon-nmea-parser.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -c -o gypsy_daemon-nmea-parser.obj `if test -f 'nmea-parser.c'; then $(CYGPATH_W) 'nmea-parser.c'; else $(CYGPATH_W) '$(srcdir)/nmea-parser.c'; fi`
 
 gypsy_daemon-nmea-gen.o: nmea-gen.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-nmea-gen.o -MD -MP -MF $(DEPDIR)/gypsy_daemon-nmea-gen.Tpo -c -o gypsy_daemon-nmea-gen.o `test -f 'nmea-gen.c' || echo '$(srcdir)/'`nmea-gen.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gypsy_daemon-nmea-gen.Tpo $(DEPDIR)/gypsy_daemon-nmea-gen.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-nmea-gen.o -MD -MP -MF $(DEPDIR)/gypsy_daemon-nmea-gen.Tpo -c -o gypsy_daemon-nmea-gen.o `test -f 'nmea-gen.c' || echo '$(srcdir)/'`nmea-gen.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gypsy_daemon-nmea-gen.Tpo $(DEPDIR)/gypsy_daemon-nmea-gen.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nmea-gen.c' object='gypsy_daemon-nmea-gen.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -c -o gypsy_daemon-nmea-gen.o `test -f 'nmea-gen.c' || echo '$(srcdir)/'`nmea-gen.c
 
 gypsy_daemon-nmea-gen.obj: nmea-gen.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-nmea-gen.obj -MD -MP -MF $(DEPDIR)/gypsy_daemon-nmea-gen.Tpo -c -o gypsy_daemon-nmea-gen.obj `if test -f 'nmea-gen.c'; then $(CYGPATH_W) 'nmea-gen.c'; else $(CYGPATH_W) '$(srcdir)/nmea-gen.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gypsy_daemon-nmea-gen.Tpo $(DEPDIR)/gypsy_daemon-nmea-gen.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -MT gypsy_daemon-nmea-gen.obj -MD -MP -MF $(DEPDIR)/gypsy_daemon-nmea-gen.Tpo -c -o gypsy_daemon-nmea-gen.obj `if test -f 'nmea-gen.c'; then $(CYGPATH_W) 'nmea-gen.c'; else $(CYGPATH_W) '$(srcdir)/nmea-gen.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gypsy_daemon-nmea-gen.Tpo $(DEPDIR)/gypsy_daemon-nmea-gen.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nmea-gen.c' object='gypsy_daemon-nmea-gen.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gypsy_daemon_CFLAGS) $(CFLAGS) -c -o gypsy_daemon-nmea-gen.obj `if test -f 'nmea-gen.c'; then $(CYGPATH_W) 'nmea-gen.c'; else $(CYGPATH_W) '$(srcdir)/nmea-gen.c'; fi`
@@ -442,7 +499,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -450,29 +507,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -493,13 +555,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -533,6 +599,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -555,6 +622,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -563,18 +632,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -597,7 +676,7 @@ ps-am:
 
 uninstall-am: uninstall-libexecPROGRAMS
 
-.MAKE: install-am install-strip
+.MAKE: all check install install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libexecPROGRAMS clean-libtool ctags distclean \
@@ -615,24 +694,17 @@ uninstall-am: uninstall-libexecPROGRAMS
 
 
 gypsy-marshal-internal.h: gypsy-marshal.list $(GLIB_GENMARSHAL)
-	$(GLIB_GENMARSHAL) $< --header --prefix=gypsy_marshal > $@
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=gypsy_marshal > $@
 gypsy-marshal-internal.c: gypsy-marshal.list gypsy-marshal-internal.h $(GLIB_GENMARSHAL)
-	echo "#include \"gypsy-marshal-internal.h\"" > $@ \
+	$(AM_V_GEN)echo "#include \"gypsy-marshal-internal.h\"" > $@ \
 	&& $(GLIB_GENMARSHAL) --prefix=gypsy_marshal $(srcdir)/gypsy-marshal.list --body >> $@
 
-%-glue.h: stamp-%-glue.h
-	@true
-stamp-gypsy-server-glue.h: ../interfaces/gypsy-server.xml
-	$(DBUS_BINDING_TOOL) --prefix=gypsy_server --mode=glib-server $< > xgen-$(@F) \
-	&& (cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%)) \
-	&& rm -f xgen-$(@F)	\
-	&& echo timestamp > $(@F)
-
-stamp-gypsy-client-glue.h: ../interfaces/gypsy-client.xml
-	$(DBUS_BINDING_TOOL) --prefix=gypsy_client --mode=glib-server $< > xgen-$(@F) \
-	&& (cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%)) \
-	&& rm -f xgen-$(@F) \
-	&& echo timestamp > $(@F)
+gypsy-server-glue.h: ../interfaces/gypsy-server.xml
+	$(AM_V_GEN)$(DBUS_BINDING_TOOL) --prefix=gypsy_server --mode=glib-server $< > $@
+
+gypsy-client-glue.h: ../interfaces/gypsy-client.xml
+	$(AM_V_GEN)$(DBUS_BINDING_TOOL) --prefix=gypsy_client --mode=glib-server $< > $@
+
 # 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.
 .NOEXPORT:
diff --git a/src/gypsy-client-glue.h b/src/gypsy-client-glue.h
index 01651ff..0adf691 100644
--- a/src/gypsy-client-glue.h
+++ b/src/gypsy-client-glue.h
@@ -161,6 +161,53 @@ dbus_glib_marshal_gypsy_client_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER_
   g_value_set_boolean (return_value, v_return);
 }
 
+/* BOOLEAN:BOXED,POINTER */
+extern void dbus_glib_marshal_gypsy_client_BOOLEAN__BOXED_POINTER (GClosure     *closure,
+                                                                   GValue       *return_value,
+                                                                   guint         n_param_values,
+                                                                   const GValue *param_values,
+                                                                   gpointer      invocation_hint,
+                                                                   gpointer      marshal_data);
+void
+dbus_glib_marshal_gypsy_client_BOOLEAN__BOXED_POINTER (GClosure     *closure,
+                                                       GValue       *return_value G_GNUC_UNUSED,
+                                                       guint         n_param_values,
+                                                       const GValue *param_values,
+                                                       gpointer      invocation_hint G_GNUC_UNUSED,
+                                                       gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_POINTER) (gpointer     data1,
+                                                           gpointer     arg_1,
+                                                           gpointer     arg_2,
+                                                           gpointer     data2);
+  register GMarshalFunc_BOOLEAN__BOXED_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__BOXED_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_boxed (param_values + 1),
+                       g_marshal_value_peek_pointer (param_values + 2),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
 /* BOOLEAN:POINTER */
 extern void dbus_glib_marshal_gypsy_client_BOOLEAN__POINTER (GClosure     *closure,
                                                              GValue       *return_value,
@@ -261,20 +308,21 @@ G_END_DECLS
 static const DBusGMethodInfo dbus_glib_gypsy_client_methods[] = {
   { (GCallback) gypsy_client_get_accuracy, dbus_glib_marshal_gypsy_client_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER, 0 },
   { (GCallback) gypsy_client_get_course, dbus_glib_marshal_gypsy_client_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER_POINTER, 100 },
-  { (GCallback) gypsy_client_start, dbus_glib_marshal_gypsy_client_BOOLEAN__POINTER, 221 },
-  { (GCallback) gypsy_client_stop, dbus_glib_marshal_gypsy_client_BOOLEAN__POINTER, 259 },
-  { (GCallback) gypsy_client_get_fix_status, dbus_glib_marshal_gypsy_client_BOOLEAN__POINTER_POINTER, 296 },
-  { (GCallback) gypsy_client_get_connection_status, dbus_glib_marshal_gypsy_client_BOOLEAN__POINTER_POINTER, 357 },
-  { (GCallback) gypsy_client_get_position, dbus_glib_marshal_gypsy_client_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER_POINTER, 427 },
-  { (GCallback) gypsy_client_get_satellites, dbus_glib_marshal_gypsy_client_BOOLEAN__POINTER_POINTER, 558 },
-  { (GCallback) gypsy_client_get_time, dbus_glib_marshal_gypsy_client_BOOLEAN__POINTER_POINTER, 633 },
+  { (GCallback) gypsy_client_set_start_options, dbus_glib_marshal_gypsy_client_BOOLEAN__BOXED_POINTER, 221 },
+  { (GCallback) gypsy_client_start, dbus_glib_marshal_gypsy_client_BOOLEAN__POINTER, 285 },
+  { (GCallback) gypsy_client_stop, dbus_glib_marshal_gypsy_client_BOOLEAN__POINTER, 323 },
+  { (GCallback) gypsy_client_get_fix_status, dbus_glib_marshal_gypsy_client_BOOLEAN__POINTER_POINTER, 360 },
+  { (GCallback) gypsy_client_get_connection_status, dbus_glib_marshal_gypsy_client_BOOLEAN__POINTER_POINTER, 421 },
+  { (GCallback) gypsy_client_get_position, dbus_glib_marshal_gypsy_client_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER_POINTER, 491 },
+  { (GCallback) gypsy_client_get_satellites, dbus_glib_marshal_gypsy_client_BOOLEAN__POINTER_POINTER, 622 },
+  { (GCallback) gypsy_client_get_time, dbus_glib_marshal_gypsy_client_BOOLEAN__POINTER_POINTER, 697 },
 };
 
 const DBusGObjectInfo dbus_glib_gypsy_client_object_info = {
   0,
   dbus_glib_gypsy_client_methods,
-  9,
-"org.freedesktop.Gypsy.Accuracy\0GetAccuracy\0S\0fields\0O\0F\0N\0i\0pdop\0O\0F\0N\0d\0hdop\0O\0F\0N\0d\0vdop\0O\0F\0N\0d\0\0org.freedesktop.Gypsy.Course\0GetCourse\0S\0fields\0O\0F\0N\0i\0timestamp\0O\0F\0N\0i\0speed\0O\0F\0N\0d\0direction\0O\0F\0N\0d\0climb\0O\0F\0N\0d\0\0org.freedesktop.Gypsy.Device\0Start\0S\0\0org.freedesktop.Gypsy.Device\0Stop\0S\0\0org.freedesktop.Gypsy.Device\0GetFixStatus\0S\0fixtype\0O\0F\0N\0i\0\0org.freedesktop.Gypsy.Device\0GetConnectionStatus\0S\0connected\0O\0F\0N\0b\0\0org.freedesktop.Gypsy.Position\0GetPosition\0S\0fields\0O\0F\0N\0i\0timestamp\0O\0F\0N\0i\0latitude\0O\0F\0N\0d\0longitude\0O\0F\0N\0d\0altitude\0O\0F\0N\0d\0\0org.freedesktop.Gypsy.Satellite\0GetSatellites\0S\0satellites\0O\0F\0N\0a(ubuuu)\0\0org.freedesktop.Gypsy.Time\0GetTime\0S\0timestamp\0O\0F\0N\0i\0\0\0",
+  10,
+"org.freedesktop.Gypsy.Accuracy\0GetAccuracy\0S\0fields\0O\0F\0N\0i\0pdop\0O\0F\0N\0d\0hdop\0O\0F\0N\0d\0vdop\0O\0F\0N\0d\0\0org.freedesktop.Gypsy.Course\0GetCourse\0S\0fields\0O\0F\0N\0i\0timestamp\0O\0F\0N\0i\0speed\0O\0F\0N\0d\0direction\0O\0F\0N\0d\0climb\0O\0F\0N\0d\0\0org.freedesktop.Gypsy.Device\0SetStartOptions\0S\0options\0I\0a{sv}\0\0org.freedesktop.Gypsy.Device\0Start\0S\0\0org.freedesktop.Gypsy.Device\0Stop\0S\0\0org.freedesktop.Gypsy.Device\0GetFixStatus\0S\0fixtype\0O\0F\0N\0i\0\0org.freedesktop.Gypsy.Device\0GetConnectionStatus\0S\0connected\0O\0F\0N\0b\0\0org.freedesktop.Gypsy.Position\0GetPosition\0S\0fields\0O\0F\0N\0i\0timestamp\0O\0F\0N\0i\0latitude\0O\0F\0N\0d\0longitude\0O\0F\0N\0d\0altitude\0O\0F\0N\0d\0\0org.freedesktop.Gypsy.Satellite\0GetSatellites\0S\0satellites\0O\0F\0N\0a(ubuuu)\0\0org.freedesktop.Gypsy.Time\0GetTime\0S\0timestamp\0O\0F\0N\0i\0\0\0",
 "org.freedesktop.Gypsy.Accuracy\0AccuracyChanged\0org.freedesktop.Gypsy.Course\0CourseChanged\0org.freedesktop.Gypsy.Device\0FixStatusChanged\0org.freedesktop.Gypsy.Device\0ConnectionStatusChanged\0org.freedesktop.Gypsy.Position\0PositionChanged\0org.freedesktop.Gypsy.Satellite\0SatellitesChanged\0org.freedesktop.Gypsy.Time\0TimeChanged\0\0",
 "\0"
 };
diff --git a/src/gypsy-client.c b/src/gypsy-client.c
index 52dc1f6..2312d7b 100644
--- a/src/gypsy-client.c
+++ b/src/gypsy-client.c
@@ -49,6 +49,11 @@
 #include <bluetooth/rfcomm.h>
 #endif
 
+#ifdef ENABLE_N810
+#include <gpsctrl.h>
+#define N810_INTERNAL_GPS_PATH "/dev/pgps"
+#endif
+
 #include <glib.h>
 
 #include <dbus/dbus-glib.h>
@@ -63,15 +68,25 @@
 
 #define GYPSY_ERROR g_quark_from_static_string ("gypsy-error")
 
+typedef enum {
+	GYPSY_DEVICE_TYPE_UNKNOWN = -1,
+	GYPSY_DEVICE_TYPE_SERIAL,
+	GYPSY_DEVICE_TYPE_GARMIN,
+	GYPSY_DEVICE_TYPE_FIFO,
+	GYPSY_DEVICE_TYPE_BLUETOOTH
+} GypsyDeviceType;
+
 /* Defined in main.c */
 extern char* nmea_log;
 
 #define READ_BUFFER_SIZE 1024
+#define SPEED_TIMEOUT 1000
 
 typedef struct _GypsyClientPrivate {
 
 	char *device_path; /* Device path of our GPS */
 	int fd;	/* File descriptor used to read from the GPS */
+	GypsyDeviceType type;
 
 	GIOChannel *channel; /* The channel we talk to the GPS on */
 	GIOChannel *debug_log; /* The channel to write the NMEA to, 
@@ -85,6 +100,9 @@ typedef struct _GypsyClientPrivate {
 
 	NMEAParseContext *ctxt;
 
+	/* For serial devices */
+	speed_t baudrate;
+
 	/* Fix details */
 	int timestamp;
 	FixType fix_type;
@@ -140,6 +158,9 @@ G_DEFINE_TYPE (GypsyClient, gypsy_client, G_TYPE_OBJECT);
 #define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GYPSY_TYPE_CLIENT, GypsyClientPrivate))
 #define GYPSY_CLIENT_SATELLITES_CHANGED_TYPE (dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, G_TYPE_BOOLEAN, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INVALID))
 
+static gboolean gypsy_client_set_start_options (GypsyClient *client,
+						GHashTable  *options,
+						GError     **error);
 static gboolean gypsy_client_start (GypsyClient *client,
 				    GError     **error);
 static gboolean gypsy_client_stop (GypsyClient *client,
@@ -222,6 +243,14 @@ shutdown_connection (GypsyClient *client)
 	}
 
 	priv->chars_in_buffer = 0;
+
+#ifdef ENABLE_N810
+	/* Turn off the N810's GPS device */
+	if (g_ascii_strcasecmp (priv->device_path, N810_INTERNAL_GPS_PATH) == 0) {
+		g_debug ("N810 chip off");
+		gpsctrl_set_chip_off ();
+	}
+#endif /* ENABLE_N810 */
 }
 
 static gboolean
@@ -460,11 +489,12 @@ garmin_usb_device (GIOChannel *channel,
 	u_int32_t privcmd[GARMIN_PRIV_PKT_MAX_SIZE];
 	gsize chars_written;
 	gsize chars_read;
-	GError *error = NULL;
 
 	/*
 	 *  Since the Garmin driver sets up the device at /dev/ttyUSB<n> it seems
 	 *  to be a pretty good bet that this check will be valid.
+	 *
+	 *  FIXME: Use gudev to get the VID of the device, and check against Garmin?
 	 */
 
 	if (! strcmp (devpath, "/dev/ttyUSB0")) {
@@ -484,8 +514,6 @@ garmin_usb_device (GIOChannel *channel,
 		if (status != G_IO_STATUS_NORMAL) {
 			g_warning ("GARMIN: Error writing \"Private Info Req\" packet:\n%s", 
 				   g_strerror (errno));
-			g_set_error (&error, GYPSY_ERROR, errno, 
-				     g_strerror (errno));
 			return -1;
 		}
 
@@ -500,9 +528,8 @@ garmin_usb_device (GIOChannel *channel,
 						  NULL);
 
 		if (status != G_IO_STATUS_NORMAL) {
-			g_warning ("GARMIN: Error reading \"Private Info Resp\" packet:\n%s", g_strerror (errno));
-			g_set_error (&error, GYPSY_ERROR, errno, g_strerror (errno));
-			return -1;
+			g_message ("GARMIN: Error reading \"Private Info Resp\" packet: %s", g_strerror (errno));
+			return 0;
 		}
 
 		if ((privcmd[0] == GARMIN_LAYERID_PRIVATE) &&
@@ -511,9 +538,8 @@ garmin_usb_device (GIOChannel *channel,
 			g_debug ("GARMIN: device type confirmed");
 			return 1;
 		} else {
-			g_warning ("GARMIN: \"Private Info Resp\" packet data not recognized");
-			g_set_error (&error, GYPSY_ERROR, -1, "Cannot identify device %s", devpath);
-			return -1;
+			g_message ("GARMIN: \"Private Info Resp\" packet data not recognized");
+			return 0;
 		}
 	} else {
 		return 0;
@@ -591,14 +617,20 @@ gps_channel_connect (GIOChannel  *channel,
 		     gpointer     userdata)
 {
 	GypsyClientPrivate *priv;
+	int ret;
 
 	priv = GET_PRIVATE (userdata);
 
 	g_debug ("GPS channel can connect");
 
-	switch (garmin_usb_device (channel, priv->device_path)) {
+	ret = 0;
+	if (priv->type == GYPSY_DEVICE_TYPE_SERIAL)
+		ret = garmin_usb_device (channel, priv->device_path);
+
+	switch (ret) {
 	case 1:
 		/* the device *IS* a Garmin -- we must do translation to NMEA */
+		priv->type = GYPSY_DEVICE_TYPE_GARMIN;
 		garmin_init (channel);
 		priv->input_id = g_io_add_watch_full (priv->channel, 
 						      G_PRIORITY_HIGH_IDLE,
@@ -632,6 +664,63 @@ gps_channel_connect (GIOChannel  *channel,
 }
 
 static gboolean
+gypsy_client_set_start_options (GypsyClient *client,
+				GHashTable  *options,
+				GError     **error)
+{
+	GypsyClientPrivate *priv;
+	GList *keys, *l;
+
+	priv = GET_PRIVATE (client);
+
+	keys = g_hash_table_get_keys (options);
+	for (l = keys; l != NULL; l = l->next) {
+		if (g_str_equal (l->data, "BaudRate")) {
+			GValue *value = g_hash_table_lookup (options, "BaudRate");
+			guint rate;
+
+			if (priv->channel != NULL) {
+				g_set_error (error, GYPSY_ERROR, 0, "Device already started");
+				g_list_free (keys);
+				return FALSE;
+			}
+
+			rate = g_value_get_uint (value);
+			switch (rate) {
+			case 4800:
+				priv->baudrate = B4800;
+				break;
+			case 9600:
+				priv->baudrate = B9600;
+				break;
+			case 19200:
+				priv->baudrate = B19200;
+				break;
+			case 38400:
+				priv->baudrate = B38400;
+				break;
+			case 57600:
+				priv->baudrate = B57600;
+				break;
+			case 115200:
+				priv->baudrate = B115200;
+				break;
+			default:
+				g_warning ("Unsupported baud rate '%d'", rate);
+				g_set_error (error, GYPSY_ERROR, 0, "Unsupported baud rate '%d'", rate);
+				g_list_free (keys);
+				return FALSE;
+			}
+		} else {
+			g_message ("Unsupported option key '%s'", l->data);
+		}
+	}
+	g_list_free (keys);
+
+	return TRUE;
+}
+
+static gboolean
 gypsy_client_start (GypsyClient *client,
 		    GError     **error)
 {
@@ -650,13 +739,29 @@ gypsy_client_start (GypsyClient *client,
 		g_debug ("Starting connection to %s", priv->device_path);
 	}
 
+	/* Enable the N810's internal GPS */
+#ifdef ENABLE_N810
+		if (g_ascii_strcasecmp (priv->device_path, N810_INTERNAL_GPS_PATH) == 0) {
+			g_debug ("N810 chip on");
+			gpsctrl_set_chip_on ();
+		}
+#endif /* ENABLE_N810 */
+
 	/* Open a connection to our device */
 
-	/* we assume that a device path starting with slash is a tty device */
+	/* we assume that a device path starting with slash is a tty device or
+	 * a FIFO */
 	if (priv->device_path[0] == '/') {
-
-		struct termios term;
-
+		priv->fd = open (priv->device_path, O_RDONLY | O_NOCTTY | O_NONBLOCK);
+		if (priv->fd != -1 && isatty (priv->fd)) {
+			/* Reopen read-write for TTY devices,
+			 * we'll be detecting whether it's garmin later */
+			priv->type = GYPSY_DEVICE_TYPE_SERIAL;
+			close (priv->fd);
+			priv->fd = open (priv->device_path, O_RDWR | O_NOCTTY | O_NONBLOCK);
+		} else {
+			priv->type = GYPSY_DEVICE_TYPE_FIFO;
+		}
 		priv->fd = open (priv->device_path, O_RDWR | O_NOCTTY | O_NONBLOCK);
 		if (priv->fd == -1) {
 			g_warning ("Error opening device %s: %s", priv->device_path, g_strerror (errno));
@@ -664,20 +769,27 @@ gypsy_client_start (GypsyClient *client,
 			return FALSE;
 		}
 
-		if (tcgetattr (priv->fd, &term) < 0) {
-			g_warning ("Error getting term: %s", g_strerror (errno));
-			g_set_error (error, GYPSY_ERROR, errno, g_strerror (errno));
-			return FALSE;
-		}
+		if (priv->type == GYPSY_DEVICE_TYPE_SERIAL) {
+			struct termios term;
 
-		cfmakeraw(&term);
+			if (tcgetattr (priv->fd, &term) < 0) {
+				g_warning ("Error getting term: %s", g_strerror (errno));
+				g_set_error (error, GYPSY_ERROR, errno, g_strerror (errno));
+				return FALSE;
+			}
 
-		if (tcsetattr (priv->fd, TCIOFLUSH, &term) < 0) {
-			g_warning ("Error setting term: %s", g_strerror (errno));
-			g_set_error (error, GYPSY_ERROR, errno, g_strerror (errno));
-			return FALSE;
+			cfmakeraw(&term);
+			if (priv->baudrate != B0)
+				cfsetispeed(&term, priv->baudrate);
+
+			if (tcsetattr (priv->fd, TCSAFLUSH, &term) < 0) {
+				g_warning ("Error setting term: %s", g_strerror (errno));
+				g_set_error (error, GYPSY_ERROR, errno, g_strerror (errno));
+				return FALSE;
+			}
 		}
 	} else {
+		priv->type = GYPSY_DEVICE_TYPE_BLUETOOTH;
 #ifdef HAVE_BLUEZ
 		priv->fd = socket (AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
 #else
@@ -687,14 +799,19 @@ gypsy_client_start (GypsyClient *client,
 	}
 
 	if (nmea_log) {
-		char *device, *filename;
-		device = g_path_get_basename (priv->device_path);
-		filename = g_strconcat (nmea_log, ".", device, NULL);
-		priv->debug_log = g_io_channel_new_file (filename, "w", NULL);
+		if (g_str_equal (nmea_log, "stdout") ||
+		    g_str_equal (nmea_log, "-")) {
+			priv->debug_log = g_io_channel_unix_new (STDOUT_FILENO);
+		} else {
+			char *device, *filename;
+			device = g_path_get_basename (priv->device_path);
+			filename = g_strconcat (nmea_log, ".", device, NULL);
+			priv->debug_log = g_io_channel_new_file (filename, "w", NULL);
+			g_free (device);
+			g_free (filename);
+		}
 		g_io_channel_set_encoding (priv->debug_log, NULL, NULL);
 		g_io_channel_set_buffered (priv->debug_log, FALSE);
-		g_free (device);
-		g_free (filename);
 	}
 
 	/* Set up the IO Channel */
@@ -1107,6 +1224,8 @@ gypsy_client_init (GypsyClient *client)
 
 	priv = GET_PRIVATE (client);
 	priv->fd = -1;
+	priv->type = GYPSY_DEVICE_TYPE_UNKNOWN;
+	priv->baudrate = B0;
 	priv->ctxt = nmea_parse_context_new (client);
 	priv->timestamp = 0;
 	priv->last_alt_timestamp = 0;
diff --git a/src/nmea-parser.c b/src/nmea-parser.c
index 195a220..b0687f2 100644
--- a/src/nmea-parser.c
+++ b/src/nmea-parser.c
@@ -516,7 +516,7 @@ parse_gga (NMEAParseContext *ctxt,
    8) Date in ddmmyy
    9) Magnetic Variation, degrees
    10) E or W
-   11) FAA mode indicator (NMEA 2.3 and later)
+   11) FAA mode indicator (NMEA 2.3 and later, optional)
 */
 #define RMC_FIELD(x) (ctxt->fields.rmc_fields[x])
 static gboolean
diff --git a/src/nmea.h b/src/nmea.h
index 514aabc..f59d31d 100644
--- a/src/nmea.h
+++ b/src/nmea.h
@@ -13,7 +13,7 @@
 #define GSV_FIELDS 19
 #define GSA_FIELDS 17
 #define GGA_FIELDS 14
-#define RMC_FIELDS 12
+#define RMC_FIELDS 11
 
 typedef enum {
 	POSITION_NONE		= 0,