[meego-commits] 9452: Changes to MeeGo:1.1:Core:Update:Testing/libsocialweb

Rob Bradford no_reply at build.meego.com
Fri Nov 12 12:33:05 UTC 2010


Hi,
I have made the following changes to libsocialweb in project MeeGo:1.1:Core:Update:Testing. Please review and accept ASAP.

Thank You,
Rob Bradford

[This message was auto-generated]

---

Request #9452:

  submit:   home:rbradford:branches:MeeGo:1.1:Netbook:Update:Testing/libsocialweb(r3) -> MeeGo:1.1:Core:Update:Testing/libsocialweb


Message:
    None

State:   new          2010-11-12T04:33:04 rbradford
Comment: None



changes files:
--------------
--- libsocialweb.changes
+++ libsocialweb.changes
@@ -0,0 +1,3 @@
+* Tue Nov 09 2010 Rob Bradford <rob at linux.intel.com> - 0.25.6
+- Bug fix release - install sw-cache.h (BMC#9811) - needed for FB bring-up
+

old:
----
  libsocialweb-0.25.5.tar.gz

new:
----
  libsocialweb-0.25.6.tar.gz

spec files:
-----------
--- libsocialweb.spec
+++ libsocialweb.spec
@@ -1,13 +1,13 @@
 # 
 # Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.19
+# Generated by: spectacle version 0.20git
 # 
 # >> macros
 # << macros
 
 Name:       libsocialweb
 Summary:    A social data aggregator
-Version:    0.25.5
+Version:    0.25.6
 Release:    1
 Group:      System Environment/Desktop
 License:    LGPL 2.1

other changes:
--------------

++++++ libsocialweb-0.25.5.tar.gz -> libsocialweb-0.25.6.tar.gz
--- aclocal.m4
+++ aclocal.m4
@@ -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.67],,
-[m4_warning([this file was generated for autoconf 2.67.
+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'.])])
@@ -513,7 +513,7 @@
 
     dnl These rules are solely for the distribution goal.  While doing this
     dnl we only have to keep exactly one list of the available catalogs
-    dnl in configure.ac.
+    dnl in configure.in.
     for lang in $ALL_LINGUAS; do
       GMOFILES="$GMOFILES $lang.gmo"
       POFILES="$POFILES $lang.po"
@@ -642,7 +642,7 @@
 dnl
 dnl Now the definitions that aclocal will find
 dnl
-ifdef(glib_configure_ac,[],[
+ifdef(glib_configure_in,[],[
 AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
 AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
 ])dnl
--- configure
+++ configure
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for libsocialweb 0.25.5.
+# Generated by GNU Autoconf 2.65 for libsocialweb 0.25.6.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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
@@ -316,7 +316,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -356,19 +356,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
   fi
-  $as_echo "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $1" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -679,7 +679,7 @@
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -698,8 +698,8 @@
 # Identity of this package.
 PACKAGE_NAME='libsocialweb'
 PACKAGE_TARNAME='libsocialweb'
-PACKAGE_VERSION='0.25.5'
-PACKAGE_STRING='libsocialweb 0.25.5'
+PACKAGE_VERSION='0.25.6'
+PACKAGE_STRING='libsocialweb 0.25.6'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL='http://meego.gitorious.org/meego-middleware/libsocialweb'
 
@@ -1080,9 +1080,8 @@
   fi
 
   case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1127,7 +1126,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1153,7 +1152,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1357,7 +1356,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1373,7 +1372,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1403,8 +1402,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
     ;;
 
   *=*)
@@ -1412,7 +1411,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1430,13 +1429,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
+  as_fn_error "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1459,7 +1458,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1473,8 +1472,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1489,9 +1488,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
+  as_fn_error "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
+  as_fn_error "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1530,11 +1529,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1560,7 +1559,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libsocialweb 0.25.5 to adapt to many kinds of systems.
+\`configure' configures libsocialweb 0.25.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1574,7 +1573,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
+  -q, --quiet, --silent   do not print \`checking...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1630,7 +1629,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libsocialweb 0.25.5:";;
+     short | recursive ) echo "Configuration of libsocialweb 0.25.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1788,10 +1787,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libsocialweb configure 0.25.5
-generated by GNU Autoconf 2.67
+libsocialweb configure 0.25.6
+generated by GNU Autoconf 2.65
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1861,7 +1860,7 @@
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
+  test $ac_status = 0; } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -1885,10 +1884,10 @@
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1924,7 +1923,7 @@
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -1951,7 +1950,7 @@
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -2015,7 +2014,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2091,7 +2090,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2153,8 +2152,8 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libsocialweb $as_me 0.25.5, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+It was created by libsocialweb $as_me 0.25.6, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
@@ -2264,9 +2263,11 @@
   {
     echo
 
-    $as_echo "## ---------------- ##
+    cat <<\_ASBOX
+## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2300,9 +2301,11 @@
 )
     echo
 
-    $as_echo "## ----------------- ##
+    cat <<\_ASBOX
+## ----------------- ##
 ## Output variables. ##
-## ----------------- ##"
+## ----------------- ##
+_ASBOX
     echo
     for ac_var in $ac_subst_vars
     do
@@ -2315,9 +2318,11 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      cat <<\_ASBOX
+## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##"
+## ------------------- ##
+_ASBOX
       echo
       for ac_var in $ac_subst_files
       do
@@ -2331,9 +2336,11 @@
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      cat <<\_ASBOX
+## ----------- ##
 ## confdefs.h. ##
-## ----------- ##"
+## ----------- ##
+_ASBOX
       echo
       cat confdefs.h
       echo
@@ -2388,12 +2395,7 @@
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -2408,11 +2410,7 @@
     { $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
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+    . "$ac_site_file"
   fi
 done
 
@@ -2488,7 +2486,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2506,22 +2504,16 @@
 
 ac_aux_dir=
 for ac_dir in build-aux "$srcdir"/build-aux; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
+  as_fn_error "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2537,7 +2529,7 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
@@ -2548,16 +2540,16 @@
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -2582,7 +2574,7 @@
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -2590,7 +2582,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -2907,8 +2899,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3022,8 +3014,9 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+{ 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; }
@@ -3065,8 +3058,8 @@
 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 compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3123,9 +3116,9 @@
     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.
+as_fn_error "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
     fi
   fi
 fi
@@ -3176,8 +3169,8 @@
 
 { { $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 compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -3440,7 +3433,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -3456,11 +3449,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -3499,7 +3492,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -3515,18 +3508,18 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 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 $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -3587,7 +3580,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
@@ -3653,7 +3646,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -3785,7 +3778,8 @@
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -4157,8 +4151,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4965,11 +4959,11 @@
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+    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 ;;
+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -4991,7 +4985,7 @@
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" "$LINENO" 5
    fi
 
@@ -5001,7 +4995,7 @@
    # Ok.
    :
 else
-   as_fn_error $? "newly created file is older than distributed files!
+   as_fn_error "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -5239,7 +5233,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -5247,7 +5241,7 @@
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -5343,7 +5337,7 @@
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -5359,7 +5353,7 @@
 
 # Define the identity of the package.
  PACKAGE='libsocialweb'
- VERSION='0.25.5'
+ VERSION='0.25.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5623,7 +5617,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
   fi
 else
   ac_cv_path_SED=$SED
@@ -5702,7 +5696,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_FGREP=$FGREP
@@ -5818,7 +5812,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -6020,13 +6014,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6023: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6017: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6026: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6020: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6029: output\"" >&5)
+  (eval echo "\"\$as_me:6023: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7231,7 +7225,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7234 "configure"' > conftest.$ac_ext
+  echo '#line 7228 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8492,11 +8486,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8495: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8489: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8499: \$? = $ac_status" >&5
+   echo "$as_me:8493: \$? = $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.
@@ -8831,11 +8825,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8834: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8828: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8838: \$? = $ac_status" >&5
+   echo "$as_me:8832: \$? = $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.
@@ -8936,11 +8930,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8939: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8933: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8943: \$? = $ac_status" >&5
+   echo "$as_me:8937: \$? = $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
@@ -8991,11 +8985,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8994: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8988: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8998: \$? = $ac_status" >&5
+   echo "$as_me:8992: \$? = $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
@@ -11375,7 +11369,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11378 "configure"
+#line 11372 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11471,7 +11465,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11474 "configure"
+#line 11468 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11717,7 +11711,7 @@
 fi
 set dummy $CC; ac_cc=`$as_echo "$2" |
 		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12181,7 +12175,7 @@
      GLIB_GENMARSHAL=""
      GOBJECT_QUERY=""
      GLIB_MKENUMS=""
-     as_fn_error $? "glib-2.0 is required" "$LINENO" 5
+     as_fn_error "glib-2.0 is required" "$LINENO" 5
   fi
 
 
@@ -12218,7 +12212,7 @@
 
 case "$am__api_version" in
     1.01234)
-	as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+	as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
     ;;
     *)
     ;;
@@ -12235,7 +12229,7 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	as_fn_error $? "Your intltool is too old.  You need intltool 0.40 or later." "$LINENO" 5
+	as_fn_error "Your intltool is too old.  You need intltool 0.40 or later." "$LINENO" 5
 fi
 
 # Extract the first word of "intltool-update", so it can be a program name with args.
@@ -12359,7 +12353,7 @@
 
 
 if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
+    as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
 fi
 
   INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -12641,13 +12635,13 @@
 
 
 if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
+    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
 fi
 xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
 mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
 mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
 if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
+    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
 fi
 
 # Extract the first word of "perl", so it can be a program name with args.
@@ -12691,13 +12685,13 @@
 
 
 if test -z "$INTLTOOL_PERL"; then
-   as_fn_error $? "perl not found" "$LINENO" 5
+   as_fn_error "perl not found" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
 $as_echo_n "checking for perl >= 5.8.1... " >&6; }
 $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
 if test $? -ne 0; then
-   as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
+   as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
 else
    IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
@@ -12710,7 +12704,7 @@
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
    else
-       as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
+       as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
    fi
 fi
 
@@ -13630,7 +13624,7 @@
   test $ac_status = 0; }; then
   :
 else
-  as_fn_error $? "You need to have gtk-doc >= 1.15 installed to build $PACKAGE_NAME" "$LINENO" 5
+  as_fn_error "You need to have gtk-doc >= 1.15 installed to build $PACKAGE_NAME" "$LINENO" 5
 fi
   fi
 
@@ -13804,7 +13798,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$GLIB_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (glib-2.0 >= 2.14) were not met:
+	as_fn_error "Package requirements (glib-2.0 >= 2.14) were not met:
 
 $GLIB_PKG_ERRORS
 
@@ -13819,7 +13813,7 @@
 $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
+as_fn_error "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.
 
@@ -13828,7 +13822,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
 	GLIB_LIBS=$pkg_cv_GLIB_LIBS
@@ -13893,7 +13887,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$GIO_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gio-2.0) were not met:
+	as_fn_error "Package requirements (gio-2.0) were not met:
 
 $GIO_PKG_ERRORS
 
@@ -13908,7 +13902,7 @@
 $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
+as_fn_error "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.
 
@@ -13917,7 +13911,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	GIO_CFLAGS=$pkg_cv_GIO_CFLAGS
 	GIO_LIBS=$pkg_cv_GIO_LIBS
@@ -13982,7 +13976,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$GOBJECT_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gobject-2.0 >= 2.14) were not met:
+	as_fn_error "Package requirements (gobject-2.0 >= 2.14) were not met:
 
 $GOBJECT_PKG_ERRORS
 
@@ -13997,7 +13991,7 @@
 $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
+as_fn_error "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.
 
@@ -14006,7 +14000,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	GOBJECT_CFLAGS=$pkg_cv_GOBJECT_CFLAGS
 	GOBJECT_LIBS=$pkg_cv_GOBJECT_LIBS
@@ -14071,7 +14065,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$GCONF_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gconf-2.0) were not met:
+	as_fn_error "Package requirements (gconf-2.0) were not met:
 
 $GCONF_PKG_ERRORS
 
@@ -14086,7 +14080,7 @@
 $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
+as_fn_error "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.
 
@@ -14095,7 +14089,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS
 	GCONF_LIBS=$pkg_cv_GCONF_LIBS
@@ -14160,7 +14154,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$SOUP_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libsoup-2.4 gthread-2.0) were not met:
+	as_fn_error "Package requirements (libsoup-2.4 gthread-2.0) were not met:
 
 $SOUP_PKG_ERRORS
 
@@ -14175,7 +14169,7 @@
 $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
+as_fn_error "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.
 
@@ -14184,7 +14178,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	SOUP_CFLAGS=$pkg_cv_SOUP_CFLAGS
 	SOUP_LIBS=$pkg_cv_SOUP_LIBS
@@ -14249,7 +14243,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$DBUS_GLIB_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (dbus-glib-1) were not met:
+	as_fn_error "Package requirements (dbus-glib-1) were not met:
 
 $DBUS_GLIB_PKG_ERRORS
 
@@ -14264,7 +14258,7 @@
 $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
+as_fn_error "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.
 
@@ -14273,7 +14267,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	DBUS_GLIB_CFLAGS=$pkg_cv_DBUS_GLIB_CFLAGS
 	DBUS_GLIB_LIBS=$pkg_cv_DBUS_GLIB_LIBS
@@ -14338,7 +14332,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$REST_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (rest-0.7 rest-extras-0.7 >= 0.7.1) were not met:
+	as_fn_error "Package requirements (rest-0.7 rest-extras-0.7 >= 0.7.1) were not met:
 
 $REST_PKG_ERRORS
 
@@ -14353,7 +14347,7 @@
 $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
+as_fn_error "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.
 
@@ -14362,7 +14356,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	REST_CFLAGS=$pkg_cv_REST_CFLAGS
 	REST_LIBS=$pkg_cv_REST_LIBS
@@ -14427,7 +14421,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$KEYRING_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gnome-keyring-1) were not met:
+	as_fn_error "Package requirements (gnome-keyring-1) were not met:
 
 $KEYRING_PKG_ERRORS
 
@@ -14442,7 +14436,7 @@
 $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
+as_fn_error "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.
 
@@ -14451,7 +14445,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	KEYRING_CFLAGS=$pkg_cv_KEYRING_CFLAGS
 	KEYRING_LIBS=$pkg_cv_KEYRING_LIBS
@@ -14516,7 +14510,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$JSON_GLIB_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (json-glib-1.0) were not met:
+	as_fn_error "Package requirements (json-glib-1.0) were not met:
 
 $JSON_GLIB_PKG_ERRORS
 
@@ -14531,7 +14525,7 @@
 $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
+as_fn_error "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.
 
@@ -14540,7 +14534,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	JSON_GLIB_CFLAGS=$pkg_cv_JSON_GLIB_CFLAGS
 	JSON_GLIB_LIBS=$pkg_cv_JSON_GLIB_LIBS
@@ -14638,7 +14632,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$NM_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libnm-glib >= 0.7) were not met:
+	as_fn_error "Package requirements (libnm-glib >= 0.7) were not met:
 
 $NM_PKG_ERRORS
 
@@ -14653,7 +14647,7 @@
 $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
+as_fn_error "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.
 
@@ -14662,7 +14656,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	NM_CFLAGS=$pkg_cv_NM_CFLAGS
 	NM_LIBS=$pkg_cv_NM_LIBS
@@ -14735,7 +14729,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTK_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gtk+-2.0) were not met:
+	as_fn_error "Package requirements (gtk+-2.0) were not met:
 
 $GTK_PKG_ERRORS
 
@@ -14750,7 +14744,7 @@
 $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
+as_fn_error "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.
 
@@ -14759,7 +14753,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
 	GTK_LIBS=$pkg_cv_GTK_LIBS
@@ -14772,7 +14766,7 @@
 
          ;; #(
   *) :
-    as_fn_error $? "Unknown argument \"$with_online\" to --with-online" "$LINENO" 5
+    as_fn_error "Unknown argument \"$with_online\" to --with-online" "$LINENO" 5
  ;;
 esac
 
@@ -14851,7 +14845,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$SOUP_GNOME_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libsoup-gnome-2.4 >= 2.25.1) were not met:
+	as_fn_error "Package requirements (libsoup-gnome-2.4 >= 2.25.1) were not met:
 
 $SOUP_GNOME_PKG_ERRORS
 
@@ -14866,7 +14860,7 @@
 $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
+as_fn_error "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.
 
@@ -14875,7 +14869,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	SOUP_GNOME_CFLAGS=$pkg_cv_SOUP_GNOME_CFLAGS
 	SOUP_GNOME_LIBS=$pkg_cv_SOUP_GNOME_LIBS
@@ -15187,7 +15181,6 @@
 
 ac_libobjs=
 ac_ltlibobjs=
-U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -15203,11 +15196,11 @@
 
 
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
+  as_fn_error "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
  if test -n "$EXEEXT"; then
@@ -15223,43 +15216,43 @@
 
 
 if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined.
+  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.
+  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.
+  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.
+  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.
+  as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${WITH_FLICKR_TRUE}" && test -z "${WITH_FLICKR_FALSE}"; then
-  as_fn_error $? "conditional \"WITH_FLICKR\" was never defined.
+  as_fn_error "conditional \"WITH_FLICKR\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${WITH_LASTFM_TRUE}" && test -z "${WITH_LASTFM_FALSE}"; then
-  as_fn_error $? "conditional \"WITH_LASTFM\" was never defined.
+  as_fn_error "conditional \"WITH_LASTFM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${WITH_TWITTER_TRUE}" && test -z "${WITH_TWITTER_FALSE}"; then
-  as_fn_error $? "conditional \"WITH_TWITTER\" was never defined.
+  as_fn_error "conditional \"WITH_TWITTER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${WITH_VIMEO_TRUE}" && test -z "${WITH_VIMEO_FALSE}"; then
-  as_fn_error $? "conditional \"WITH_VIMEO\" was never defined.
+  as_fn_error "conditional \"WITH_VIMEO\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${GCOV_ENABLED_TRUE}" && test -z "${GCOV_ENABLED_FALSE}"; then
-  as_fn_error $? "conditional \"GCOV_ENABLED\" was never defined.
+  as_fn_error "conditional \"GCOV_ENABLED\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -15409,19 +15402,19 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
   fi
-  $as_echo "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $1" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -15617,7 +15610,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -15670,8 +15663,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libsocialweb $as_me 0.25.5, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+This file was extended by libsocialweb $as_me 0.25.6, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -15737,11 +15730,11 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libsocialweb config.status 0.25.5
-configured by $0, generated by GNU Autoconf 2.67,
+libsocialweb config.status 0.25.6
+configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -15759,16 +15752,11 @@
 while test $# != 0
 do
   case $1 in
-  --*=?*)
+  --*=*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -15790,7 +15778,6 @@
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -15803,7 +15790,7 @@
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
+    as_fn_error "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -15812,7 +15799,7 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
+  -*) as_fn_error "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -16153,7 +16140,7 @@
     "libsocialweb-keystore.pc") CONFIG_FILES="$CONFIG_FILES libsocialweb-keystore.pc" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -16191,7 +16178,7 @@
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -16208,7 +16195,7 @@
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
+  ac_cs_awk_cr='\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
@@ -16222,18 +16209,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -16322,28 +16309,20 @@
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
 s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -16371,7 +16350,7 @@
   if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -16456,7 +16435,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -16469,7 +16448,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -16497,7 +16476,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -16524,7 +16503,7 @@
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -16661,22 +16640,22 @@
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
+which seems to be undefined.  Please make sure it is defined." >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
+which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -16687,19 +16666,19 @@
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
     } >"$tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+      || as_fn_error "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
+      || as_fn_error "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -17479,7 +17458,7 @@
       esac ;;
     "po/stamp-it":C)
     if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
-       as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
+       as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
     fi
     rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
     >"po/stamp-it.tmp"
@@ -17507,7 +17486,7 @@
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -17528,7 +17507,7 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
+  $ac_cs_success || as_fn_exit $?
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
--- configure.ac
+++ configure.ac
@@ -1,6 +1,6 @@
 m4_define([api_major], [0])
 m4_define([api_minor], [25])
-m4_define([api_micro], [5])
+m4_define([api_micro], [6])
 m4_define([sw_version], [api_major.api_minor.api_micro])
 
 AC_PREREQ([2.63])
--- docs/libsocialweb-client/html/SwClient.html
+++ docs/libsocialweb-client/html/SwClient.html
@@ -45,25 +45,25 @@
                     <a class="link" href="SwClient.html#SwClientClass" title="SwClientClass">SwClientClass</a>;
 <a class="link" href="SwClient.html" title="SwClient"><span class="returnvalue">SwClient</span></a> *          <a class="link" href="SwClient.html#sw-client-new" title="sw_client_new ()">sw_client_new</a>                       (<em class="parameter"><code><span class="type">void</span></code></em>);
 <span class="returnvalue">void</span>                (<a class="link" href="SwClient.html#SwClientIsOnlineCallback" title="SwClientIsOnlineCallback ()">*SwClientIsOnlineCallback</a>)         (<em class="parameter"><code><a class="link" href="SwClient.html" title="SwClient"><span class="type">SwClient</span></a> *client</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> online</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> online</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
 <span class="returnvalue">void</span>                (<a class="link" href="SwClient.html#SwClientGetServicesCallback" title="SwClientGetServicesCallback ()">*SwClientGetServicesCallback</a>)      (<em class="parameter"><code><a class="link" href="SwClient.html" title="SwClient"><span class="type">SwClient</span></a> *client</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *services</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *services</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="SwClient.html#sw-client-get-services" title="sw_client_get_services ()">sw_client_get_services</a>              (<em class="parameter"><code><a class="link" href="SwClient.html" title="SwClient"><span class="type">SwClient</span></a> *client</code></em>,
                                                          <em class="parameter"><code><a class="link" href="SwClient.html#SwClientGetServicesCallback" title="SwClientGetServicesCallback ()"><span class="type">SwClientGetServicesCallback</span></a> cb</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
 <a class="link" href="SwClientService.html" title="SwClientService"><span class="returnvalue">SwClientService</span></a> *   <a class="link" href="SwClient.html#sw-client-get-service" title="sw_client_get_service ()">sw_client_get_service</a>               (<em class="parameter"><code><a class="link" href="SwClient.html" title="SwClient"><span class="type">SwClient</span></a> *client</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *service_name</code></em>);
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *service_name</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="SwClient.html#sw-client-is-online" title="sw_client_is_online ()">sw_client_is_online</a>                 (<em class="parameter"><code><a class="link" href="SwClient.html" title="SwClient"><span class="type">SwClient</span></a> *client</code></em>,
                                                          <em class="parameter"><code><a class="link" href="SwClient.html#SwClientIsOnlineCallback" title="SwClientIsOnlineCallback ()"><span class="type">SwClientIsOnlineCallback</span></a> cb</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Object Hierarchy">
 <a name="SwClient.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>
    +----SwClient
 </pre>
 </div>
@@ -99,35 +99,35 @@
 <div class="refsect2" title="SwClientIsOnlineCallback ()">
 <a name="SwClientIsOnlineCallback"></a><h3>SwClientIsOnlineCallback ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                (*SwClientIsOnlineCallback)         (<em class="parameter"><code><a class="link" href="SwClient.html" title="SwClient"><span class="type">SwClient</span></a> *client</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> online</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> online</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="SwClientGetServicesCallback ()">
 <a name="SwClientGetServicesCallback"></a><h3>SwClientGetServicesCallback ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                (*SwClientGetServicesCallback)      (<em class="parameter"><code><a class="link" href="SwClient.html" title="SwClient"><span class="type">SwClient</span></a> *client</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *services</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *services</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_client_get_services ()">
 <a name="sw-client-get-services"></a><h3>sw_client_get_services ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                sw_client_get_services              (<em class="parameter"><code><a class="link" href="SwClient.html" title="SwClient"><span class="type">SwClient</span></a> *client</code></em>,
                                                          <em class="parameter"><code><a class="link" href="SwClient.html#SwClientGetServicesCallback" title="SwClientGetServicesCallback ()"><span class="type">SwClientGetServicesCallback</span></a> cb</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_client_get_service ()">
 <a name="sw-client-get-service"></a><h3>sw_client_get_service ()</h3>
 <pre class="programlisting"><a class="link" href="SwClientService.html" title="SwClientService"><span class="returnvalue">SwClientService</span></a> *   sw_client_get_service               (<em class="parameter"><code><a class="link" href="SwClient.html" title="SwClient"><span class="type">SwClient</span></a> *client</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *service_name</code></em>);</pre>
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *service_name</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_client_is_online ()">
 <a name="sw-client-is-online"></a><h3>sw_client_is_online ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                sw_client_is_online                 (<em class="parameter"><code><a class="link" href="SwClient.html" title="SwClient"><span class="type">SwClient</span></a> *client</code></em>,
                                                          <em class="parameter"><code><a class="link" href="SwClient.html#SwClientIsOnlineCallback" title="SwClientIsOnlineCallback ()"><span class="type">SwClientIsOnlineCallback</span></a> cb</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
 </div>
 </div>
 <div class="refsect1" title="Signal Details">
@@ -135,8 +135,8 @@
 <div class="refsect2" title='The "online-changed" signal'>
 <a name="SwClient-online-changed"></a><h3>The <code class="literal">"online-changed"</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="SwClient.html" title="SwClient"><span class="type">SwClient</span></a> *swclient,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>  arg1,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>  user_data)      : Run First</pre>
+                                                        <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</pre>
 </div>
 </div>
 </div>
--- docs/libsocialweb-client/html/SwClientItemView.html
+++ docs/libsocialweb-client/html/SwClientItemView.html
@@ -52,14 +52,14 @@
 <div class="refsect1" title="Object Hierarchy">
 <a name="SwClientItemView.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>
    +----SwClientItemView
 </pre>
 </div>
 <div class="refsect1" title="Properties">
 <a name="SwClientItemView.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
-  "<a class="link" href="SwClientItemView.html#SwClientItemView--object-path" title='The "object-path" property'>object-path</a>"              <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write / Construct Only
+  "<a class="link" href="SwClientItemView.html#SwClientItemView--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>*                : Read / Write / Construct Only
 </pre>
 </div>
 <div class="refsect1" title="Signals">
@@ -105,7 +105,7 @@
 <a name="SwClientItemView.property-details"></a><h2>Property Details</h2>
 <div class="refsect2" title='The "object-path" property'>
 <a name="SwClientItemView--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"><span class="type">gchar</span></a>*                : Read / 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>*                : Read / Write / Construct Only</pre>
 <p>DBUS path to the item_view's object.</p>
 <p>Default value: NULL</p>
 </div>
@@ -115,22 +115,22 @@
 <div class="refsect2" title='The "items-added" signal'>
 <a name="SwClientItemView-items-added"></a><h3>The <code class="literal">"items-added"</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="SwClientItemView.html" title="SwClientItemView"><span class="type">SwClientItemView</span></a> *swclientitemview,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          arg1,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          user_data)             : Run First</pre>
+                                                        <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 First</pre>
 </div>
 <hr>
 <div class="refsect2" title='The "items-changed" signal'>
 <a name="SwClientItemView-items-changed"></a><h3>The <code class="literal">"items-changed"</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="SwClientItemView.html" title="SwClientItemView"><span class="type">SwClientItemView</span></a> *swclientitemview,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          arg1,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          user_data)             : Run First</pre>
+                                                        <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 First</pre>
 </div>
 <hr>
 <div class="refsect2" title='The "items-removed" signal'>
 <a name="SwClientItemView-items-removed"></a><h3>The <code class="literal">"items-removed"</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="SwClientItemView.html" title="SwClientItemView"><span class="type">SwClientItemView</span></a> *swclientitemview,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          arg1,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>          user_data)             : Run First</pre>
+                                                        <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 First</pre>
 </div>
 </div>
 </div>
--- docs/libsocialweb-client/html/SwClientLastfm.html
+++ docs/libsocialweb-client/html/SwClientLastfm.html
@@ -46,25 +46,25 @@
                                                          <em class="parameter"><code>const <span class="type">char</span> *artist</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *album</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *track</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> length</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> tracknumber</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> length</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> tracknumber</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *musicbrainz_id</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="SwClientLastfm.html#sw-client-lastfm-submit-track" title="sw_client_lastfm_submit_track ()">sw_client_lastfm_submit_track</a>       (<em class="parameter"><code><a class="link" href="SwClientLastfm.html" title="SwClientLastfm"><span class="type">SwClientLastfm</span></a> *lastfm</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *artist</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *album</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *track</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> time</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> time</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *source</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *rating</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> length</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> tracknumber</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> length</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> tracknumber</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *musicbrainz_id</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Object Hierarchy">
 <a name="SwClientLastfm.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>
    +----SwClientLastfm
 </pre>
 </div>
@@ -97,8 +97,8 @@
                                                          <em class="parameter"><code>const <span class="type">char</span> *artist</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *album</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *track</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> length</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> tracknumber</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> length</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> tracknumber</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *musicbrainz_id</code></em>);</pre>
 </div>
 <hr>
@@ -108,11 +108,11 @@
                                                          <em class="parameter"><code>const <span class="type">char</span> *artist</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *album</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *track</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> time</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> time</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *source</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *rating</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> length</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> tracknumber</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> length</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> tracknumber</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *musicbrainz_id</code></em>);</pre>
 </div>
 </div>
--- docs/libsocialweb-client/html/SwClientService.html
+++ docs/libsocialweb-client/html/SwClientService.html
@@ -53,55 +53,55 @@
 <span class="returnvalue">void</span>                (<a class="link" href="SwClientService.html#SwClientServiceGetCapabilitiesCallback" title="SwClientServiceGetCapabilitiesCallback ()">*SwClientServiceGetCapabilitiesCallback</a>)
                                                         (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *service</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> **caps</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="SwClientService.html#sw-client-service-get-static-capabilities" title="sw_client_service_get_static_capabilities ()">sw_client_service_get_static_capabilities</a>
                                                         (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *service</code></em>,
                                                          <em class="parameter"><code><a class="link" href="SwClientService.html#SwClientServiceGetCapabilitiesCallback" title="SwClientServiceGetCapabilitiesCallback ()"><span class="type">SwClientServiceGetCapabilitiesCallback</span></a> cb</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="SwClientService.html#sw-client-service-get-dynamic-capabilities" title="sw_client_service_get_dynamic_capabilities ()">sw_client_service_get_dynamic_capabilities</a>
                                                         (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *service</code></em>,
                                                          <em class="parameter"><code><a class="link" href="SwClientService.html#SwClientServiceGetCapabilitiesCallback" title="SwClientServiceGetCapabilitiesCallback ()"><span class="type">SwClientServiceGetCapabilitiesCallback</span></a> cb</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="SwClientService.html#sw-client-service-request-avatar" title="sw_client_service_request_avatar ()">sw_client_service_request_avatar</a>    (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *service</code></em>);
 <span class="returnvalue">void</span>                (<a class="link" href="SwClientService.html#SwClientServiceUpdateStatusCallback" title="SwClientServiceUpdateStatusCallback ()">*SwClientServiceUpdateStatusCallback</a>)
                                                         (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *service</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="SwClientService.html#sw-client-service-credentials-updated" title="sw_client_service_credentials_updated ()">sw_client_service_credentials_updated</a>
                                                         (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *service</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="SwClientService.html#sw-client-service-update-status" title="sw_client_service_update_status ()">sw_client_service_update_status</a>     (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *service</code></em>,
                                                          <em class="parameter"><code><a class="link" href="SwClientService.html#SwClientServiceUpdateStatusCallback" title="SwClientServiceUpdateStatusCallback ()"><span class="type">SwClientServiceUpdateStatusCallback</span></a> cb</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *status_msg</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *status_msg</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="SwClientService.html#sw-client-service-update-status-with-fields" title="sw_client_service_update_status_with_fields ()">sw_client_service_update_status_with_fields</a>
                                                         (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *service</code></em>,
                                                          <em class="parameter"><code><a class="link" href="SwClientService.html#SwClientServiceUpdateStatusCallback" title="SwClientServiceUpdateStatusCallback ()"><span class="type">SwClientServiceUpdateStatusCallback</span></a> cb</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *status_msg</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *fields</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *status_msg</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> *fields</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
 <span class="returnvalue">void</span>                (<a class="link" href="SwClientService.html#SwClientServiceQueryOpenViewCallback" title="SwClientServiceQueryOpenViewCallback ()">*SwClientServiceQueryOpenViewCallback</a>)
                                                         (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *query</code></em>,
                                                          <em class="parameter"><code><a class="link" href="SwClientItemView.html" title="SwClientItemView"><span class="type">SwClientItemView</span></a> *item_view</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="SwClientService.html#sw-client-service-query-open-view" title="sw_client_service_query_open_view ()">sw_client_service_query_open_view</a>   (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *service</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *query</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *params</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *query</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> *params</code></em>,
                                                          <em class="parameter"><code><a class="link" href="SwClientService.html#SwClientServiceQueryOpenViewCallback" title="SwClientServiceQueryOpenViewCallback ()"><span class="type">SwClientServiceQueryOpenViewCallback</span></a> cb</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="SwClientService.html#sw-client-service-banishable-hide-item" title="sw_client_service_banishable_hide_item ()">sw_client_service_banishable_hide_item</a>
                                                         (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *service</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *uid</code></em>);
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *uid</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="SwClientService.html#sw-client-service-get-name" title="sw_client_service_get_name ()">sw_client_service_get_name</a>          (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *service</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="SwClientService.html#sw-client-service-get-display-name" title="sw_client_service_get_display_name ()">sw_client_service_get_display_name</a>  (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *service</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="SwClientService.html#sw-client-service-has-cap" title="sw_client_service_has_cap ()">sw_client_service_has_cap</a>           (<em class="parameter"><code>const <span class="type">char</span> **caps</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="SwClientService.html#sw-client-service-has-cap" title="sw_client_service_has_cap ()">sw_client_service_has_cap</a>           (<em class="parameter"><code>const <span class="type">char</span> **caps</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *cap</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Object Hierarchy">
 <a name="SwClientService.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>
    +----SwClientService
 </pre>
 </div>
@@ -183,8 +183,8 @@
 <pre class="programlisting"><span class="returnvalue">void</span>                (*SwClientServiceGetCapabilitiesCallback)
                                                         (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *service</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> **caps</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_client_service_get_static_capabilities ()">
@@ -192,7 +192,7 @@
 <pre class="programlisting"><span class="returnvalue">void</span>                sw_client_service_get_static_capabilities
                                                         (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *service</code></em>,
                                                          <em class="parameter"><code><a class="link" href="SwClientService.html#SwClientServiceGetCapabilitiesCallback" title="SwClientServiceGetCapabilitiesCallback ()"><span class="type">SwClientServiceGetCapabilitiesCallback</span></a> cb</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_client_service_get_dynamic_capabilities ()">
@@ -200,7 +200,7 @@
 <pre class="programlisting"><span class="returnvalue">void</span>                sw_client_service_get_dynamic_capabilities
                                                         (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *service</code></em>,
                                                          <em class="parameter"><code><a class="link" href="SwClientService.html#SwClientServiceGetCapabilitiesCallback" title="SwClientServiceGetCapabilitiesCallback ()"><span class="type">SwClientServiceGetCapabilitiesCallback</span></a> cb</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_client_service_request_avatar ()">
@@ -212,8 +212,8 @@
 <a name="SwClientServiceUpdateStatusCallback"></a><h3>SwClientServiceUpdateStatusCallback ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                (*SwClientServiceUpdateStatusCallback)
                                                         (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *service</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_client_service_credentials_updated ()">
@@ -226,8 +226,8 @@
 <a name="sw-client-service-update-status"></a><h3>sw_client_service_update_status ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                sw_client_service_update_status     (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *service</code></em>,
                                                          <em class="parameter"><code><a class="link" href="SwClientService.html#SwClientServiceUpdateStatusCallback" title="SwClientServiceUpdateStatusCallback ()"><span class="type">SwClientServiceUpdateStatusCallback</span></a> cb</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *status_msg</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *status_msg</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_client_service_update_status_with_fields ()">
@@ -235,9 +235,9 @@
 <pre class="programlisting"><span class="returnvalue">void</span>                sw_client_service_update_status_with_fields
                                                         (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *service</code></em>,
                                                          <em class="parameter"><code><a class="link" href="SwClientService.html#SwClientServiceUpdateStatusCallback" title="SwClientServiceUpdateStatusCallback ()"><span class="type">SwClientServiceUpdateStatusCallback</span></a> cb</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *status_msg</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *fields</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *status_msg</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> *fields</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="SwClientServiceQueryOpenViewCallback ()">
@@ -245,23 +245,23 @@
 <pre class="programlisting"><span class="returnvalue">void</span>                (*SwClientServiceQueryOpenViewCallback)
                                                         (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *query</code></em>,
                                                          <em class="parameter"><code><a class="link" href="SwClientItemView.html" title="SwClientItemView"><span class="type">SwClientItemView</span></a> *item_view</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_client_service_query_open_view ()">
 <a name="sw-client-service-query-open-view"></a><h3>sw_client_service_query_open_view ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                sw_client_service_query_open_view   (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *service</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *query</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *params</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *query</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> *params</code></em>,
                                                          <em class="parameter"><code><a class="link" href="SwClientService.html#SwClientServiceQueryOpenViewCallback" title="SwClientServiceQueryOpenViewCallback ()"><span class="type">SwClientServiceQueryOpenViewCallback</span></a> cb</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> userdata</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_client_service_banishable_hide_item ()">
 <a name="sw-client-service-banishable-hide-item"></a><h3>sw_client_service_banishable_hide_item ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                sw_client_service_banishable_hide_item
                                                         (<em class="parameter"><code><a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *service</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *uid</code></em>);</pre>
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *uid</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_client_service_get_name ()">
@@ -276,7 +276,7 @@
 <hr>
 <div class="refsect2" title="sw_client_service_has_cap ()">
 <a name="sw-client-service-has-cap"></a><h3>sw_client_service_has_cap ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_client_service_has_cap           (<em class="parameter"><code>const <span class="type">char</span> **caps</code></em>,
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_client_service_has_cap           (<em class="parameter"><code>const <span class="type">char</span> **caps</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *cap</code></em>);</pre>
 </div>
 </div>
@@ -285,28 +285,28 @@
 <div class="refsect2" title='The "avatar-retrieved" signal'>
 <a name="SwClientService-avatar-retrieved"></a><h3>The <code class="literal">"avatar-retrieved"</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *swclientservice,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>           *arg1,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>         user_data)            : Run First</pre>
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</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</pre>
 </div>
 <hr>
 <div class="refsect2" title='The "capabilities-changed" signal'>
 <a name="SwClientService-capabilities-changed"></a><h3>The <code class="literal">"capabilities-changed"</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *swclientservice,
-                                                        <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Boxed-Types.html#GStrv"><span class="type">GStrv</span></a>           *arg1,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>         user_data)            : Run First</pre>
+                                                        <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html#GStrv"><span class="type">GStrv</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</pre>
 </div>
 <hr>
 <div class="refsect2" title='The "status-updated" signal'>
 <a name="SwClientService-status-updated"></a><h3>The <code class="literal">"status-updated"</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *swclientservice,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>         arg1,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>         user_data)            : Run First</pre>
+                                                        <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</pre>
 </div>
 <hr>
 <div class="refsect2" title='The "user-changed" signal'>
 <a name="SwClientService-user-changed"></a><h3>The <code class="literal">"user-changed"</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="SwClientService.html" title="SwClientService"><span class="type">SwClientService</span></a> *swclientservice,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>         user_data)            : Run First</pre>
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>         user_data)            : Run First</pre>
 </div>
 </div>
 </div>
--- docs/libsocialweb-client/html/ch01.html
+++ docs/libsocialweb-client/html/ch01.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter" title="libsocialweb-client">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id353713"></a>libsocialweb-client</h2></div></div></div>
+<a name="id415493"></a>libsocialweb-client</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="SwClient.html">SwClient</a></span><span class="refpurpose"></span>
--- docs/libsocialweb-client/html/libsocialweb-client-sw-item.html
+++ docs/libsocialweb-client/html/libsocialweb-client-sw-item.html
@@ -43,12 +43,12 @@
 <a class="link" href="libsocialweb-client-sw-item.html#SwItem" title="SwItem"><span class="returnvalue">SwItem</span></a> *            <a class="link" href="libsocialweb-client-sw-item.html#sw-item-ref" title="sw_item_ref ()">sw_item_ref</a>                         (<em class="parameter"><code><a class="link" href="libsocialweb-client-sw-item.html#SwItem" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libsocialweb-client-sw-item.html#sw-item-free" title="sw_item_free ()">sw_item_free</a>                        (<em class="parameter"><code><a class="link" href="libsocialweb-client-sw-item.html#SwItem" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);
 <a class="link" href="libsocialweb-client-sw-item.html#SwItem" title="SwItem"><span class="returnvalue">SwItem</span></a> *            <a class="link" href="libsocialweb-client-sw-item.html#sw-item-new" title="sw_item_new ()">sw_item_new</a>                         (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libsocialweb-client-sw-item.html#sw-item-is-from-cache" title="sw_item_is_from_cache ()">sw_item_is_from_cache</a>               (<em class="parameter"><code><a class="link" href="libsocialweb-client-sw-item.html#SwItem" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libsocialweb-client-sw-item.html#sw-item-has-key" title="sw_item_has_key ()">sw_item_has_key</a>                     (<em class="parameter"><code><a class="link" href="libsocialweb-client-sw-item.html#SwItem" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       <a class="link" href="libsocialweb-client-sw-item.html#sw-item-get-value" title="sw_item_get_value ()">sw_item_get_value</a>                   (<em class="parameter"><code><a class="link" href="libsocialweb-client-sw-item.html#SwItem" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>);
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="libsocialweb-client-sw-item.html#sw-item-get-type" title="sw_item_get_type ()">sw_item_get_type</a>                    (<em class="parameter"><code><span class="type">void</span></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="libsocialweb-client-sw-item.html#sw-item-is-from-cache" title="sw_item_is_from_cache ()">sw_item_is_from_cache</a>               (<em class="parameter"><code><a class="link" href="libsocialweb-client-sw-item.html#SwItem" title="SwItem"><span class="type">SwItem</span></a> *item</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="libsocialweb-client-sw-item.html#sw-item-has-key" title="sw_item_has_key ()">sw_item_has_key</a>                     (<em class="parameter"><code><a class="link" href="libsocialweb-client-sw-item.html#SwItem" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>);
+const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       <a class="link" href="libsocialweb-client-sw-item.html#sw-item-get-value" title="sw_item_get_value ()">sw_item_get_value</a>                   (<em class="parameter"><code><a class="link" href="libsocialweb-client-sw-item.html#SwItem" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>);
+<a href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="libsocialweb-client-sw-item.html#sw-item-get-type" title="sw_item_get_type ()">sw_item_get_type</a>                    (<em class="parameter"><code><span class="type">void</span></code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Description">
@@ -96,24 +96,24 @@
 <hr>
 <div class="refsect2" title="sw_item_is_from_cache ()">
 <a name="sw-item-is-from-cache"></a><h3>sw_item_is_from_cache ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_item_is_from_cache               (<em class="parameter"><code><a class="link" href="libsocialweb-client-sw-item.html#SwItem" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_item_is_from_cache               (<em class="parameter"><code><a class="link" href="libsocialweb-client-sw-item.html#SwItem" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_item_has_key ()">
 <a name="sw-item-has-key"></a><h3>sw_item_has_key ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_item_has_key                     (<em class="parameter"><code><a class="link" href="libsocialweb-client-sw-item.html#SwItem" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_item_has_key                     (<em class="parameter"><code><a class="link" href="libsocialweb-client-sw-item.html#SwItem" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_item_get_value ()">
 <a name="sw-item-get-value"></a><h3>sw_item_get_value ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       sw_item_get_value                   (<em class="parameter"><code><a class="link" href="libsocialweb-client-sw-item.html#SwItem" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>);</pre>
+<pre class="programlisting">const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       sw_item_get_value                   (<em class="parameter"><code><a class="link" href="libsocialweb-client-sw-item.html#SwItem" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_item_get_type ()">
 <a name="sw-item-get-type"></a><h3>sw_item_get_type ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               sw_item_get_type                    (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               sw_item_get_type                    (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 </div>
 </div>
 </div>
--- docs/libsocialweb-client/html/object-tree.html
+++ docs/libsocialweb-client/html/object-tree.html
@@ -23,7 +23,7 @@
 <div class="titlepage"><div><div><h2 class="title">
 <a name="object-tree"></a>Object Hierarchy</h2></div></div></div>
 <pre class="screen">
-    <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>
         <a class="link" href="SwClient.html" title="SwClient">SwClient</a>
         <a class="link" href="SwClientItemView.html" title="SwClientItemView">SwClientItemView</a>
         <a class="link" href="SwClientLastfm.html" title="SwClientLastfm">SwClientLastfm</a>
--- docs/libsocialweb-dbus/html/Avatar.html
+++ docs/libsocialweb-dbus/html/Avatar.html
@@ -45,12 +45,12 @@
 </pre>
 </div>
 <div class="refsect1" title="Signals">
-<a name="id549220"></a><h2>Signals</h2>
+<a name="id519307"></a><h2>Signals</h2>
 <pre class="synopsis"><a href="Avatar.html#Avatar-AvatarRetrieved">AvatarRetrieved</a> ('s' path)
 </pre>
 </div>
 <div class="refsect1" title="Implemented Interfaces">
-<a name="id536062"></a><h2>Implemented Interfaces</h2>
+<a name="id503116"></a><h2>Implemented Interfaces</h2>
 <p>
     Objects implementing com.meego.libsocialweb.Avatar also implements
     org.freedesktop.DBus.Introspectable,
@@ -58,7 +58,7 @@
     </p>
 </div>
 <div class="refsect1" title="Description">
-<a name="id522181"></a><h2>Description</h2>
+<a name="id516209"></a><h2>Description</h2>
       An interface representing the functionality required to
         fetch the user's own avatar for an account.
     
@@ -70,18 +70,18 @@
           </p>
 </div>
 <div class="refsect1" title="Details">
-<a name="id552488"></a><h2>Details</h2>
+<a name="id525288"></a><h2>Details</h2>
 <div class="refsect2" title="RequestAvatar()">
-<a name="id559102"></a><h3>
-<a name="Avatar.RequestAvatar"></a><code class="function"><GTKDOCLINK HREF="RequestAvatar"><code class="function"><GTKDOCLINK HREF="RequestAvatar"><code class="function"><GTKDOCLINK HREF="RequestAvatar"><code class="function">RequestAvatar()</code></code></GTKDOCLINK></code></GTKDOCLINK></code></GTKDOCLINK>
+<a name="id519021"></a><h3>
+<a name="Avatar.RequestAvatar"></a><code class="function">RequestAvatar()</code>
 </h3>
 <pre class="programlisting">RequestAvatar ()</pre>
 </div>
 </div>
 <div class="refsect1" title="Signal Details">
-<a name="id552698"></a><h2>Signal Details</h2>
+<a name="id510088"></a><h2>Signal Details</h2>
 <div class="refsect2" title="The AvatarRetrieved signal">
-<a name="id549000"></a><h3>
+<a name="id532077"></a><h3>
 <a name="Avatar-AvatarRetrieved"></a>The AvatarRetrieved signal</h3>
 <pre class="programlisting">AvatarRetrieved ('s' path)</pre>
 <p>
--- docs/libsocialweb-dbus/html/Banishable.html
+++ docs/libsocialweb-dbus/html/Banishable.html
@@ -45,12 +45,12 @@
 </pre>
 </div>
 <div class="refsect1" title="Signals">
-<a name="id566772"></a><h2>Signals</h2>
+<a name="id490374"></a><h2>Signals</h2>
 <pre class="synopsis"><a href="Banishable.html#Banishable-ItemHidden">ItemHidden</a> ('s' uid)
 </pre>
 </div>
 <div class="refsect1" title="Implemented Interfaces">
-<a name="id566790"></a><h2>Implemented Interfaces</h2>
+<a name="id490394"></a><h2>Implemented Interfaces</h2>
 <p>
     Objects implementing com.meego.libsocialweb.Banishable also implements
     org.freedesktop.DBus.Introspectable,
@@ -58,14 +58,14 @@
     </p>
 </div>
 <div class="refsect1" title="Description">
-<a name="id566805"></a><h2>Description</h2>
+<a name="id490411"></a><h2>Description</h2>
       An interface for hiding items from a feed from a service.
     </div>
 <div class="refsect1" title="Details">
-<a name="id566814"></a><h2>Details</h2>
+<a name="id490421"></a><h2>Details</h2>
 <div class="refsect2" title="HideItem()">
-<a name="id566824"></a><h3>
-<a name="Banishable.HideItem"></a><code class="function"><GTKDOCLINK HREF="HideItem"><code class="function"><GTKDOCLINK HREF="HideItem"><code class="function"><GTKDOCLINK HREF="HideItem"><code class="function">HideItem()</code></code></GTKDOCLINK></code></GTKDOCLINK></code></GTKDOCLINK>
+<a name="id490432"></a><h3>
+<a name="Banishable.HideItem"></a><code class="function">HideItem()</code>
 </h3>
 <pre class="programlisting">HideItem (in  's' uid)</pre>
 <p>
@@ -84,9 +84,9 @@
 </div>
 </div>
 <div class="refsect1" title="Signal Details">
-<a name="id566879"></a><h2>Signal Details</h2>
+<a name="id535881"></a><h2>Signal Details</h2>
 <div class="refsect2" title="The ItemHidden signal">
-<a name="id566888"></a><h3>
+<a name="id535891"></a><h3>
 <a name="Banishable-ItemHidden"></a>The ItemHidden signal</h3>
 <pre class="programlisting">ItemHidden ('s' uid)</pre>
 <p>
--- docs/libsocialweb-dbus/html/ItemView.html
+++ docs/libsocialweb-dbus/html/ItemView.html
@@ -5,7 +5,7 @@
 <title>com.meego.libsocialweb.ItemView</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="index.html" title="libsocialweb DBus API Reference Manual">
-<link rel="up" href="ch01.html#id559087" title="Core Interfaces">
+<link rel="up" href="ch01.html#id510271" title="Core Interfaces">
 <link rel="prev" href="Service.html" title="com.meego.libsocialweb.Service">
 <link rel="next" href="ch01s02.html" title="Feature Interfaces">
 <meta name="generator" content="GTK-Doc V1.15 (XML mode)">
@@ -15,7 +15,7 @@
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
 <td><a accesskey="p" href="Service.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html#id559087"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="u" href="ch01.html#id510271"><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">libsocialweb DBus API Reference Manual</th>
 <td><a accesskey="n" href="ch01s02.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
@@ -48,14 +48,14 @@
 </pre>
 </div>
 <div class="refsect1" title="Signals">
-<a name="id559567"></a><h2>Signals</h2>
+<a name="id491346"></a><h2>Signals</h2>
 <pre class="synopsis"><a href="ItemView.html#ItemView-ItemsAdded">ItemsAdded</a>   ('a(ssxa{ss})' items)
 <a href="ItemView.html#ItemView-ItemsRemoved">ItemsRemoved</a> ('a(ss)'       items)
 <a href="ItemView.html#ItemView-ItemsChanged">ItemsChanged</a> ('a(ssxa{ss})' items)
 </pre>
 </div>
 <div class="refsect1" title="Implemented Interfaces">
-<a name="id521838"></a><h2>Implemented Interfaces</h2>
+<a name="id490924"></a><h2>Implemented Interfaces</h2>
 <p>
     Objects implementing com.meego.libsocialweb.ItemView also implements
     org.freedesktop.DBus.Introspectable,
@@ -63,43 +63,43 @@
     </p>
 </div>
 <div class="refsect1" title="Description">
-<a name="id521854"></a><h2>Description</h2>
+<a name="id490941"></a><h2>Description</h2>
 <p></p>
 </div>
 <div class="refsect1" title="Details">
-<a name="id521869"></a><h2>Details</h2>
+<a name="id490956"></a><h2>Details</h2>
 <div class="refsect2" title="Start()">
-<a name="id521879"></a><h3>
-<a name="ItemView.Start"></a><code class="function"><GTKDOCLINK HREF="Start"><code class="function"><GTKDOCLINK HREF="Start"><code class="function"><GTKDOCLINK HREF="Start"><code class="function">Start()</code></code></GTKDOCLINK></code></GTKDOCLINK></code></GTKDOCLINK>
+<a name="id490966"></a><h3>
+<a name="ItemView.Start"></a><code class="function">Start()</code>
 </h3>
 <pre class="programlisting">Start ()</pre>
 </div>
 <hr>
 <div class="refsect2" title="Refresh()">
-<a name="id521064"></a><h3>
-<a name="ItemView.Refresh"></a><code class="function"><GTKDOCLINK HREF="Refresh"><code class="function"><GTKDOCLINK HREF="Refresh"><code class="function"><GTKDOCLINK HREF="Refresh"><code class="function">Refresh()</code></code></GTKDOCLINK></code></GTKDOCLINK></code></GTKDOCLINK>
+<a name="id490999"></a><h3>
+<a name="ItemView.Refresh"></a><code class="function">Refresh()</code>
 </h3>
 <pre class="programlisting">Refresh ()</pre>
 </div>
 <hr>
 <div class="refsect2" title="Stop()">
-<a name="id521109"></a><h3>
-<a name="ItemView.Stop"></a><code class="function"><GTKDOCLINK HREF="Stop"><code class="function"><GTKDOCLINK HREF="Stop"><code class="function"><GTKDOCLINK HREF="Stop"><code class="function">Stop()</code></code></GTKDOCLINK></code></GTKDOCLINK></code></GTKDOCLINK>
+<a name="id491031"></a><h3>
+<a name="ItemView.Stop"></a><code class="function">Stop()</code>
 </h3>
 <pre class="programlisting">Stop ()</pre>
 </div>
 <hr>
 <div class="refsect2" title="Close()">
-<a name="id521155"></a><h3>
-<a name="ItemView.Close"></a><code class="function"><GTKDOCLINK HREF="Close"><code class="function"><GTKDOCLINK HREF="Close"><code class="function"><GTKDOCLINK HREF="Close"><code class="function">Close()</code></code></GTKDOCLINK></code></GTKDOCLINK></code></GTKDOCLINK>
+<a name="id491063"></a><h3>
+<a name="ItemView.Close"></a><code class="function">Close()</code>
 </h3>
 <pre class="programlisting">Close ()</pre>
 </div>
 </div>
 <div class="refsect1" title="Signal Details">
-<a name="id521202"></a><h2>Signal Details</h2>
+<a name="id491097"></a><h2>Signal Details</h2>
 <div class="refsect2" title="The ItemsAdded signal">
-<a name="id521212"></a><h3>
+<a name="id490192"></a><h3>
 <a name="ItemView-ItemsAdded"></a>The ItemsAdded signal</h3>
 <pre class="programlisting">ItemsAdded ('a(ssxa{ss})' items)</pre>
 <div class="variablelist"><table border="0">
@@ -112,7 +112,7 @@
 </div>
 <hr>
 <div class="refsect2" title="The ItemsRemoved signal">
-<a name="id521262"></a><h3>
+<a name="id490241"></a><h3>
 <a name="ItemView-ItemsRemoved"></a>The ItemsRemoved signal</h3>
 <pre class="programlisting">ItemsRemoved ('a(ss)' items)</pre>
 <div class="variablelist"><table border="0">
@@ -125,7 +125,7 @@
 </div>
 <hr>
 <div class="refsect2" title="The ItemsChanged signal">
-<a name="id521312"></a><h3>
+<a name="id490292"></a><h3>
 <a name="ItemView-ItemsChanged"></a>The ItemsChanged signal</h3>
 <pre class="programlisting">ItemsChanged ('a(ssxa{ss})' items)</pre>
 <div class="variablelist"><table border="0">
--- docs/libsocialweb-dbus/html/Lastfm.html
+++ docs/libsocialweb-dbus/html/Lastfm.html
@@ -56,7 +56,7 @@
 </pre>
 </div>
 <div class="refsect1" title="Implemented Interfaces">
-<a name="id567713"></a><h2>Implemented Interfaces</h2>
+<a name="id536642"></a><h2>Implemented Interfaces</h2>
 <p>
     Objects implementing com.meego.libsocialweb.Service.Lastfm also implements
     org.freedesktop.DBus.Introspectable,
@@ -64,14 +64,14 @@
     </p>
 </div>
 <div class="refsect1" title="Description">
-<a name="id567730"></a><h2>Description</h2>
+<a name="id536659"></a><h2>Description</h2>
 <p></p>
 </div>
 <div class="refsect1" title="Details">
-<a name="id567745"></a><h2>Details</h2>
+<a name="id536674"></a><h2>Details</h2>
 <div class="refsect2" title="NowPlaying()">
-<a name="id567755"></a><h3>
-<a name="Lastfm.NowPlaying"></a><code class="function"><GTKDOCLINK HREF="NowPlaying"><code class="function"><GTKDOCLINK HREF="NowPlaying"><code class="function"><GTKDOCLINK HREF="NowPlaying"><code class="function">NowPlaying()</code></code></GTKDOCLINK></code></GTKDOCLINK></code></GTKDOCLINK>
+<a name="id536684"></a><h3>
+<a name="Lastfm.NowPlaying"></a><code class="function">NowPlaying()</code>
 </h3>
 <pre class="programlisting">NowPlaying (in  's' artist,
             in  's' album,
@@ -111,8 +111,8 @@
 </div>
 <hr>
 <div class="refsect2" title="SubmitTrack()">
-<a name="id567904"></a><h3>
-<a name="Lastfm.SubmitTrack"></a><code class="function"><GTKDOCLINK HREF="SubmitTrack"><code class="function"><GTKDOCLINK HREF="SubmitTrack"><code class="function"><GTKDOCLINK HREF="SubmitTrack"><code class="function">SubmitTrack()</code></code></GTKDOCLINK></code></GTKDOCLINK></code></GTKDOCLINK>
+<a name="id536820"></a><h3>
+<a name="Lastfm.SubmitTrack"></a><code class="function">SubmitTrack()</code>
 </h3>
 <pre class="programlisting">SubmitTrack (in  's' artist,
              in  's' album,
--- docs/libsocialweb-dbus/html/PhotoUpload.html
+++ docs/libsocialweb-dbus/html/PhotoUpload.html
@@ -47,14 +47,14 @@
 </pre>
 </div>
 <div class="refsect1" title="Signals">
-<a name="id566958"></a><h2>Signals</h2>
+<a name="id535960"></a><h2>Signals</h2>
 <pre class="synopsis"><a href="PhotoUpload.html#PhotoUpload-PhotoUploadProgress">PhotoUploadProgress</a> ('i' opid,
                      'i' progress,
                      's' error_message)
 </pre>
 </div>
 <div class="refsect1" title="Implemented Interfaces">
-<a name="id566978"></a><h2>Implemented Interfaces</h2>
+<a name="id535981"></a><h2>Implemented Interfaces</h2>
 <p>
     Objects implementing com.meego.libsocialweb.PhotoUpload also implements
     org.freedesktop.DBus.Introspectable,
@@ -62,13 +62,13 @@
     </p>
 </div>
 <div class="refsect1" title="Description">
-<a name="id566995"></a><h2>Description</h2>
+<a name="id535998"></a><h2>Description</h2>
       An interface for uploading photos.
     </div>
 <div class="refsect1" title="Details">
-<a name="id567005"></a><h2>Details</h2>
+<a name="id536008"></a><h2>Details</h2>
 <div class="refsect2" title="UploadPhoto()">
-<a name="id567016"></a><h3>
+<a name="id536019"></a><h3>
 <a name="PhotoUpload.UploadPhoto"></a><code class="function">UploadPhoto()</code>
 </h3>
 <pre class="programlisting">UploadPhoto (in  's'     local_filename,
@@ -82,29 +82,9 @@
 <p>
             <em class="parameter"><code>fields</code></em> is a set of key-value pairs that are passed to the service.
             None of these are required and not all services support all of the
-            keys.  Generic keys are:
+            keys.  Defined keys include:
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p><span class="bold"><strong>title: </strong></span>The photo's title</p></li></ul></div>
-<p>
-            There are also service-specific keys for accessing features that
-            cannot be abstracted sufficiently.  These are prefixed with
-            "x-[service name]-" to avoid conflicts and make it clear that these
-            have specific semantics.  These are:
-          </p>
-<div class="itemizedlist"><ul class="itemizedlist" type="disc">
-<li class="listitem"><p><span class="bold"><strong>x-flickr-is-public: </strong></span>
-                Set's the Flickr "is_public" parameter.  1 if the photos should
-                be publically viewable, 0 otherwise.
-              </p></li>
-<li class="listitem"><p><span class="bold"><strong>x-flickr-is-friend: </strong></span>
-                Set's the Flickr "is_friend" parameter.  1 if the photos should
-                be viewable by friends, 0 otherwise.
-              </p></li>
-<li class="listitem"><p><span class="bold"><strong>x-flickr-is-family: </strong></span>
-                Set's the Flickr "is_family" parameter.  1 if the photos should
-                be viewable by family, 0 otherwise.
-              </p></li>
-</ul></div>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
@@ -125,9 +105,9 @@
 </div>
 </div>
 <div class="refsect1" title="Signal Details">
-<a name="id567157"></a><h2>Signal Details</h2>
+<a name="id536122"></a><h2>Signal Details</h2>
 <div class="refsect2" title="The PhotoUploadProgress signal">
-<a name="id567167"></a><h3>
+<a name="id536133"></a><h3>
 <a name="PhotoUpload-PhotoUploadProgress"></a>The PhotoUploadProgress signal</h3>
 <pre class="programlisting">PhotoUploadProgress ('i' opid,
                      'i' progress,
--- docs/libsocialweb-dbus/html/Query.html
+++ docs/libsocialweb-dbus/html/Query.html
@@ -45,7 +45,7 @@
 </pre>
 </div>
 <div class="refsect1" title="Implemented Interfaces">
-<a name="id567225"></a><h2>Implemented Interfaces</h2>
+<a name="id499611"></a><h2>Implemented Interfaces</h2>
 <p>
     Objects implementing com.meego.libsocialweb.Query also implements
     org.freedesktop.DBus.Introspectable,
@@ -53,14 +53,14 @@
     </p>
 </div>
 <div class="refsect1" title="Description">
-<a name="id567242"></a><h2>Description</h2>
+<a name="id536200"></a><h2>Description</h2>
 <p></p>
 </div>
 <div class="refsect1" title="Details">
-<a name="id567257"></a><h2>Details</h2>
+<a name="id536215"></a><h2>Details</h2>
 <div class="refsect2" title="OpenView()">
-<a name="id567267"></a><h3>
-<a name="Query.OpenView"></a><code class="function"><GTKDOCLINK HREF="OpenView"><code class="function"><GTKDOCLINK HREF="OpenView"><code class="function"><GTKDOCLINK HREF="OpenView"><code class="function">OpenView()</code></code></GTKDOCLINK></code></GTKDOCLINK></code></GTKDOCLINK>
+<a name="id536225"></a><h3>
+<a name="Query.OpenView"></a><code class="function">OpenView()</code>
 </h3>
 <pre class="programlisting">OpenView (in  's'     query,
           in  'a{ss}' params,
--- docs/libsocialweb-dbus/html/Service.html
+++ docs/libsocialweb-dbus/html/Service.html
@@ -5,7 +5,7 @@
 <title>com.meego.libsocialweb.Service</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="index.html" title="libsocialweb DBus API Reference Manual">
-<link rel="up" href="ch01.html#id559087" title="Core Interfaces">
+<link rel="up" href="ch01.html#id510271" title="Core Interfaces">
 <link rel="prev" href="libsocialweb.html" title="com.meego.libsocialweb">
 <link rel="next" href="ItemView.html" title="com.meego.libsocialweb.ItemView">
 <meta name="generator" content="GTK-Doc V1.15 (XML mode)">
@@ -15,7 +15,7 @@
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
 <td><a accesskey="p" href="libsocialweb.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html#id559087"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="u" href="ch01.html#id510271"><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">libsocialweb DBus API Reference Manual</th>
 <td><a accesskey="n" href="ItemView.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
@@ -47,13 +47,13 @@
 </pre>
 </div>
 <div class="refsect1" title="Signals">
-<a name="id543958"></a><h2>Signals</h2>
+<a name="id515501"></a><h2>Signals</h2>
 <pre class="synopsis"><a href="Service.html#Service-CapabilitiesChanged">CapabilitiesChanged</a> ('as' caps)
 <a href="Service.html#Service-UserChanged">UserChanged</a>         ()
 </pre>
 </div>
 <div class="refsect1" title="Implemented Interfaces">
-<a name="id554767"></a><h2>Implemented Interfaces</h2>
+<a name="id525350"></a><h2>Implemented Interfaces</h2>
 <p>
     Objects implementing com.meego.libsocialweb.Service also implements
     org.freedesktop.DBus.Introspectable,
@@ -61,15 +61,15 @@
     </p>
 </div>
 <div class="refsect1" title="Description">
-<a name="id535644"></a><h2>Description</h2>
+<a name="id518211"></a><h2>Description</h2>
       An interface representing the core functionality present on
       all objects representing service backends.
     </div>
 <div class="refsect1" title="Details">
-<a name="id555469"></a><h2>Details</h2>
+<a name="id513727"></a><h2>Details</h2>
 <div class="refsect2" title="GetStaticCapabilities()">
-<a name="id549645"></a><h3>
-<a name="Service.GetStaticCapabilities"></a><code class="function"><GTKDOCLINK HREF="GetStaticCapabilities"><code class="function"><GTKDOCLINK HREF="GetStaticCapabilities"><code class="function"><GTKDOCLINK HREF="GetStaticCapabilities"><code class="function">GetStaticCapabilities()</code></code></GTKDOCLINK></code></GTKDOCLINK></code></GTKDOCLINK>
+<a name="id505851"></a><h3>
+<a name="Service.GetStaticCapabilities"></a><code class="function">GetStaticCapabilities()</code>
 </h3>
 <pre class="programlisting">GetStaticCapabilities (out 'as' caps)</pre>
 <p>
@@ -85,7 +85,7 @@
 <li class="listitem"><p><span class="bold"><strong>has-banishable-iface: </strong></span>The service supports the <a href="Banishable.html"><span class="type">Banishable</span></a> interface.</p></li>
 <li class="listitem"><p><span class="bold"><strong>has-query-iface: </strong></span>The service supports the <a href="Query.html"><span class="type">Query</span></a> interface.</p></li>
 <li class="listitem"><p><span class="bold"><strong>can-verify-credentials: </strong></span>The credentials-invalid and credentials-valid dynamic capabilities are available.</p></li>
-<li class="listitem"><p><span class="bold"><strong>can-update-status-with-geotag: </strong></span>When using <a href="StatusUpdate.html"><span class="type">StatusUpdate</span></a>:<code class="function"><GTKDOCLINK HREF="UpdateStatus"><code class="function"><GTKDOCLINK HREF="UpdateStatus"><code class="function"><GTKDOCLINK HREF="UpdateStatus"><code class="function">UpdateStatus()</code></code></GTKDOCLINK></code></GTKDOCLINK></code></GTKDOCLINK> it is possible to provide latitude and longitude fields.</p></li>
+<li class="listitem"><p><span class="bold"><strong>can-update-status-with-geotag: </strong></span>When using <a href="StatusUpdate.html"><span class="type">StatusUpdate</span></a>:<code class="function">UpdateStatus()</code> it is possible to provide latitude and longitude fields.</p></li>
 </ul></div>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -97,8 +97,8 @@
 </div>
 <hr>
 <div class="refsect2" title="GetDynamicCapabilities()">
-<a name="id541462"></a><h3>
-<a name="Service.GetDynamicCapabilities"></a><code class="function"><GTKDOCLINK HREF="GetDynamicCapabilities"><code class="function"><GTKDOCLINK HREF="GetDynamicCapabilities"><code class="function"><GTKDOCLINK HREF="GetDynamicCapabilities"><code class="function">GetDynamicCapabilities()</code></code></GTKDOCLINK></code></GTKDOCLINK></code></GTKDOCLINK>
+<a name="id532979"></a><h3>
+<a name="Service.GetDynamicCapabilities"></a><code class="function">GetDynamicCapabilities()</code>
 </h3>
 <pre class="programlisting">GetDynamicCapabilities (out 'as' caps)</pre>
 <div class="variablelist"><table border="0">
@@ -111,16 +111,16 @@
 </div>
 <hr>
 <div class="refsect2" title="CredentialsUpdated()">
-<a name="id521716"></a><h3>
-<a name="Service.CredentialsUpdated"></a><code class="function"><GTKDOCLINK HREF="CredentialsUpdated"><code class="function"><GTKDOCLINK HREF="CredentialsUpdated"><code class="function"><GTKDOCLINK HREF="CredentialsUpdated"><code class="function">CredentialsUpdated()</code></code></GTKDOCLINK></code></GTKDOCLINK></code></GTKDOCLINK>
+<a name="id491438"></a><h3>
+<a name="Service.CredentialsUpdated"></a><code class="function">CredentialsUpdated()</code>
 </h3>
 <pre class="programlisting">CredentialsUpdated ()</pre>
 </div>
 </div>
 <div class="refsect1" title="Signal Details">
-<a name="id522228"></a><h2>Signal Details</h2>
+<a name="id510595"></a><h2>Signal Details</h2>
 <div class="refsect2" title="The CapabilitiesChanged signal">
-<a name="id522238"></a><h3>
+<a name="id490795"></a><h3>
 <a name="Service-CapabilitiesChanged"></a>The CapabilitiesChanged signal</h3>
 <pre class="programlisting">CapabilitiesChanged ('as' caps)</pre>
 <div class="variablelist"><table border="0">
@@ -133,7 +133,7 @@
 </div>
 <hr>
 <div class="refsect2" title="The UserChanged signal">
-<a name="id521799"></a><h3>
+<a name="id490845"></a><h3>
 <a name="Service-UserChanged"></a>The UserChanged signal</h3>
 <pre class="programlisting">UserChanged ()</pre>
 </div>
--- docs/libsocialweb-dbus/html/StatusUpdate.html
+++ docs/libsocialweb-dbus/html/StatusUpdate.html
@@ -46,12 +46,12 @@
 </pre>
 </div>
 <div class="refsect1" title="Signals">
-<a name="id567458"></a><h2>Signals</h2>
+<a name="id536408"></a><h2>Signals</h2>
 <pre class="synopsis"><a href="StatusUpdate.html#StatusUpdate-StatusUpdated">StatusUpdated</a> ('b' success)
 </pre>
 </div>
 <div class="refsect1" title="Implemented Interfaces">
-<a name="id567479"></a><h2>Implemented Interfaces</h2>
+<a name="id536428"></a><h2>Implemented Interfaces</h2>
 <p>
     Objects implementing com.meego.libsocialweb.StatusUpdate also implements
     org.freedesktop.DBus.Introspectable,
@@ -59,14 +59,14 @@
     </p>
 </div>
 <div class="refsect1" title="Description">
-<a name="id567496"></a><h2>Description</h2>
+<a name="id536445"></a><h2>Description</h2>
       An interface for updating the user's status.
     </div>
 <div class="refsect1" title="Details">
-<a name="id567506"></a><h2>Details</h2>
+<a name="id536456"></a><h2>Details</h2>
 <div class="refsect2" title="UpdateStatus()">
-<a name="id567517"></a><h3>
-<a name="StatusUpdate.UpdateStatus"></a><code class="function"><GTKDOCLINK HREF="UpdateStatus"><code class="function"><GTKDOCLINK HREF="UpdateStatus"><code class="function"><GTKDOCLINK HREF="UpdateStatus"><code class="function">UpdateStatus()</code></code></GTKDOCLINK></code></GTKDOCLINK></code></GTKDOCLINK>
+<a name="id536466"></a><h3>
+<a name="StatusUpdate.UpdateStatus"></a><code class="function">UpdateStatus()</code>
 </h3>
 <pre class="programlisting">UpdateStatus (in  's'     status_message,
               in  'a{ss}' fields)</pre>
@@ -97,9 +97,9 @@
 </div>
 </div>
 <div class="refsect1" title="Signal Details">
-<a name="id567611"></a><h2>Signal Details</h2>
+<a name="id536548"></a><h2>Signal Details</h2>
 <div class="refsect2" title="The StatusUpdated signal">
-<a name="id567622"></a><h3>
+<a name="id536558"></a><h3>
 <a name="StatusUpdate-StatusUpdated"></a>The StatusUpdated signal</h3>
 <pre class="programlisting">StatusUpdated ('b' success)</pre>
 <p>
--- docs/libsocialweb-dbus/html/ch01.html
+++ docs/libsocialweb-dbus/html/ch01.html
@@ -21,9 +21,9 @@
 </tr></table>
 <div class="chapter" title="DBus Interfaces">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id547420"></a>DBus Interfaces</h2></div></div></div>
+<a name="id534243"></a>DBus Interfaces</h2></div></div></div>
 <div class="toc"><dl>
-<dt><span class="section"><a href="ch01.html#id559087">Core Interfaces</a></span></dt>
+<dt><span class="section"><a href="ch01.html#id510271">Core Interfaces</a></span></dt>
 <dd><dl>
 <dt>
 <span class="refentrytitle"><a href="libsocialweb.html">com.meego.libsocialweb</a></span><span class="refpurpose"> — libsocialweb interface</span>
@@ -59,7 +59,7 @@
 </dt></dl></dd>
 </dl></div>
 <div class="section" title="Core Interfaces"><div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id559087"></a>Core Interfaces</h2></div></div></div></div>
+<a name="id510271"></a>Core Interfaces</h2></div></div></div></div>
 </div>
 <div class="footer">
 <hr>
--- docs/libsocialweb-dbus/html/ch01s02.html
+++ docs/libsocialweb-dbus/html/ch01s02.html
@@ -20,7 +20,7 @@
 <td><a accesskey="n" href="Avatar.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="section" title="Feature Interfaces"><div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id546970"></a>Feature Interfaces</h2></div></div></div></div>
+<a name="id533862"></a>Feature Interfaces</h2></div></div></div></div>
 <div class="footer">
 <hr>
           Generated by GTK-Doc V1.15</div>
--- docs/libsocialweb-dbus/html/ch01s03.html
+++ docs/libsocialweb-dbus/html/ch01s03.html
@@ -20,7 +20,7 @@
 <td><a accesskey="n" href="Lastfm.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="section" title="Service-specific Interfaces"><div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id537748"></a>Service-specific Interfaces</h2></div></div></div></div>
+<a name="id513569"></a>Service-specific Interfaces</h2></div></div></div></div>
 <div class="footer">
 <hr>
           Generated by GTK-Doc V1.15</div>
--- docs/libsocialweb-dbus/html/index.html
+++ docs/libsocialweb-dbus/html/index.html
@@ -18,7 +18,7 @@
 <div class="toc"><dl>
 <dt><span class="chapter"><a href="ch01.html">DBus Interfaces</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="ch01.html#id559087">Core Interfaces</a></span></dt>
+<dt><span class="section"><a href="ch01.html#id510271">Core Interfaces</a></span></dt>
 <dd><dl>
 <dt>
 <span class="refentrytitle"><a href="libsocialweb.html">com.meego.libsocialweb</a></span><span class="refpurpose"> — libsocialweb interface</span>
--- docs/libsocialweb-dbus/html/libsocialweb-dbus.devhelp
+++ docs/libsocialweb-dbus/html/libsocialweb-dbus.devhelp
@@ -3,7 +3,7 @@
 <book xmlns="http://www.devhelp.net/book" title="libsocialweb DBus API Reference Manual" link="index.html" author="" name="libsocialweb-dbus">
   <chapters>
     <sub name="DBus Interfaces" link="ch01.html">
-      <sub name="Core Interfaces" link="ch01.html#id559087">
+      <sub name="Core Interfaces" link="ch01.html#id510271">
         <sub name="com.meego.libsocialweb" link="libsocialweb.html"/>
         <sub name="com.meego.libsocialweb.Service" link="Service.html"/>
         <sub name="com.meego.libsocialweb.ItemView" link="ItemView.html"/>
--- docs/libsocialweb-dbus/html/libsocialweb-dbus.devhelp2
+++ docs/libsocialweb-dbus/html/libsocialweb-dbus.devhelp2
@@ -3,7 +3,7 @@
 <book xmlns="http://www.devhelp.net/book" title="libsocialweb DBus API Reference Manual" link="index.html" author="" name="libsocialweb-dbus" version="2" language="c">
   <chapters>
     <sub name="DBus Interfaces" link="ch01.html">
-      <sub name="Core Interfaces" link="ch01.html#id559087">
+      <sub name="Core Interfaces" link="ch01.html#id510271">
         <sub name="com.meego.libsocialweb" link="libsocialweb.html"/>
         <sub name="com.meego.libsocialweb.Service" link="Service.html"/>
         <sub name="com.meego.libsocialweb.ItemView" link="ItemView.html"/>
--- docs/libsocialweb-dbus/html/libsocialweb.html
+++ docs/libsocialweb-dbus/html/libsocialweb.html
@@ -5,7 +5,7 @@
 <title>com.meego.libsocialweb</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="index.html" title="libsocialweb DBus API Reference Manual">
-<link rel="up" href="ch01.html#id559087" title="Core Interfaces">
+<link rel="up" href="ch01.html#id510271" title="Core Interfaces">
 <link rel="prev" href="ch01.html" title="DBus Interfaces">
 <link rel="next" href="Service.html" title="com.meego.libsocialweb.Service">
 <meta name="generator" content="GTK-Doc V1.15 (XML mode)">
@@ -15,7 +15,7 @@
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
 <td><a accesskey="p" href="ch01.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html#id559087"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="u" href="ch01.html#id510271"><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">libsocialweb DBus API Reference Manual</th>
 <td><a accesskey="n" href="Service.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
@@ -46,12 +46,12 @@
 </pre>
 </div>
 <div class="refsect1" title="Signals">
-<a name="id538535"></a><h2>Signals</h2>
+<a name="id518570"></a><h2>Signals</h2>
 <pre class="synopsis"><a href="libsocialweb.html#libsocialweb-OnlineChanged">OnlineChanged</a> ('b' online)
 </pre>
 </div>
 <div class="refsect1" title="Implemented Interfaces">
-<a name="id540806"></a><h2>Implemented Interfaces</h2>
+<a name="id527783"></a><h2>Implemented Interfaces</h2>
 <p>
     Objects implementing com.meego.libsocialweb also implements
     org.freedesktop.DBus.Introspectable,
@@ -59,13 +59,13 @@
     </p>
 </div>
 <div class="refsect1" title="Description">
-<a name="id548367"></a><h2>Description</h2>
+<a name="id504967"></a><h2>Description</h2>
       Core interface.
     </div>
 <div class="refsect1" title="Details">
-<a name="id536339"></a><h2>Details</h2>
+<a name="id499058"></a><h2>Details</h2>
 <div class="refsect2" title="GetServices()">
-<a name="id530186"></a><h3>
+<a name="id533879"></a><h3>
 <a name="libsocialweb.GetServices"></a><code class="function">GetServices()</code>
 </h3>
 <pre class="programlisting">GetServices (out 'as' services)</pre>
@@ -79,7 +79,7 @@
 </div>
 <hr>
 <div class="refsect2" title="IsOnline()">
-<a name="id534150"></a><h3>
+<a name="id501025"></a><h3>
 <a name="libsocialweb.IsOnline"></a><code class="function">IsOnline()</code>
 </h3>
 <pre class="programlisting">IsOnline (out 'b' online)</pre>
@@ -93,9 +93,9 @@
 </div>
 </div>
 <div class="refsect1" title="Signal Details">
-<a name="id559716"></a><h2>Signal Details</h2>
+<a name="id509752"></a><h2>Signal Details</h2>
 <div class="refsect2" title="The OnlineChanged signal">
-<a name="id540892"></a><h3>
+<a name="id500845"></a><h3>
 <a name="libsocialweb-OnlineChanged"></a>The OnlineChanged signal</h3>
 <pre class="programlisting">OnlineChanged ('b' online)</pre>
 <div class="variablelist"><table border="0">
--- docs/libsocialweb-dbus/xml/ref-lastfm.xml
+++ docs/libsocialweb-dbus/xml/ref-lastfm.xml
@@ -41,7 +41,7 @@
   <refsect1 role="details">
     <title role="details.title">Details</title>
     <refsect2>
-      <title><anchor role="function" id="Lastfm.NowPlaying"/><link linkend="NowPlaying"><function><link linkend="NowPlaying"><function><link linkend="NowPlaying"><function><link linkend="NowPlaying"><function>NowPlaying()</function></link></function></link></function></link></function></link></title>
+      <title><anchor role="function" id="Lastfm.NowPlaying"/><link linkend="NowPlaying"><function>NowPlaying()</function></link></title>
       <indexterm>
         <primary>NowPlaying</primary>
         <secondary>Lastfm</secondary>
@@ -92,7 +92,7 @@
       </variablelist>
     </refsect2>
     <refsect2>
-      <title><anchor role="function" id="Lastfm.SubmitTrack"/><link linkend="SubmitTrack"><function><link linkend="SubmitTrack"><function><link linkend="SubmitTrack"><function><link linkend="SubmitTrack"><function>SubmitTrack()</function></link></function></link></function></link></function></link></title>
+      <title><anchor role="function" id="Lastfm.SubmitTrack"/><link linkend="SubmitTrack"><function>SubmitTrack()</function></link></title>
       <indexterm>
         <primary>SubmitTrack</primary>
         <secondary>Lastfm</secondary>
--- docs/libsocialweb-dbus/xml/ref-sw-avatar.xml
+++ docs/libsocialweb-dbus/xml/ref-sw-avatar.xml
@@ -32,7 +32,7 @@
         
           <para>
             Request that the user's avatar is downloaded from the service.
-            This will cause the <link linkend="Avatar-AvatarRetrieved"><type>"AvatarRetrieved"</type></link> signal to be fired when the
+            This will cause the #Avatar::AvatarRetrieved signal to be fired when the
             avatar has been downloaded
           </para>
         
@@ -40,7 +40,7 @@
   <refsect1 role="details">
     <title role="details.title">Details</title>
     <refsect2>
-      <title><anchor role="function" id="Avatar.RequestAvatar"/><link linkend="RequestAvatar"><function><link linkend="RequestAvatar"><function><link linkend="RequestAvatar"><function><link linkend="RequestAvatar"><function>RequestAvatar()</function></link></function></link></function></link></function></link></title>
+      <title><anchor role="function" id="Avatar.RequestAvatar"/>RequestAvatar ()</title>
       <indexterm>
         <primary>RequestAvatar</primary>
         <secondary>Avatar</secondary>
--- docs/libsocialweb-dbus/xml/ref-sw-banishable.xml
+++ docs/libsocialweb-dbus/xml/ref-sw-banishable.xml
@@ -30,9 +30,9 @@
     </refsect1>
   <refsect1 role="details">
     <title role="details.title">Details</title>
-    <refsect2><title><anchor role="function" id="Banishable.HideItem"/><link linkend="HideItem"><function><link linkend="HideItem"><function><link linkend="HideItem"><function><link linkend="HideItem"><function>HideItem()</function></link></function></link></function></link></function></link></title><indexterm><primary>HideItem</primary><secondary>Banishable</secondary></indexterm><programlisting>HideItem (in  's' uid)</programlisting>
+    <refsect2><title><anchor role="function" id="Banishable.HideItem"/>HideItem ()</title><indexterm><primary>HideItem</primary><secondary>Banishable</secondary></indexterm><programlisting>HideItem (in  's' uid)</programlisting>
           <para>
-            Hide the item from the servive with the given <parameter>uid</parameter>. This means
+            Hide the item from the servive with the given @uid. This means
             that the item will be removed from any open views and streams,
             from the cache and will be added to the ban list so that any
             future fetches of this content will not include it.
--- docs/libsocialweb-dbus/xml/ref-sw-core.xml
+++ docs/libsocialweb-dbus/xml/ref-sw-core.xml
@@ -32,7 +32,7 @@
   <refsect1 role="details">
     <title role="details.title">Details</title>
     <refsect2>
-      <title><anchor role="function" id="libsocialweb.GetServices"/><link linkend="GetServices"><function>GetServices()</function></link></title>
+      <title><anchor role="function" id="libsocialweb.GetServices"/>GetServices ()</title>
       <indexterm>
         <primary>GetServices</primary>
         <secondary>libsocialweb</secondary>
@@ -48,7 +48,7 @@
       </variablelist>
     </refsect2>
     <refsect2>
-      <title><anchor role="function" id="libsocialweb.IsOnline"/><link linkend="IsOnline"><function>IsOnline()</function></link></title>
+      <title><anchor role="function" id="libsocialweb.IsOnline"/>IsOnline ()</title>
       <indexterm>
         <primary>IsOnline</primary>
         <secondary>libsocialweb</secondary>
--- docs/libsocialweb-dbus/xml/ref-sw-item-view.xml
+++ docs/libsocialweb-dbus/xml/ref-sw-item-view.xml
@@ -37,7 +37,7 @@
   <refsect1 role="details">
     <title role="details.title">Details</title>
     <refsect2>
-      <title><anchor role="function" id="ItemView.Start"/><link linkend="Start"><function><link linkend="Start"><function><link linkend="Start"><function><link linkend="Start"><function>Start()</function></link></function></link></function></link></function></link></title>
+      <title><anchor role="function" id="ItemView.Start"/><link linkend="Start"><function>Start()</function></link></title>
       <indexterm>
         <primary>Start</primary>
         <secondary>ItemView</secondary>
@@ -45,7 +45,7 @@
       <programlisting>Start ()</programlisting>
     </refsect2>
     <refsect2>
-      <title><anchor role="function" id="ItemView.Refresh"/><link linkend="Refresh"><function><link linkend="Refresh"><function><link linkend="Refresh"><function><link linkend="Refresh"><function>Refresh()</function></link></function></link></function></link></function></link></title>
+      <title><anchor role="function" id="ItemView.Refresh"/><link linkend="Refresh"><function>Refresh()</function></link></title>
       <indexterm>
         <primary>Refresh</primary>
         <secondary>ItemView</secondary>
@@ -53,7 +53,7 @@
       <programlisting>Refresh ()</programlisting>
     </refsect2>
     <refsect2>
-      <title><anchor role="function" id="ItemView.Stop"/><link linkend="Stop"><function><link linkend="Stop"><function><link linkend="Stop"><function><link linkend="Stop"><function>Stop()</function></link></function></link></function></link></function></link></title>
+      <title><anchor role="function" id="ItemView.Stop"/><link linkend="Stop"><function>Stop()</function></link></title>
       <indexterm>
         <primary>Stop</primary>
         <secondary>ItemView</secondary>
@@ -61,7 +61,7 @@
       <programlisting>Stop ()</programlisting>
     </refsect2>
     <refsect2>
-      <title><anchor role="function" id="ItemView.Close"/><link linkend="Close"><function><link linkend="Close"><function><link linkend="Close"><function><link linkend="Close"><function>Close()</function></link></function></link></function></link></function></link></title>
+      <title><anchor role="function" id="ItemView.Close"/><link linkend="Close"><function>Close()</function></link></title>
       <indexterm>
         <primary>Close</primary>
         <secondary>ItemView</secondary>
--- docs/libsocialweb-dbus/xml/ref-sw-photo-upload.xml
+++ docs/libsocialweb-dbus/xml/ref-sw-photo-upload.xml
@@ -34,16 +34,16 @@
     </refsect1>
   <refsect1 role="details">
     <title role="details.title">Details</title>
-    <refsect2><title><anchor role="function" id="PhotoUpload.UploadPhoto"/><link linkend="UploadPhoto"><function>UploadPhoto()</function></link></title><indexterm><primary>UploadPhoto</primary><secondary>PhotoUpload</secondary></indexterm><programlisting>UploadPhoto (in  's'     local_filename,
+    <refsect2><title><anchor role="function" id="PhotoUpload.UploadPhoto"/>UploadPhoto ()</title><indexterm><primary>UploadPhoto</primary><secondary>PhotoUpload</secondary></indexterm><programlisting>UploadPhoto (in  's'     local_filename,
              in  'a{ss}' fields,
              out 'i'     opid)</programlisting>
           <para>
-            Upload the photo <parameter>local_filename</parameter>.  The upload will be performed
-            asynchronously and <parameter>opid</parameter> can be used to identify the upload in the
-            <link linkend="PhotoUpload-PhotoUploadProgress"><type>"PhotoUploadProgress"</type></link> signal.
+            Upload the photo @local_filename.  The upload will be performed
+            asynchronously and @opid can be used to identify the upload in the
+            #PhotoUpload::PhotoUploadProgress signal.
           </para>
           <para>
-            <parameter>fields</parameter> is a set of key-value pairs that are passed to the service.
+            @fields is a set of key-value pairs that are passed to the service.
             None of these are required and not all services support all of the
             keys.  Generic keys are:
           </para>
@@ -64,7 +64,7 @@
                 Set's the Flickr "is_family" parameter.  1 if the photos should
                 be viewable by family, 0 otherwise.
               </para></listitem></itemizedlist></para>
-        <variablelist role="params"><varlistentry><term><parameter>local_filename</parameter>:</term><listitem><simpara>The local filename of the image to upload.</simpara></listitem></varlistentry><varlistentry><term><parameter>fields</parameter>:</term><listitem><simpara>Key-value pairs containing metadata.</simpara></listitem></varlistentry><varlistentry><term><parameter>opid</parameter>:</term><listitem><simpara>Operation identifier, used in the <link linkend="PhotoUpload-PhotoUploadProgress"><type>"PhotoUploadProgress"</type></link> signal.</simpara></listitem></varlistentry></variablelist></refsect2>
+        <variablelist role="params"><varlistentry><term><parameter>local_filename</parameter>:</term><listitem><simpara>The local filename of the image to upload.</simpara></listitem></varlistentry><varlistentry><term><parameter>fields</parameter>:</term><listitem><simpara>Key-value pairs containing metadata.</simpara></listitem></varlistentry><varlistentry><term><parameter>opid</parameter>:</term><listitem><simpara>Operation identifier, used in the #PhotoUpload::PhotoUploadProgress signal.</simpara></listitem></varlistentry></variablelist></refsect2>
   </refsect1>
   <refsect1 role="signals">
     <title role="signals.title">Signal Details</title>
@@ -72,15 +72,15 @@
                      'i' progress,
                      's' error_message)</programlisting>
           <para>
-            Emitted periodically as the upload is performed.  <parameter>progress</parameter> can go
+            Emitted periodically as the upload is performed.  @progress can go
             from 0 to 100 as the upload is performed. If there is an error then
-            <parameter>progress</parameter> is -1 and <parameter>error_message</parameter> is set.
+            @progress is -1 and @error_message is set.
           </para>
           <para>
             This signal is guaranteed to be emitted at least once with either
-            <parameter>progress</parameter> at 100 (i.e. upload complete) or an error state.
+            @progress at 100 (i.e. upload complete) or an error state.
           </para>
-        <variablelist role="params"><varlistentry><term><parameter>opid</parameter>:</term><listitem><simpara>Operation identifier, as returned by <link linkend="UploadPhoto"><function>UploadPhoto()</function></link>.</simpara></listitem></varlistentry><varlistentry><term><parameter>progress</parameter>:</term><listitem><simpara>Current progress, the normal range being 0 (not started)
-          to 100 (completed), with -1 meaning an error occurred.</simpara></listitem></varlistentry><varlistentry><term><parameter>error_message</parameter>:</term><listitem><simpara>The human-readable error message.  This will be set if <parameter>progress</parameter> is -1.</simpara></listitem></varlistentry></variablelist></refsect2>
+        <variablelist role="params"><varlistentry><term><parameter>opid</parameter>:</term><listitem><simpara>Operation identifier, as returned by UploadPhoto().</simpara></listitem></varlistentry><varlistentry><term><parameter>progress</parameter>:</term><listitem><simpara>Current progress, the normal range being 0 (not started)
+          to 100 (completed), with -1 meaning an error occurred.</simpara></listitem></varlistentry><varlistentry><term><parameter>error_message</parameter>:</term><listitem><simpara>The human-readable error message.  This will be set if @progress is -1.</simpara></listitem></varlistentry></variablelist></refsect2>
   </refsect1>
 </refentry>
--- docs/libsocialweb-dbus/xml/ref-sw-query.xml
+++ docs/libsocialweb-dbus/xml/ref-sw-query.xml
@@ -29,7 +29,7 @@
   <refsect1 role="details">
     <title role="details.title">Details</title>
     <refsect2>
-      <title><anchor role="function" id="Query.OpenView"/><link linkend="OpenView"><function><link linkend="OpenView"><function><link linkend="OpenView"><function><link linkend="OpenView"><function>OpenView()</function></link></function></link></function></link></function></link></title>
+      <title><anchor role="function" id="Query.OpenView"/><link linkend="OpenView"><function>OpenView()</function></link></title>
       <indexterm>
         <primary>OpenView</primary>
         <secondary>Query</secondary>
--- docs/libsocialweb-dbus/xml/ref-sw-service.xml
+++ docs/libsocialweb-dbus/xml/ref-sw-service.xml
@@ -34,17 +34,17 @@
     </refsect1>
   <refsect1 role="details">
     <title role="details.title">Details</title>
-    <refsect2><title><anchor role="function" id="Service.GetStaticCapabilities"/><link linkend="GetStaticCapabilities"><function><link linkend="GetStaticCapabilities"><function><link linkend="GetStaticCapabilities"><function><link linkend="GetStaticCapabilities"><function>GetStaticCapabilities()</function></link></function></link></function></link></function></link></title><indexterm><primary>GetStaticCapabilities</primary><secondary>Service</secondary></indexterm><programlisting>GetStaticCapabilities (out 'as' caps)</programlisting>
+    <refsect2><title><anchor role="function" id="Service.GetStaticCapabilities"/><link linkend="GetStaticCapabilities"><function>GetStaticCapabilities()</function></link></title><indexterm><primary>GetStaticCapabilities</primary><secondary>Service</secondary></indexterm><programlisting>GetStaticCapabilities (out 'as' caps)</programlisting>
           <para>
             Query the service for the capabilities that this service provides.
             Static capabilities represent capabilities that this service can theoretically
             provide. Depending on the internal configuration of the service the list of
             dynamic capabilities may change.
           </para>
-          <para><itemizedlist><listitem><para><emphasis role="bold">has-update-status-iface: </emphasis>The service supports the <link linkend="UpdateStatus"><type>UpdateStatus</type></link> interface.</para></listitem><listitem><para><emphasis role="bold">has-avatar-iface: </emphasis>The service supports the <link linkend="Avatar"><type>Avatar</type></link> interface.</para></listitem><listitem><para><emphasis role="bold">has-photo-upload-iface: </emphasis>The service supports the <link linkend="PhotoUpload"><type>PhotoUpload</type></link> interface.</para></listitem><listitem><para><emphasis role="bold">has-banishable-iface: </emphasis>The service supports the <link linkend="Banishable"><type>Banishable</type></link> interface.</para></listitem><listitem><para><emphasis role="bold">has-query-iface: </emphasis>The service supports the <link linkend="Query"><type>Query</type></link> interface.</para></listitem><listitem><para><emphasis role="bold">can-verify-credentials: </emphasis>The credentials-invalid and credentials-valid dynamic capabilities are available.</para></listitem><listitem><para><emphasis role="bold">can-update-status-with-geotag: </emphasis>When using <link linkend="StatusUpdate"><type>StatusUpdate</type></link>:<link linkend="UpdateStatus"><function><link linkend="UpdateStatus"><function><link linkend="UpdateStatus"><function><link linkend="UpdateStatus"><function>UpdateStatus()</function></link></function></link></function></link></function></link> it is possible to provide latitude and longitude fields.</para></listitem></itemizedlist></para>
+          <para><itemizedlist><listitem><para><emphasis role="bold">has-update-status-iface: </emphasis>The service supports the <link linkend="UpdateStatus"><type>UpdateStatus</type></link> interface.</para></listitem><listitem><para><emphasis role="bold">has-avatar-iface: </emphasis>The service supports the <link linkend="Avatar"><type>Avatar</type></link> interface.</para></listitem><listitem><para><emphasis role="bold">has-photo-upload-iface: </emphasis>The service supports the <link linkend="PhotoUpload"><type>PhotoUpload</type></link> interface.</para></listitem><listitem><para><emphasis role="bold">has-banishable-iface: </emphasis>The service supports the <link linkend="Banishable"><type>Banishable</type></link> interface.</para></listitem><listitem><para><emphasis role="bold">has-query-iface: </emphasis>The service supports the <link linkend="Query"><type>Query</type></link> interface.</para></listitem><listitem><para><emphasis role="bold">can-verify-credentials: </emphasis>The credentials-invalid and credentials-valid dynamic capabilities are available.</para></listitem><listitem><para><emphasis role="bold">can-update-status-with-geotag: </emphasis>When using <link linkend="StatusUpdate"><type>StatusUpdate</type></link>:<link linkend="UpdateStatus"><function>UpdateStatus()</function></link> it is possible to provide latitude and longitude fields.</para></listitem></itemizedlist></para>
         <variablelist role="params"><varlistentry><term><parameter>caps</parameter>:</term><listitem><simpara>The list of static capabilities that this service supports.</simpara></listitem></varlistentry></variablelist></refsect2>
     <refsect2>
-      <title><anchor role="function" id="Service.GetDynamicCapabilities"/><link linkend="GetDynamicCapabilities"><function><link linkend="GetDynamicCapabilities"><function><link linkend="GetDynamicCapabilities"><function><link linkend="GetDynamicCapabilities"><function>GetDynamicCapabilities()</function></link></function></link></function></link></function></link></title>
+      <title><anchor role="function" id="Service.GetDynamicCapabilities"/><link linkend="GetDynamicCapabilities"><function>GetDynamicCapabilities()</function></link></title>
       <indexterm>
         <primary>GetDynamicCapabilities</primary>
         <secondary>Service</secondary>
@@ -60,7 +60,7 @@
       </variablelist>
     </refsect2>
     <refsect2>
-      <title><anchor role="function" id="Service.CredentialsUpdated"/><link linkend="CredentialsUpdated"><function><link linkend="CredentialsUpdated"><function><link linkend="CredentialsUpdated"><function><link linkend="CredentialsUpdated"><function>CredentialsUpdated()</function></link></function></link></function></link></function></link></title>
+      <title><anchor role="function" id="Service.CredentialsUpdated"/><link linkend="CredentialsUpdated"><function>CredentialsUpdated()</function></link></title>
       <indexterm>
         <primary>CredentialsUpdated</primary>
         <secondary>Service</secondary>
--- docs/libsocialweb-dbus/xml/ref-sw-status-update.xml
+++ docs/libsocialweb-dbus/xml/ref-sw-status-update.xml
@@ -31,7 +31,7 @@
     </refsect1>
   <refsect1 role="details">
     <title role="details.title">Details</title>
-    <refsect2><title><anchor role="function" id="StatusUpdate.UpdateStatus"/><link linkend="UpdateStatus"><function><link linkend="UpdateStatus"><function><link linkend="UpdateStatus"><function><link linkend="UpdateStatus"><function>UpdateStatus()</function></link></function></link></function></link></function></link></title><indexterm><primary>UpdateStatus</primary><secondary>StatusUpdate</secondary></indexterm><programlisting>UpdateStatus (in  's'     status_message,
+    <refsect2><title><anchor role="function" id="StatusUpdate.UpdateStatus"/><link linkend="UpdateStatus"><function>UpdateStatus()</function></link></title><indexterm><primary>UpdateStatus</primary><secondary>StatusUpdate</secondary></indexterm><programlisting>UpdateStatus (in  's'     status_message,
               in  'a{ss}' fields)</programlisting>
           <para>
             Update the user's status to <parameter>status_message</parameter>. The update will be
--- docs/libsocialweb/html/SwCore.html
+++ docs/libsocialweb/html/SwCore.html
@@ -41,10 +41,12 @@
 </tr></table></div>
 <div class="refsynopsisdiv" title="Synopsis">
 <a name="SwCore.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">                    <a class="link" href="SwCore.html#SwCore-struct" title="SwCore">SwCore</a>;
+<pre class="synopsis">                    <a class="link" href="SwCore.html#SwCorePrivate" title="SwCorePrivate">SwCorePrivate</a>;
+                    <a class="link" href="SwCore.html#SwCore-struct" title="SwCore">SwCore</a>;
+                    <a class="link" href="SwCore.html#SwCoreClass" title="SwCoreClass">SwCoreClass</a>;
 <a class="link" href="SwCore.html" title="SwCore"><span class="returnvalue">SwCore</span></a>*             <a class="link" href="SwCore.html#sw-core-new" title="sw_core_new ()">sw_core_new</a>                         (<em class="parameter"><code><span class="type">void</span></code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="SwCore.html#sw-core-run" title="sw_core_run ()">sw_core_run</a>                         (<em class="parameter"><code><a class="link" href="SwCore.html" title="SwCore"><span class="type">SwCore</span></a> *core</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="SwCore.html#sw-core-is-item-banned" title="sw_core_is_item_banned ()">sw_core_is_item_banned</a>              (<em class="parameter"><code><a class="link" href="SwCore.html" title="SwCore"><span class="type">SwCore</span></a> *core</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="SwCore.html#sw-core-is-item-banned" title="sw_core_is_item_banned ()">sw_core_is_item_banned</a>              (<em class="parameter"><code><a class="link" href="SwCore.html" title="SwCore"><span class="type">SwCore</span></a> *core</code></em>,
                                                          <em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);
 <a class="link" href="SwCore.html" title="SwCore"><span class="returnvalue">SwCore</span></a> *            <a class="link" href="SwCore.html#sw-core-dup-singleton" title="sw_core_dup_singleton ()">sw_core_dup_singleton</a>               (<em class="parameter"><code><span class="type">void</span></code></em>);
 <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="returnvalue">DBusGConnection</span></a> *   <a class="link" href="SwCore.html#sw-core-get-connection" title="sw_core_get_connection ()">sw_core_get_connection</a>              (<em class="parameter"><code><a class="link" href="SwCore.html" title="SwCore"><span class="type">SwCore</span></a> *core</code></em>);
@@ -53,7 +55,7 @@
 <div class="refsect1" title="Object Hierarchy">
 <a name="SwCore.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>
    +----SwCore
 </pre>
 </div>
@@ -68,11 +70,24 @@
 </div>
 <div class="refsect1" title="Details">
 <a name="SwCore.details"></a><h2>Details</h2>
+<div class="refsect2" title="SwCorePrivate">
+<a name="SwCorePrivate"></a><h3>SwCorePrivate</h3>
+<pre class="programlisting">typedef struct _SwCorePrivate SwCorePrivate;</pre>
+</div>
+<hr>
 <div class="refsect2" title="SwCore">
 <a name="SwCore-struct"></a><h3>SwCore</h3>
 <pre class="programlisting">typedef struct _SwCore SwCore;</pre>
 </div>
 <hr>
+<div class="refsect2" title="SwCoreClass">
+<a name="SwCoreClass"></a><h3>SwCoreClass</h3>
+<pre class="programlisting">typedef struct {
+  GObjectClass parent_class;
+} SwCoreClass;
+</pre>
+</div>
+<hr>
 <div class="refsect2" title="sw_core_new ()">
 <a name="sw-core-new"></a><h3>sw_core_new ()</h3>
 <pre class="programlisting"><a class="link" href="SwCore.html" title="SwCore"><span class="returnvalue">SwCore</span></a>*             sw_core_new                         (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
@@ -85,7 +100,7 @@
 <hr>
 <div class="refsect2" title="sw_core_is_item_banned ()">
 <a name="sw-core-is-item-banned"></a><h3>sw_core_is_item_banned ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_core_is_item_banned              (<em class="parameter"><code><a class="link" href="SwCore.html" title="SwCore"><span class="type">SwCore</span></a> *core</code></em>,
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_core_is_item_banned              (<em class="parameter"><code><a class="link" href="SwCore.html" title="SwCore"><span class="type">SwCore</span></a> *core</code></em>,
                                                          <em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);</pre>
 </div>
 <hr>
--- docs/libsocialweb/html/SwItem.html
+++ docs/libsocialweb/html/SwItem.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="index.html" title="libsocialweb Reference Manual">
 <link rel="up" href="ch01.html" title="libsocialweb">
-<link rel="prev" href="SwItemStream.html" title="SwItemStream">
+<link rel="prev" href="SwItemView.html" title="SwItemView">
 <link rel="next" href="libsocialweb-sw-module.html" title="sw-module">
 <meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -14,7 +14,7 @@
 <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="SwItemStream.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="SwItemView.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td><a accesskey="u" href="ch01.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">libsocialweb Reference Manual</th>
@@ -43,7 +43,8 @@
 </tr></table></div>
 <div class="refsynopsisdiv" title="Synopsis">
 <a name="SwItem.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">                    <a class="link" href="SwItem.html#SwItem-struct" title="SwItem">SwItem</a>;
+<pre class="synopsis">                    <a class="link" href="SwItem.html#SwItemPrivate" title="SwItemPrivate">SwItemPrivate</a>;
+                    <a class="link" href="SwItem.html#SwItem-struct" title="SwItem">SwItem</a>;
                     <a class="link" href="SwItem.html#SwItemClass" title="SwItemClass">SwItemClass</a>;
 <a class="link" href="SwItem.html" title="SwItem"><span class="returnvalue">SwItem</span></a>*             <a class="link" href="SwItem.html#sw-item-new" title="sw_item_new ()">sw_item_new</a>                         (<em class="parameter"><code><span class="type">void</span></code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="SwItem.html#sw-item-set-service" title="sw_item_set_service ()">sw_item_set_service</a>                 (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>,
@@ -56,9 +57,9 @@
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>,
                                                          <em class="parameter"><code><span class="type">char</span> *value</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="SwItem.html#sw-item-request-image-fetch" title="sw_item_request_image_fetch ()">sw_item_request_image_fetch</a>         (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> delays_ready</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *url</code></em>);
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> delays_ready</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *url</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="SwItem.html#sw-item-get" title="sw_item_get ()">sw_item_get</a>                         (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *key</code></em>);
 <span class="returnvalue">int</span>                 <a class="link" href="SwItem.html#sw-item-compare-date-older" title="sw_item_compare_date_older ()">sw_item_compare_date_older</a>          (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *a</code></em>,
@@ -66,34 +67,36 @@
 <span class="returnvalue">int</span>                 <a class="link" href="SwItem.html#sw-item-compare-date-newer" title="sw_item_compare_date_newer ()">sw_item_compare_date_newer</a>          (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *a</code></em>,
                                                          <em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *b</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="SwItem.html#sw-item-dump" title="sw_item_dump ()">sw_item_dump</a>                        (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        <a class="link" href="SwItem.html#sw-item-peek-hash" title="sw_item_peek_hash ()">sw_item_peek_hash</a>                   (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="SwItem.html#sw-item-get-ready" title="sw_item_get_ready ()">sw_item_get_ready</a>                   (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        <a class="link" href="SwItem.html#sw-item-peek-hash" title="sw_item_peek_hash ()">sw_item_peek_hash</a>                   (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</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="SwItem.html#sw-item-get-ready" title="sw_item_get_ready ()">sw_item_get_ready</a>                   (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="SwItem.html#sw-item-push-pending" title="sw_item_push_pending ()">sw_item_push_pending</a>                (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="SwItem.html#sw-item-pop-pending" title="sw_item_pop_pending ()">sw_item_pop_pending</a>                 (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="SwItem.html#sw-item-touch" title="sw_item_touch ()">sw_item_touch</a>                       (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);
 <span class="returnvalue">time_t</span>              <a class="link" href="SwItem.html#sw-item-get-mtime" title="sw_item_get_mtime ()">sw_item_get_mtime</a>                   (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="SwItem.html#sw-item-equal" title="sw_item_equal ()">sw_item_equal</a>                       (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *a</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="SwItem.html#sw-item-equal" title="sw_item_equal ()">sw_item_equal</a>                       (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *a</code></em>,
                                                          <em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *b</code></em>);
-<a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="returnvalue">SwSet</span></a> *             <a class="link" href="SwItem.html#sw-item-set-new" title="sw_item_set_new ()">sw_item_set_new</a>                     (<em class="parameter"><code><span class="type">void</span></code></em>);
+<span class="returnvalue">SwSet</span> *             <a class="link" href="SwItem.html#sw-item-set-new" title="sw_item_set_new ()">sw_item_set_new</a>                     (<em class="parameter"><code><span class="type">void</span></code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Object Hierarchy">
 <a name="SwItem.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>
    +----SwItem
 </pre>
 </div>
 <div class="refsect1" title="Properties">
 <a name="SwItem.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
-  "<a class="link" href="SwItem.html#SwItem--ready" title='The "ready" property'>ready</a>"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read
+  "<a class="link" href="SwItem.html#SwItem--ready" title='The "ready" property'>ready</a>"                    <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read
+  "<a class="link" href="SwItem.html#SwItem--ready" title='The "ready" property'>ready</a>"                    <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read
 </pre>
 </div>
 <div class="refsect1" title="Signals">
 <a name="SwItem.signals"></a><h2>Signals</h2>
 <pre class="synopsis">
   "<a class="link" href="SwItem.html#SwItem-changed" title='The "changed" signal'>changed</a>"                                        : Run First
+  "<a class="link" href="SwItem.html#SwItem-changed" title='The "changed" signal'>changed</a>"                                        : Run First
 </pre>
 </div>
 <div class="refsect1" title="Description">
@@ -101,6 +104,11 @@
 </div>
 <div class="refsect1" title="Details">
 <a name="SwItem.details"></a><h2>Details</h2>
+<div class="refsect2" title="SwItemPrivate">
+<a name="SwItemPrivate"></a><h3>SwItemPrivate</h3>
+<pre class="programlisting">typedef struct _SwItemPrivate SwItemPrivate;</pre>
+</div>
+<hr>
 <div class="refsect2" title="SwItem">
 <a name="SwItem-struct"></a><h3>SwItem</h3>
 <pre class="programlisting">typedef struct _SwItem SwItem;</pre>
@@ -148,9 +156,9 @@
 <div class="refsect2" title="sw_item_request_image_fetch ()">
 <a name="sw-item-request-image-fetch"></a><h3>sw_item_request_image_fetch ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                sw_item_request_image_fetch         (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> delays_ready</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *url</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> delays_ready</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *url</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_item_get ()">
@@ -178,12 +186,12 @@
 <hr>
 <div class="refsect2" title="sw_item_peek_hash ()">
 <a name="sw-item-peek-hash"></a><h3>sw_item_peek_hash ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        sw_item_peek_hash                   (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        sw_item_peek_hash                   (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_item_get_ready ()">
 <a name="sw-item-get-ready"></a><h3>sw_item_get_ready ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_item_get_ready                   (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_item_get_ready                   (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_item_push_pending ()">
@@ -208,20 +216,27 @@
 <hr>
 <div class="refsect2" title="sw_item_equal ()">
 <a name="sw-item-equal"></a><h3>sw_item_equal ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_item_equal                       (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *a</code></em>,
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_item_equal                       (<em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *a</code></em>,
                                                          <em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *b</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_item_set_new ()">
 <a name="sw-item-set-new"></a><h3>sw_item_set_new ()</h3>
-<pre class="programlisting"><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="returnvalue">SwSet</span></a> *             sw_item_set_new                     (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">SwSet</span> *             sw_item_set_new                     (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 </div>
 </div>
 <div class="refsect1" title="Property Details">
 <a name="SwItem.property-details"></a><h2>Property Details</h2>
 <div class="refsect2" title='The "ready" property'>
 <a name="SwItem--ready"></a><h3>The <code class="literal">"ready"</code> property</h3>
-<pre class="programlisting">  "ready"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read</pre>
+<pre class="programlisting">  "ready"                    <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read</pre>
+<p>Whether item is ready to set out.</p>
+<p>Default value: FALSE</p>
+</div>
+<hr>
+<div class="refsect2" title='The "ready" property'>
+<a name="SwItem--ready"></a><h3>The <code class="literal">"ready"</code> property</h3>
+<pre class="programlisting">  "ready"                    <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read</pre>
 <p>Whether item is ready to set out.</p>
 <p>Default value: FALSE</p>
 </div>
@@ -231,7 +246,13 @@
 <div class="refsect2" title='The "changed" signal'>
 <a name="SwItem-changed"></a><h3>The <code class="literal">"changed"</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a>  *switem,
-                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data)      : Run First</pre>
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data)      : Run First</pre>
+</div>
+<hr>
+<div class="refsect2" title='The "changed" signal'>
+<a name="SwItem-changed"></a><h3>The <code class="literal">"changed"</code> signal</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a>  *switem,
+                                                        <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data)      : Run First</pre>
 </div>
 </div>
 </div>
--- docs/libsocialweb/html/SwItemStream.html
+++ docs/libsocialweb/html/SwItemStream.html
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SwItemStream</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="libsocialweb Reference Manual">
-<link rel="up" href="ch01.html" title="libsocialweb">
-<link rel="prev" href="SwItemView.html" title="SwItemView">
-<link rel="next" href="SwItem.html" title="SwItem">
-<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="SwItemView.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.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">libsocialweb Reference Manual</th>
-<td><a accesskey="n" href="SwItem.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#SwItemStream.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#SwItemStream.description" class="shortcut">Description</a>
-                   | 
-                  <a href="#SwItemStream.object-hierarchy" class="shortcut">Object Hierarchy</a>
-                   | 
-                  <a href="#SwItemStream.implemented-interfaces" class="shortcut">Implemented Interfaces</a>
-                   | 
-                  <a href="#SwItemStream.properties" class="shortcut">Properties</a>
-</td></tr>
-</table>
-<div class="refentry" title="SwItemStream">
-<a name="SwItemStream"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="SwItemStream.top_of_page"></a>SwItemStream</span></h2>
-<p>SwItemStream</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="SwItemStream.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">                    <a class="link" href="SwItemStream.html#SwItemStream-struct" title="SwItemStream">SwItemStream</a>;
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       <a class="link" href="SwItemStream.html#sw-item-stream-get-object-path" title="sw_item_stream_get_object_path ()">sw_item_stream_get_object_path</a>      (<em class="parameter"><code><a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a> *item_stream</code></em>);
-<a class="link" href="SwService.html" title="SwService"><span class="returnvalue">SwService</span></a> *         <a class="link" href="SwItemStream.html#sw-item-stream-get-service" title="sw_item_stream_get_service ()">sw_item_stream_get_service</a>          (<em class="parameter"><code><a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a> *item_stream</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="SwItemStream.html#sw-item-stream-add-items" title="sw_item_stream_add_items ()">sw_item_stream_add_items</a>            (<em class="parameter"><code><a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a> *item_stream</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *items</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="SwItemStream.html#sw-item-stream-add-item" title="sw_item_stream_add_item ()">sw_item_stream_add_item</a>             (<em class="parameter"><code><a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a> *item_stream</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="SwItemStream.html#sw-item-stream-update-items" title="sw_item_stream_update_items ()">sw_item_stream_update_items</a>         (<em class="parameter"><code><a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a> *item_stream</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *items</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="SwItemStream.html#sw-item-stream-update-item" title="sw_item_stream_update_item ()">sw_item_stream_update_item</a>          (<em class="parameter"><code><a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a> *item_stream</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="SwItemStream.html#sw-item-stream-remove-items" title="sw_item_stream_remove_items ()">sw_item_stream_remove_items</a>         (<em class="parameter"><code><a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a> *item_stream</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *items</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="SwItemStream.html#sw-item-stream-remove-item" title="sw_item_stream_remove_item ()">sw_item_stream_remove_item</a>          (<em class="parameter"><code><a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a> *item_stream</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Object Hierarchy">
-<a name="SwItemStream.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>
-   +----SwItemStream
-</pre>
-</div>
-<div class="refsect1" title="Implemented Interfaces">
-<a name="SwItemStream.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
-<p>
-SwItemStream implements
- SwItemViewIface.</p>
-</div>
-<div class="refsect1" title="Properties">
-<a name="SwItemStream.properties"></a><h2>Properties</h2>
-<pre class="synopsis">
-  "<a class="link" href="SwItemStream.html#SwItemStream--object-path" title='The "object-path" property'>object-path</a>"              <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read
-  "<a class="link" href="SwItemStream.html#SwItemStream--service" title='The "service" property'>service</a>"                  <a class="link" href="SwService.html" title="SwService"><span class="type">SwService</span></a>*            : Read / Write / Construct Only
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="SwItemStream.description"></a><h2>Description</h2>
-</div>
-<div class="refsect1" title="Details">
-<a name="SwItemStream.details"></a><h2>Details</h2>
-<div class="refsect2" title="SwItemStream">
-<a name="SwItemStream-struct"></a><h3>SwItemStream</h3>
-<pre class="programlisting">typedef struct _SwItemStream SwItemStream;</pre>
-</div>
-<hr>
-<div class="refsect2" title="sw_item_stream_get_object_path ()">
-<a name="sw-item-stream-get-object-path"></a><h3>sw_item_stream_get_object_path ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       sw_item_stream_get_object_path      (<em class="parameter"><code><a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a> *item_stream</code></em>);</pre>
-<p>
-Since <a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a> is responsible for constructing the object path and
-registering the object on the bus. This function is necessary for
-<a class="link" href="SwCore.html" title="SwCore"><span class="type">SwCore</span></a> to be able to return the object path as the result of a
-function to open a view.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>item_stream</code></em> :</span></p></td>
-<td>A <a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> A string providing the object path.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="sw_item_stream_get_service ()">
-<a name="sw-item-stream-get-service"></a><h3>sw_item_stream_get_service ()</h3>
-<pre class="programlisting"><a class="link" href="SwService.html" title="SwService"><span class="returnvalue">SwService</span></a> *         sw_item_stream_get_service          (<em class="parameter"><code><a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a> *item_stream</code></em>);</pre>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>item_stream</code></em> :</span></p></td>
-<td>A <a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> The <a class="link" href="SwService.html" title="SwService"><span class="type">SwService</span></a> that <a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a> is for
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="sw_item_stream_add_items ()">
-<a name="sw-item-stream-add-items"></a><h3>sw_item_stream_add_items ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                sw_item_stream_add_items            (<em class="parameter"><code><a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a> *item_stream</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *items</code></em>);</pre>
-<p>
-Add the items supplied in the list from the <a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a>. This will cause
-signal emissions over the bus.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>item_stream</code></em> :</span></p></td>
-<td>A <a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>items</code></em> :</span></p></td>
-<td>A list of <a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> objects
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="sw_item_stream_add_item ()">
-<a name="sw-item-stream-add-item"></a><h3>sw_item_stream_add_item ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                sw_item_stream_add_item             (<em class="parameter"><code><a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a> *item_stream</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);</pre>
-<p>
-Add a single item in the <a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a>. This will cause a signal to be
-emitted across the bus.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>item_stream</code></em> :</span></p></td>
-<td>A <a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td>A <a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="sw_item_stream_update_items ()">
-<a name="sw-item-stream-update-items"></a><h3>sw_item_stream_update_items ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                sw_item_stream_update_items         (<em class="parameter"><code><a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a> *item_stream</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *items</code></em>);</pre>
-<p>
-Update the items supplied in the list in the <a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a>. This is
-will cause signal emissions over the bus.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>item_stream</code></em> :</span></p></td>
-<td>A <a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>items</code></em> :</span></p></td>
-<td>A list of <a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> objects that need updating
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="sw_item_stream_update_item ()">
-<a name="sw-item-stream-update-item"></a><h3>sw_item_stream_update_item ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                sw_item_stream_update_item          (<em class="parameter"><code><a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a> *item_stream</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);</pre>
-<p>
-Update a single item in the <a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a>. This will cause a signal to be
-emitted across the bus.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>item_stream</code></em> :</span></p></td>
-<td>A <a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td>A <a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="sw_item_stream_remove_items ()">
-<a name="sw-item-stream-remove-items"></a><h3>sw_item_stream_remove_items ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                sw_item_stream_remove_items         (<em class="parameter"><code><a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a> *item_stream</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *items</code></em>);</pre>
-<p>
-Remove the items supplied in the list from the <a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a>. This will cause
-signal emissions over the bus.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>item_stream</code></em> :</span></p></td>
-<td>A <a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>items</code></em> :</span></p></td>
-<td>A list of <a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> objects
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="sw_item_stream_remove_item ()">
-<a name="sw-item-stream-remove-item"></a><h3>sw_item_stream_remove_item ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                sw_item_stream_remove_item          (<em class="parameter"><code><a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a> *item_stream</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a> *item</code></em>);</pre>
-<p>
-Remove a single item to the <a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a>. This will cause a signal to be
-emitted across the bus.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>item_stream</code></em> :</span></p></td>
-<td>A <a class="link" href="SwItemStream.html" title="SwItemStream"><span class="type">SwItemStream</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td>A <a class="link" href="SwItem.html" title="SwItem"><span class="type">SwItem</span></a>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-<div class="refsect1" title="Property Details">
-<a name="SwItemStream.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "object-path" property'>
-<a name="SwItemStream--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"><span class="type">gchar</span></a>*                : Read</pre>
-<p>The object path of this view.</p>
-<p>Default value: NULL</p>
-</div>
-<hr>
-<div class="refsect2" title='The "service" property'>
-<a name="SwItemStream--service"></a><h3>The <code class="literal">"service"</code> property</h3>
-<pre class="programlisting">  "service"                  <a class="link" href="SwService.html" title="SwService"><span class="type">SwService</span></a>*            : Read / Write / Construct Only</pre>
-<p>The service this view is using.</p>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
-          Generated by GTK-Doc V1.15</div>
-</body>
-</html>--- docs/libsocialweb/html/SwItemView.html
+++ docs/libsocialweb/html/SwItemView.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="libsocialweb Reference Manual">
 <link rel="up" href="ch01.html" title="libsocialweb">
 <link rel="prev" href="libsocialweb-sw-enum-types.html" title="sw-enum-types">
-<link rel="next" href="SwItemStream.html" title="SwItemStream">
+<link rel="next" href="SwItem.html" title="SwItem">
 <meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -18,7 +18,7 @@
 <td><a accesskey="u" href="ch01.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">libsocialweb Reference Manual</th>
-<td><a accesskey="n" href="SwItemStream.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="SwItem.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
 <tr><td colspan="5" class="shortcuts">
 <a href="#SwItemView.synopsis" class="shortcut">Top</a>
@@ -46,17 +46,17 @@
 <pre class="synopsis">                    <a class="link" href="SwItemView.html#SwItemView-struct" title="SwItemView">SwItemView</a>;
                     <a class="link" href="SwItemView.html#SwItemViewClass" title="SwItemViewClass">SwItemViewClass</a>;
 <span class="returnvalue">void</span>                <a class="link" href="SwItemView.html#sw-item-view-set-from-set" title="sw_item_view_set_from_set ()">sw_item_view_set_from_set</a>           (<em class="parameter"><code><a class="link" href="SwItemView.html" title="SwItemView"><span class="type">SwItemView</span></a> *item_view</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>);
+                                                         <em class="parameter"><code><span class="type">SwSet</span> *set</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="SwItemView.html#sw-item-view-remove-by-uid" title="sw_item_view_remove_by_uid ()">sw_item_view_remove_by_uid</a>          (<em class="parameter"><code><a class="link" href="SwItemView.html" title="SwItemView"><span class="type">SwItemView</span></a> *item_view</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *uid</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       <a class="link" href="SwItemView.html#sw-item-view-get-object-path" title="sw_item_view_get_object_path ()">sw_item_view_get_object_path</a>        (<em class="parameter"><code><a class="link" href="SwItemView.html" title="SwItemView"><span class="type">SwItemView</span></a> *item_view</code></em>);
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *uid</code></em>);
+const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       <a class="link" href="SwItemView.html#sw-item-view-get-object-path" title="sw_item_view_get_object_path ()">sw_item_view_get_object_path</a>        (<em class="parameter"><code><a class="link" href="SwItemView.html" title="SwItemView"><span class="type">SwItemView</span></a> *item_view</code></em>);
 <a class="link" href="SwService.html" title="SwService"><span class="returnvalue">SwService</span></a> *         <a class="link" href="SwItemView.html#sw-item-view-get-service" title="sw_item_view_get_service ()">sw_item_view_get_service</a>            (<em class="parameter"><code><a class="link" href="SwItemView.html" title="SwItemView"><span class="type">SwItemView</span></a> *item_view</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Object Hierarchy">
 <a name="SwItemView.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>
    +----SwItemView
 </pre>
 </div>
@@ -69,7 +69,7 @@
 <div class="refsect1" title="Properties">
 <a name="SwItemView.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
-  "<a class="link" href="SwItemView.html#SwItemView--object-path" title='The "object-path" property'>object-path</a>"              <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read
+  "<a class="link" href="SwItemView.html#SwItemView--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>*                : Read
   "<a class="link" href="SwItemView.html#SwItemView--service" title='The "service" property'>service</a>"                  <a class="link" href="SwService.html" title="SwService"><span class="type">SwService</span></a>*            : Read / Write / Construct Only
 </pre>
 </div>
@@ -98,9 +98,9 @@
 <div class="refsect2" title="sw_item_view_set_from_set ()">
 <a name="sw-item-view-set-from-set"></a><h3>sw_item_view_set_from_set ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                sw_item_view_set_from_set           (<em class="parameter"><code><a class="link" href="SwItemView.html" title="SwItemView"><span class="type">SwItemView</span></a> *item_view</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>);</pre>
+                                                         <em class="parameter"><code><span class="type">SwSet</span> *set</code></em>);</pre>
 <p>
-Updates what the view contains based on the given <a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a>. Removed
+Updates what the view contains based on the given <span class="type">SwSet</span>. Removed
 signals will be fired for any items that were in the view but that are not
 present in the supplied set. Conversely any items that are new will cause
 signals to be fired indicating their addition.
@@ -118,7 +118,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>set</code></em> :</span></p></td>
-<td>A <a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a>
+<td>A <span class="type">SwSet</span>
 </td>
 </tr>
 </tbody>
@@ -128,12 +128,12 @@
 <div class="refsect2" title="sw_item_view_remove_by_uid ()">
 <a name="sw-item-view-remove-by-uid"></a><h3>sw_item_view_remove_by_uid ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                sw_item_view_remove_by_uid          (<em class="parameter"><code><a class="link" href="SwItemView.html" title="SwItemView"><span class="type">SwItemView</span></a> *item_view</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *uid</code></em>);</pre>
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *uid</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_item_view_get_object_path ()">
 <a name="sw-item-view-get-object-path"></a><h3>sw_item_view_get_object_path ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       sw_item_view_get_object_path        (<em class="parameter"><code><a class="link" href="SwItemView.html" title="SwItemView"><span class="type">SwItemView</span></a> *item_view</code></em>);</pre>
+<pre class="programlisting">const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       sw_item_view_get_object_path        (<em class="parameter"><code><a class="link" href="SwItemView.html" title="SwItemView"><span class="type">SwItemView</span></a> *item_view</code></em>);</pre>
 <p>
 Since <a class="link" href="SwItemView.html" title="SwItemView"><span class="type">SwItemView</span></a> is responsible for constructing the object path and
 registering the object on the bus. This function is necessary for
@@ -181,7 +181,7 @@
 <a name="SwItemView.property-details"></a><h2>Property Details</h2>
 <div class="refsect2" title='The "object-path" property'>
 <a name="SwItemView--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"><span class="type">gchar</span></a>*                : Read</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>*                : Read</pre>
 <p>The object path of this view.</p>
 <p>Default value: NULL</p>
 </div>
--- docs/libsocialweb/html/SwService.html
+++ docs/libsocialweb/html/SwService.html
@@ -43,7 +43,7 @@
 <a name="SwService.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">enum                <a class="link" href="SwService.html#SwServiceError" title="enum SwServiceError">SwServiceError</a>;
 #define             <a class="link" href="SwService.html#SW-SERVICE-ERROR:CAPS" title="SW_SERVICE_ERROR">SW_SERVICE_ERROR</a>
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="SwService.html#sw-service-error-quark" title="sw_service_error_quark ()">sw_service_error_quark</a>              (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="SwService.html#sw-service-error-quark" title="sw_service_error_quark ()">sw_service_error_quark</a>              (<em class="parameter"><code><span class="type">void</span></code></em>);
                     <a class="link" href="SwService.html#SwService-struct" title="SwService">SwService</a>;
                     <a class="link" href="SwService.html#SwServiceClass" title="SwServiceClass">SwServiceClass</a>;
 #define             <a class="link" href="SwService.html#IS-CONFIGURED:CAPS" title="IS_CONFIGURED">IS_CONFIGURED</a>
@@ -53,27 +53,19 @@
 #define             <a class="link" href="SwService.html#CAN-UPDATE-STATUS:CAPS" title="CAN_UPDATE_STATUS">CAN_UPDATE_STATUS</a>
 #define             <a class="link" href="SwService.html#CAN-REQUEST-AVATAR:CAPS" title="CAN_REQUEST_AVATAR">CAN_REQUEST_AVATAR</a>
 #define             <a class="link" href="SwService.html#CAN-GEOTAG:CAPS" title="CAN_GEOTAG">CAN_GEOTAG</a>
-#define             <a class="link" href="SwService.html#CAN-UPDATE-STATUS-WITH-GEOTAG:CAPS" title="CAN_UPDATE_STATUS_WITH_GEOTAG">CAN_UPDATE_STATUS_WITH_GEOTAG</a>
-#define             <a class="link" href="SwService.html#HAS-AVATAR-IFACE:CAPS" title="HAS_AVATAR_IFACE">HAS_AVATAR_IFACE</a>
-#define             <a class="link" href="SwService.html#HAS-BANISHABLE-IFACE:CAPS" title="HAS_BANISHABLE_IFACE">HAS_BANISHABLE_IFACE</a>
-#define             <a class="link" href="SwService.html#HAS-PHOTO-UPLOAD-IFACE:CAPS" title="HAS_PHOTO_UPLOAD_IFACE">HAS_PHOTO_UPLOAD_IFACE</a>
-#define             <a class="link" href="SwService.html#HAS-QUERY-IFACE:CAPS" title="HAS_QUERY_IFACE">HAS_QUERY_IFACE</a>
-#define             <a class="link" href="SwService.html#HAS-UPDATE-STATUS-IFACE:CAPS" title="HAS_UPDATE_STATUS_IFACE">HAS_UPDATE_STATUS_IFACE</a>
 const <span class="returnvalue">char</span> *        <a class="link" href="SwService.html#sw-service-get-name" title="sw_service_get_name ()">sw_service_get_name</a>                 (<em class="parameter"><code><a class="link" href="SwService.html" title="SwService"><span class="type">SwService</span></a> *service</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="SwService.html#sw-service-emit-capabilities-changed" title="sw_service_emit_capabilities_changed ()">sw_service_emit_capabilities_changed</a>
                                                         (<em class="parameter"><code><a class="link" href="SwService.html" title="SwService"><span class="type">SwService</span></a> *service</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> **caps</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="SwService.html#sw-service-emit-user-changed" title="sw_service_emit_user_changed ()">sw_service_emit_user_changed</a>        (<em class="parameter"><code><a class="link" href="SwService.html" title="SwService"><span class="type">SwService</span></a> *service</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="SwService.html#sw-service-is-uid-banned" title="sw_service_is_uid_banned ()">sw_service_is_uid_banned</a>            (<em class="parameter"><code><a class="link" href="SwService.html" title="SwService"><span class="type">SwService</span></a> *service</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *uid</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="SwService.html#sw-service-has-cap" title="sw_service_has_cap ()">sw_service_has_cap</a>                  (<em class="parameter"><code>const <span class="type">char</span> **caps</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *cap</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="SwService.html#sw-service-is-uid-banned" title="sw_service_is_uid_banned ()">sw_service_is_uid_banned</a>            (<em class="parameter"><code><a class="link" href="SwService.html" title="SwService"><span class="type">SwService</span></a> *service</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *uid</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Object Hierarchy">
 <a name="SwService.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>
    +----SwService
 </pre>
 </div>
@@ -105,7 +97,7 @@
 <hr>
 <div class="refsect2" title="sw_service_error_quark ()">
 <a name="sw-service-error-quark"></a><h3>sw_service_error_quark ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              sw_service_error_quark              (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              sw_service_error_quark              (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="SwService">
@@ -168,42 +160,6 @@
 </pre>
 </div>
 <hr>
-<div class="refsect2" title="CAN_UPDATE_STATUS_WITH_GEOTAG">
-<a name="CAN-UPDATE-STATUS-WITH-GEOTAG:CAPS"></a><h3>CAN_UPDATE_STATUS_WITH_GEOTAG</h3>
-<pre class="programlisting">#define CAN_UPDATE_STATUS_WITH_GEOTAG "can-update-status-with-geotag"
-</pre>
-</div>
-<hr>
-<div class="refsect2" title="HAS_AVATAR_IFACE">
-<a name="HAS-AVATAR-IFACE:CAPS"></a><h3>HAS_AVATAR_IFACE</h3>
-<pre class="programlisting">#define HAS_AVATAR_IFACE "has-avatar-iface"
-</pre>
-</div>
-<hr>
-<div class="refsect2" title="HAS_BANISHABLE_IFACE">
-<a name="HAS-BANISHABLE-IFACE:CAPS"></a><h3>HAS_BANISHABLE_IFACE</h3>
-<pre class="programlisting">#define HAS_BANISHABLE_IFACE "has-banishable-iface"
-</pre>
-</div>
-<hr>
-<div class="refsect2" title="HAS_PHOTO_UPLOAD_IFACE">
-<a name="HAS-PHOTO-UPLOAD-IFACE:CAPS"></a><h3>HAS_PHOTO_UPLOAD_IFACE</h3>
-<pre class="programlisting">#define HAS_PHOTO_UPLOAD_IFACE "has-photo-upload-iface"
-</pre>
-</div>
-<hr>
-<div class="refsect2" title="HAS_QUERY_IFACE">
-<a name="HAS-QUERY-IFACE:CAPS"></a><h3>HAS_QUERY_IFACE</h3>
-<pre class="programlisting">#define HAS_QUERY_IFACE "has-query-iface"
-</pre>
-</div>
-<hr>
-<div class="refsect2" title="HAS_UPDATE_STATUS_IFACE">
-<a name="HAS-UPDATE-STATUS-IFACE:CAPS"></a><h3>HAS_UPDATE_STATUS_IFACE</h3>
-<pre class="programlisting">#define HAS_UPDATE_STATUS_IFACE "has-update-status-iface"
-</pre>
-</div>
-<hr>
 <div class="refsect2" title="sw_service_get_name ()">
 <a name="sw-service-get-name"></a><h3>sw_service_get_name ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        sw_service_get_name                 (<em class="parameter"><code><a class="link" href="SwService.html" title="SwService"><span class="type">SwService</span></a> *service</code></em>);</pre>
@@ -223,14 +179,8 @@
 <hr>
 <div class="refsect2" title="sw_service_is_uid_banned ()">
 <a name="sw-service-is-uid-banned"></a><h3>sw_service_is_uid_banned ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_service_is_uid_banned            (<em class="parameter"><code><a class="link" href="SwService.html" title="SwService"><span class="type">SwService</span></a> *service</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *uid</code></em>);</pre>
-</div>
-<hr>
-<div class="refsect2" title="sw_service_has_cap ()">
-<a name="sw-service-has-cap"></a><h3>sw_service_has_cap ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_service_has_cap                  (<em class="parameter"><code>const <span class="type">char</span> **caps</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">char</span> *cap</code></em>);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_service_is_uid_banned            (<em class="parameter"><code><a class="link" href="SwService.html" title="SwService"><span class="type">SwService</span></a> *service</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *uid</code></em>);</pre>
 </div>
 </div>
 </div>
--- docs/libsocialweb/html/api-index-full.html
+++ docs/libsocialweb/html/api-index-full.html
@@ -34,8 +34,6 @@
                       | 
                    <a class="shortcut" href="#idxM">M</a>
                       | 
-                   <a class="shortcut" href="#idxN">N</a>
-                      | 
                    <a class="shortcut" href="#idxO">O</a>
                       | 
                    <a class="shortcut" href="#idxS">S</a>
@@ -115,10 +113,6 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="SwService.html#CAN-UPDATE-STATUS-WITH-GEOTAG:CAPS" title="CAN_UPDATE_STATUS_WITH_GEOTAG">CAN_UPDATE_STATUS_WITH_GEOTAG</a>, macro in <a class="link" href="SwService.html" title="SwService">SwService</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="SwService.html#CAN-VERIFY-CREDENTIALS:CAPS" title="CAN_VERIFY_CREDENTIALS">CAN_VERIFY_CREDENTIALS</a>, macro in <a class="link" href="SwService.html" title="SwService">SwService</a>
 </dt>
 <dd></dd>
@@ -139,6 +133,14 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="SwCore.html#SwCoreClass" title="SwCoreClass">SwCoreClass</a>, struct in <a class="link" href="SwCore.html" title="SwCore">SwCore</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="SwCore.html#SwCorePrivate" title="SwCorePrivate">SwCorePrivate</a>, struct in <a class="link" href="SwCore.html" title="SwCore">SwCore</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="SwCore.html#sw-core-dup-singleton" title="sw_core_dup_singleton ()">sw_core_dup_singleton</a>, function in <a class="link" href="SwCore.html" title="SwCore">SwCore</a>
 </dt>
 <dd></dd>
@@ -196,26 +198,6 @@
 <a class="link" href="libsocialweb-sw-utils.html#sw-hash-string-dict" title="sw_hash_string_dict ()">sw_hash_string_dict</a>, function in <a class="link" href="libsocialweb-sw-utils.html" title="sw-utils">sw-utils</a>
 </dt>
 <dd></dd>
-<dt>
-<a class="link" href="SwService.html#HAS-AVATAR-IFACE:CAPS" title="HAS_AVATAR_IFACE">HAS_AVATAR_IFACE</a>, macro in <a class="link" href="SwService.html" title="SwService">SwService</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="SwService.html#HAS-BANISHABLE-IFACE:CAPS" title="HAS_BANISHABLE_IFACE">HAS_BANISHABLE_IFACE</a>, macro in <a class="link" href="SwService.html" title="SwService">SwService</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="SwService.html#HAS-PHOTO-UPLOAD-IFACE:CAPS" title="HAS_PHOTO_UPLOAD_IFACE">HAS_PHOTO_UPLOAD_IFACE</a>, macro in <a class="link" href="SwService.html" title="SwService">SwService</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="SwService.html#HAS-QUERY-IFACE:CAPS" title="HAS_QUERY_IFACE">HAS_QUERY_IFACE</a>, macro in <a class="link" href="SwService.html" title="SwService">SwService</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="SwService.html#HAS-UPDATE-STATUS-IFACE:CAPS" title="HAS_UPDATE_STATUS_IFACE">HAS_UPDATE_STATUS_IFACE</a>, macro in <a class="link" href="SwService.html" title="SwService">SwService</a>
-</dt>
-<dd></dd>
 <a name="idxI"></a><h3 class="title">I</h3>
 <dt>
 <a class="link" href="libsocialweb-sw-web.html#ImageDownloadCallback" title="ImageDownloadCallback ()">ImageDownloadCallback</a>, user_function in <a class="link" href="libsocialweb-sw-web.html" title="sw-web">sw-web</a>
@@ -246,15 +228,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="SwItemStream.html#SwItemStream-struct" title="SwItemStream">SwItemStream</a>, struct in <a class="link" href="SwItemStream.html" title="SwItemStream">SwItemStream</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="SwItemStream.html#SwItemStream--object-path" title='The "object-path" property'>SwItemStream:object-path</a>, object property in <a class="link" href="SwItemStream.html" title="SwItemStream">SwItemStream</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="SwItemStream.html#SwItemStream--service" title='The "service" property'>SwItemStream:service</a>, object property in <a class="link" href="SwItemStream.html" title="SwItemStream">SwItemStream</a>
+<a class="link" href="SwItem.html#SwItemPrivate" title="SwItemPrivate">SwItemPrivate</a>, struct in <a class="link" href="SwItem.html" title="SwItem">SwItem</a>
 </dt>
 <dd></dd>
 <dt>
@@ -338,38 +312,6 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="SwItemStream.html#sw-item-stream-add-item" title="sw_item_stream_add_item ()">sw_item_stream_add_item</a>, function in <a class="link" href="SwItemStream.html" title="SwItemStream">SwItemStream</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="SwItemStream.html#sw-item-stream-add-items" title="sw_item_stream_add_items ()">sw_item_stream_add_items</a>, function in <a class="link" href="SwItemStream.html" title="SwItemStream">SwItemStream</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="SwItemStream.html#sw-item-stream-get-object-path" title="sw_item_stream_get_object_path ()">sw_item_stream_get_object_path</a>, function in <a class="link" href="SwItemStream.html" title="SwItemStream">SwItemStream</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="SwItemStream.html#sw-item-stream-get-service" title="sw_item_stream_get_service ()">sw_item_stream_get_service</a>, function in <a class="link" href="SwItemStream.html" title="SwItemStream">SwItemStream</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="SwItemStream.html#sw-item-stream-remove-item" title="sw_item_stream_remove_item ()">sw_item_stream_remove_item</a>, function in <a class="link" href="SwItemStream.html" title="SwItemStream">SwItemStream</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="SwItemStream.html#sw-item-stream-remove-items" title="sw_item_stream_remove_items ()">sw_item_stream_remove_items</a>, function in <a class="link" href="SwItemStream.html" title="SwItemStream">SwItemStream</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="SwItemStream.html#sw-item-stream-update-item" title="sw_item_stream_update_item ()">sw_item_stream_update_item</a>, function in <a class="link" href="SwItemStream.html" title="SwItemStream">SwItemStream</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="SwItemStream.html#sw-item-stream-update-items" title="sw_item_stream_update_items ()">sw_item_stream_update_items</a>, function in <a class="link" href="SwItemStream.html" title="SwItemStream">SwItemStream</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="SwItem.html#sw-item-take" title="sw_item_take ()">sw_item_take</a>, function in <a class="link" href="SwItem.html" title="SwItem">SwItem</a>
 </dt>
 <dd></dd>
@@ -439,11 +381,6 @@
 <a class="link" href="libsocialweb-sw-module.html#sw-module-get-type" title="sw_module_get_type ()">sw_module_get_type</a>, function in <a class="link" href="libsocialweb-sw-module.html" title="sw-module">sw-module</a>
 </dt>
 <dd></dd>
-<a name="idxN"></a><h3 class="title">N</h3>
-<dt>
-<a class="link" href="libsocialweb-sw-utils.html#sw-next-opid" title="sw_next_opid ()">sw_next_opid</a>, function in <a class="link" href="libsocialweb-sw-utils.html" title="sw-utils">sw-utils</a>
-</dt>
-<dd></dd>
 <a name="idxO"></a><h3 class="title">O</h3>
 <dt>
 <a class="link" href="libsocialweb-sw-online.html#SwOnlineNotify" title="SwOnlineNotify ()">SwOnlineNotify</a>, user_function in <a class="link" href="libsocialweb-sw-online.html" title="sw-online">sw-online</a>
@@ -495,18 +432,10 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="SwService.html#sw-service-has-cap" title="sw_service_has_cap ()">sw_service_has_cap</a>, function in <a class="link" href="SwService.html" title="SwService">SwService</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="SwService.html#sw-service-is-uid-banned" title="sw_service_is_uid_banned ()">sw_service_is_uid_banned</a>, function in <a class="link" href="SwService.html" title="SwService">SwService</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet">SwSet</a>, struct in <a class="link" href="libsocialweb-SwSet.html" title="SwSet">SwSet</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="libsocialweb-SwSet.html#SwSetFilterFunc" title="SwSetFilterFunc ()">SwSetFilterFunc</a>, user_function in <a class="link" href="libsocialweb-SwSet.html" title="SwSet">SwSet</a>
 </dt>
 <dd></dd>
--- docs/libsocialweb/html/ch01.html
+++ docs/libsocialweb/html/ch01.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter" title="libsocialweb">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id491919"></a>libsocialweb</h2></div></div></div>
+<a name="id538168"></a>libsocialweb</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="libsocialweb-sw-banned.html">sw-banned</a></span><span class="refpurpose"></span>
@@ -48,9 +48,6 @@
 <span class="refentrytitle"><a href="SwItemView.html">SwItemView</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="SwItemStream.html">SwItemStream</a></span><span class="refpurpose"></span>
-</dt>
-<dt>
 <span class="refentrytitle"><a href="SwItem.html">SwItem</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
@@ -72,6 +69,7 @@
 <span class="refentrytitle"><a href="libsocialweb-sw-web.html">sw-web</a></span><span class="refpurpose"></span>
 </dt>
 </dl></div>
+<span style="color: red"><xi:include></xi:include></span>
 </div>
 <div class="footer">
 <hr>
--- docs/libsocialweb/html/ch02.html
+++ docs/libsocialweb/html/ch02.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter" title="libsocialweb-keyfob">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id508061"></a>libsocialweb-keyfob</h2></div></div></div>
+<a name="id512266"></a>libsocialweb-keyfob</h2></div></div></div>
 <div class="toc"><dl><dt>
 <span class="refentrytitle"><a href="libsocialweb-sw-keyfob.html">sw-keyfob</a></span><span class="refpurpose"></span>
 </dt></dl></div>
--- docs/libsocialweb/html/ch03.html
+++ docs/libsocialweb/html/ch03.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter" title="libsocialweb-keystore">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id507799"></a>libsocialweb-keystore</h2></div></div></div>
+<a name="id534107"></a>libsocialweb-keystore</h2></div></div></div>
 <div class="toc"><dl><dt>
 <span class="refentrytitle"><a href="libsocialweb-sw-keystore.html">sw-keystore</a></span><span class="refpurpose"></span>
 </dt></dl></div>
--- docs/libsocialweb/html/index.html
+++ docs/libsocialweb/html/index.html
@@ -43,9 +43,6 @@
 <span class="refentrytitle"><a href="SwItemView.html">SwItemView</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="SwItemStream.html">SwItemStream</a></span><span class="refpurpose"></span>
-</dt>
-<dt>
 <span class="refentrytitle"><a href="SwItem.html">SwItem</a></span><span class="refpurpose"></span>
 </dt>
 <dt>
--- docs/libsocialweb/html/index.sgml
+++ docs/libsocialweb/html/index.sgml
@@ -36,7 +36,9 @@
 <ANCHOR id="SwCore.implemented-interfaces" href="libsocialweb/SwCore.html#SwCore.implemented-interfaces">
 <ANCHOR id="SwCore.description" href="libsocialweb/SwCore.html#SwCore.description">
 <ANCHOR id="SwCore.details" href="libsocialweb/SwCore.html#SwCore.details">
+<ANCHOR id="SwCorePrivate" href="libsocialweb/SwCore.html#SwCorePrivate">
 <ANCHOR id="SwCore-struct" href="libsocialweb/SwCore.html#SwCore-struct">
+<ANCHOR id="SwCoreClass" href="libsocialweb/SwCore.html#SwCoreClass">
 <ANCHOR id="sw-core-new" href="libsocialweb/SwCore.html#sw-core-new">
 <ANCHOR id="sw-core-run" href="libsocialweb/SwCore.html#sw-core-run">
 <ANCHOR id="sw-core-is-item-banned" href="libsocialweb/SwCore.html#sw-core-is-item-banned">
@@ -75,25 +77,6 @@
 <ANCHOR id="SwItemView.property-details" href="libsocialweb/SwItemView.html#SwItemView.property-details">
 <ANCHOR id="SwItemView--object-path" href="libsocialweb/SwItemView.html#SwItemView--object-path">
 <ANCHOR id="SwItemView--service" href="libsocialweb/SwItemView.html#SwItemView--service">
-<ANCHOR id="SwItemStream" href="libsocialweb/SwItemStream.html">
-<ANCHOR id="SwItemStream.synopsis" href="libsocialweb/SwItemStream.html#SwItemStream.synopsis">
-<ANCHOR id="SwItemStream.object-hierarchy" href="libsocialweb/SwItemStream.html#SwItemStream.object-hierarchy">
-<ANCHOR id="SwItemStream.implemented-interfaces" href="libsocialweb/SwItemStream.html#SwItemStream.implemented-interfaces">
-<ANCHOR id="SwItemStream.properties" href="libsocialweb/SwItemStream.html#SwItemStream.properties">
-<ANCHOR id="SwItemStream.description" href="libsocialweb/SwItemStream.html#SwItemStream.description">
-<ANCHOR id="SwItemStream.details" href="libsocialweb/SwItemStream.html#SwItemStream.details">
-<ANCHOR id="SwItemStream-struct" href="libsocialweb/SwItemStream.html#SwItemStream-struct">
-<ANCHOR id="sw-item-stream-get-object-path" href="libsocialweb/SwItemStream.html#sw-item-stream-get-object-path">
-<ANCHOR id="sw-item-stream-get-service" href="libsocialweb/SwItemStream.html#sw-item-stream-get-service">
-<ANCHOR id="sw-item-stream-add-items" href="libsocialweb/SwItemStream.html#sw-item-stream-add-items">
-<ANCHOR id="sw-item-stream-add-item" href="libsocialweb/SwItemStream.html#sw-item-stream-add-item">
-<ANCHOR id="sw-item-stream-update-items" href="libsocialweb/SwItemStream.html#sw-item-stream-update-items">
-<ANCHOR id="sw-item-stream-update-item" href="libsocialweb/SwItemStream.html#sw-item-stream-update-item">
-<ANCHOR id="sw-item-stream-remove-items" href="libsocialweb/SwItemStream.html#sw-item-stream-remove-items">
-<ANCHOR id="sw-item-stream-remove-item" href="libsocialweb/SwItemStream.html#sw-item-stream-remove-item">
-<ANCHOR id="SwItemStream.property-details" href="libsocialweb/SwItemStream.html#SwItemStream.property-details">
-<ANCHOR id="SwItemStream--object-path" href="libsocialweb/SwItemStream.html#SwItemStream--object-path">
-<ANCHOR id="SwItemStream--service" href="libsocialweb/SwItemStream.html#SwItemStream--service">
 <ANCHOR id="SwItem" href="libsocialweb/SwItem.html">
 <ANCHOR id="SwItem.synopsis" href="libsocialweb/SwItem.html#SwItem.synopsis">
 <ANCHOR id="SwItem.object-hierarchy" href="libsocialweb/SwItem.html#SwItem.object-hierarchy">
@@ -101,6 +84,7 @@
 <ANCHOR id="SwItem.signals" href="libsocialweb/SwItem.html#SwItem.signals">
 <ANCHOR id="SwItem.description" href="libsocialweb/SwItem.html#SwItem.description">
 <ANCHOR id="SwItem.details" href="libsocialweb/SwItem.html#SwItem.details">
+<ANCHOR id="SwItemPrivate" href="libsocialweb/SwItem.html#SwItemPrivate">
 <ANCHOR id="SwItem-struct" href="libsocialweb/SwItem.html#SwItem-struct">
 <ANCHOR id="SwItemClass" href="libsocialweb/SwItem.html#SwItemClass">
 <ANCHOR id="sw-item-new" href="libsocialweb/SwItem.html#sw-item-new">
@@ -123,8 +107,10 @@
 <ANCHOR id="sw-item-set-new" href="libsocialweb/SwItem.html#sw-item-set-new">
 <ANCHOR id="SwItem.property-details" href="libsocialweb/SwItem.html#SwItem.property-details">
 <ANCHOR id="SwItem--ready" href="libsocialweb/SwItem.html#SwItem--ready">
+<ANCHOR id="SwItem--ready" href="libsocialweb/SwItem.html#SwItem--ready">
 <ANCHOR id="SwItem.signal-details" href="libsocialweb/SwItem.html#SwItem.signal-details">
 <ANCHOR id="SwItem-changed" href="libsocialweb/SwItem.html#SwItem-changed">
+<ANCHOR id="SwItem-changed" href="libsocialweb/SwItem.html#SwItem-changed">
 <ANCHOR id="libsocialweb-sw-module" href="libsocialweb/libsocialweb-sw-module.html">
 <ANCHOR id="libsocialweb-sw-module.synopsis" href="libsocialweb/libsocialweb-sw-module.html#libsocialweb-sw-module.synopsis">
 <ANCHOR id="libsocialweb-sw-module.description" href="libsocialweb/libsocialweb-sw-module.html#libsocialweb-sw-module.description">
@@ -157,22 +143,14 @@
 <ANCHOR id="CAN-UPDATE-STATUS:CAPS" href="libsocialweb/SwService.html#CAN-UPDATE-STATUS:CAPS">
 <ANCHOR id="CAN-REQUEST-AVATAR:CAPS" href="libsocialweb/SwService.html#CAN-REQUEST-AVATAR:CAPS">
 <ANCHOR id="CAN-GEOTAG:CAPS" href="libsocialweb/SwService.html#CAN-GEOTAG:CAPS">
-<ANCHOR id="CAN-UPDATE-STATUS-WITH-GEOTAG:CAPS" href="libsocialweb/SwService.html#CAN-UPDATE-STATUS-WITH-GEOTAG:CAPS">
-<ANCHOR id="HAS-AVATAR-IFACE:CAPS" href="libsocialweb/SwService.html#HAS-AVATAR-IFACE:CAPS">
-<ANCHOR id="HAS-BANISHABLE-IFACE:CAPS" href="libsocialweb/SwService.html#HAS-BANISHABLE-IFACE:CAPS">
-<ANCHOR id="HAS-PHOTO-UPLOAD-IFACE:CAPS" href="libsocialweb/SwService.html#HAS-PHOTO-UPLOAD-IFACE:CAPS">
-<ANCHOR id="HAS-QUERY-IFACE:CAPS" href="libsocialweb/SwService.html#HAS-QUERY-IFACE:CAPS">
-<ANCHOR id="HAS-UPDATE-STATUS-IFACE:CAPS" href="libsocialweb/SwService.html#HAS-UPDATE-STATUS-IFACE:CAPS">
 <ANCHOR id="sw-service-get-name" href="libsocialweb/SwService.html#sw-service-get-name">
 <ANCHOR id="sw-service-emit-capabilities-changed" href="libsocialweb/SwService.html#sw-service-emit-capabilities-changed">
 <ANCHOR id="sw-service-emit-user-changed" href="libsocialweb/SwService.html#sw-service-emit-user-changed">
 <ANCHOR id="sw-service-is-uid-banned" href="libsocialweb/SwService.html#sw-service-is-uid-banned">
-<ANCHOR id="sw-service-has-cap" href="libsocialweb/SwService.html#sw-service-has-cap">
 <ANCHOR id="libsocialweb-SwSet" href="libsocialweb/libsocialweb-SwSet.html">
 <ANCHOR id="libsocialweb-SwSet.synopsis" href="libsocialweb/libsocialweb-SwSet.html#libsocialweb-SwSet.synopsis">
 <ANCHOR id="libsocialweb-SwSet.description" href="libsocialweb/libsocialweb-SwSet.html#libsocialweb-SwSet.description">
 <ANCHOR id="libsocialweb-SwSet.details" href="libsocialweb/libsocialweb-SwSet.html#libsocialweb-SwSet.details">
-<ANCHOR id="SwSet" href="libsocialweb/libsocialweb-SwSet.html#SwSet">
 <ANCHOR id="SW-TYPE-SET:CAPS" href="libsocialweb/libsocialweb-SwSet.html#SW-TYPE-SET:CAPS">
 <ANCHOR id="sw-set-get-type" href="libsocialweb/libsocialweb-SwSet.html#sw-set-get-type">
 <ANCHOR id="sw-set-new" href="libsocialweb/libsocialweb-SwSet.html#sw-set-new">
@@ -203,7 +181,6 @@
 <ANCHOR id="sw-time-t-from-string" href="libsocialweb/libsocialweb-sw-utils.html#sw-time-t-from-string">
 <ANCHOR id="sw-time-t-to-string" href="libsocialweb/libsocialweb-sw-utils.html#sw-time-t-to-string">
 <ANCHOR id="sw-hash-string-dict" href="libsocialweb/libsocialweb-sw-utils.html#sw-hash-string-dict">
-<ANCHOR id="sw-next-opid" href="libsocialweb/libsocialweb-sw-utils.html#sw-next-opid">
 <ANCHOR id="libsocialweb-sw-web" href="libsocialweb/libsocialweb-sw-web.html">
 <ANCHOR id="libsocialweb-sw-web.synopsis" href="libsocialweb/libsocialweb-sw-web.html#libsocialweb-sw-web.synopsis">
 <ANCHOR id="libsocialweb-sw-web.description" href="libsocialweb/libsocialweb-sw-web.html#libsocialweb-sw-web.description">
--- docs/libsocialweb/html/libsocialweb-SwCallList.html
+++ docs/libsocialweb/html/libsocialweb-SwCallList.html
@@ -44,7 +44,7 @@
                                                          <em class="parameter"><code><a href="../rest/RestProxyCall.html"><span class="type">RestProxyCall</span></a> *call</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libsocialweb-SwCallList.html#sw-call-list-remove" title="sw_call_list_remove ()">sw_call_list_remove</a>                 (<em class="parameter"><code><a class="link" href="libsocialweb-SwCallList.html#SwCallList" title="SwCallList"><span class="type">SwCallList</span></a> *list</code></em>,
                                                          <em class="parameter"><code><a href="../rest/RestProxyCall.html"><span class="type">RestProxyCall</span></a> *call</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libsocialweb-SwCallList.html#sw-call-list-is-empty" title="sw_call_list_is_empty ()">sw_call_list_is_empty</a>               (<em class="parameter"><code><a class="link" href="libsocialweb-SwCallList.html#SwCallList" title="SwCallList"><span class="type">SwCallList</span></a> *list</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="libsocialweb-SwCallList.html#sw-call-list-is-empty" title="sw_call_list_is_empty ()">sw_call_list_is_empty</a>               (<em class="parameter"><code><a class="link" href="libsocialweb-SwCallList.html#SwCallList" title="SwCallList"><span class="type">SwCallList</span></a> *list</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libsocialweb-SwCallList.html#sw-call-list-cancel-all" title="sw_call_list_cancel_all ()">sw_call_list_cancel_all</a>             (<em class="parameter"><code><a class="link" href="libsocialweb-SwCallList.html#SwCallList" title="SwCallList"><span class="type">SwCallList</span></a> *list</code></em>);
 </pre>
 </div>
@@ -82,7 +82,7 @@
 <hr>
 <div class="refsect2" title="sw_call_list_is_empty ()">
 <a name="sw-call-list-is-empty"></a><h3>sw_call_list_is_empty ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_call_list_is_empty               (<em class="parameter"><code><a class="link" href="libsocialweb-SwCallList.html#SwCallList" title="SwCallList"><span class="type">SwCallList</span></a> *list</code></em>);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_call_list_is_empty               (<em class="parameter"><code><a class="link" href="libsocialweb-SwCallList.html#SwCallList" title="SwCallList"><span class="type">SwCallList</span></a> *list</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_call_list_cancel_all ()">
--- docs/libsocialweb/html/libsocialweb-SwSet.html
+++ docs/libsocialweb/html/libsocialweb-SwSet.html
@@ -37,47 +37,46 @@
 </tr></table></div>
 <div class="refsynopsisdiv" title="Synopsis">
 <a name="libsocialweb-SwSet.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">                    <a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet">SwSet</a>;
-#define             <a class="link" href="libsocialweb-SwSet.html#SW-TYPE-SET:CAPS" title="SW_TYPE_SET">SW_TYPE_SET</a>
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="libsocialweb-SwSet.html#sw-set-get-type" title="sw_set_get_type ()">sw_set_get_type</a>                     (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="returnvalue">SwSet</span></a> *             <a class="link" href="libsocialweb-SwSet.html#sw-set-new" title="sw_set_new ()">sw_set_new</a>                          (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="returnvalue">SwSet</span></a> *             <a class="link" href="libsocialweb-SwSet.html#sw-set-new-full" title="sw_set_new_full ()">sw_set_new_full</a>                     (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashFunc"><span class="type">GHashFunc</span></a> hash_func</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GEqualFunc"><span class="type">GEqualFunc</span></a> equal_func</code></em>);
-<a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="returnvalue">SwSet</span></a> *             <a class="link" href="libsocialweb-SwSet.html#sw-set-ref" title="sw_set_ref ()">sw_set_ref</a>                          (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libsocialweb-SwSet.html#sw-set-unref" title="sw_set_unref ()">sw_set_unref</a>                        (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libsocialweb-SwSet.html#sw-set-add" title="sw_set_add ()">sw_set_add</a>                          (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *item</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libsocialweb-SwSet.html#sw-set-remove" title="sw_set_remove ()">sw_set_remove</a>                       (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *item</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libsocialweb-SwSet.html#sw-set-has" title="sw_set_has ()">sw_set_has</a>                          (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *item</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libsocialweb-SwSet.html#sw-set-is-empty" title="sw_set_is_empty ()">sw_set_is_empty</a>                     (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libsocialweb-SwSet.html#sw-set-empty" title="sw_set_empty ()">sw_set_empty</a>                        (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>);
-<a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="returnvalue">SwSet</span></a> *             <a class="link" href="libsocialweb-SwSet.html#sw-set-union" title="sw_set_union ()">sw_set_union</a>                        (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set_a</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set_b</code></em>);
-<a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="returnvalue">SwSet</span></a> *             <a class="link" href="libsocialweb-SwSet.html#sw-set-difference" title="sw_set_difference ()">sw_set_difference</a>                   (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set_a</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set_b</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libsocialweb-SwSet.html#sw-set-add-from" title="sw_set_add_from ()">sw_set_add_from</a>                     (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *from</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libsocialweb-SwSet.html#sw-set-remove-from" title="sw_set_remove_from ()">sw_set_remove_from</a>                  (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *from</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="libsocialweb-SwSet.html#sw-set-as-list" title="sw_set_as_list ()">sw_set_as_list</a>                      (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>);
-<a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="returnvalue">SwSet</span></a> *             <a class="link" href="libsocialweb-SwSet.html#sw-set-from-list" title="sw_set_from_list ()">sw_set_from_list</a>                    (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *list</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libsocialweb-SwSet.html#sw-set-foreach" title="sw_set_foreach ()">sw_set_foreach</a>                      (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GFunc"><span class="type">GFunc</span></a> func</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            (<a class="link" href="libsocialweb-SwSet.html#SwSetForeachRemoveFunc" title="SwSetForeachRemoveFunc ()">*SwSetForeachRemoveFunc</a>)           (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *object</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               <a class="link" href="libsocialweb-SwSet.html#sw-set-foreach-remove" title="sw_set_foreach_remove ()">sw_set_foreach_remove</a>               (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>,
+<pre class="synopsis">#define             <a class="link" href="libsocialweb-SwSet.html#SW-TYPE-SET:CAPS" title="SW_TYPE_SET">SW_TYPE_SET</a>
+<a href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="libsocialweb-SwSet.html#sw-set-get-type" title="sw_set_get_type ()">sw_set_get_type</a>                     (<em class="parameter"><code><span class="type">void</span></code></em>);
+<span class="returnvalue">SwSet</span> *             <a class="link" href="libsocialweb-SwSet.html#sw-set-new" title="sw_set_new ()">sw_set_new</a>                          (<em class="parameter"><code><span class="type">void</span></code></em>);
+<span class="returnvalue">SwSet</span> *             <a class="link" href="libsocialweb-SwSet.html#sw-set-new-full" title="sw_set_new_full ()">sw_set_new_full</a>                     (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashFunc"><span class="type">GHashFunc</span></a> hash_func</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GEqualFunc"><span class="type">GEqualFunc</span></a> equal_func</code></em>);
+<span class="returnvalue">SwSet</span> *             <a class="link" href="libsocialweb-SwSet.html#sw-set-ref" title="sw_set_ref ()">sw_set_ref</a>                          (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="libsocialweb-SwSet.html#sw-set-unref" title="sw_set_unref ()">sw_set_unref</a>                        (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="libsocialweb-SwSet.html#sw-set-add" title="sw_set_add ()">sw_set_add</a>                          (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *item</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="libsocialweb-SwSet.html#sw-set-remove" title="sw_set_remove ()">sw_set_remove</a>                       (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *item</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="libsocialweb-SwSet.html#sw-set-has" title="sw_set_has ()">sw_set_has</a>                          (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *item</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="libsocialweb-SwSet.html#sw-set-is-empty" title="sw_set_is_empty ()">sw_set_is_empty</a>                     (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="libsocialweb-SwSet.html#sw-set-empty" title="sw_set_empty ()">sw_set_empty</a>                        (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>);
+<span class="returnvalue">SwSet</span> *             <a class="link" href="libsocialweb-SwSet.html#sw-set-union" title="sw_set_union ()">sw_set_union</a>                        (<em class="parameter"><code><span class="type">SwSet</span> *set_a</code></em>,
+                                                         <em class="parameter"><code><span class="type">SwSet</span> *set_b</code></em>);
+<span class="returnvalue">SwSet</span> *             <a class="link" href="libsocialweb-SwSet.html#sw-set-difference" title="sw_set_difference ()">sw_set_difference</a>                   (<em class="parameter"><code><span class="type">SwSet</span> *set_a</code></em>,
+                                                         <em class="parameter"><code><span class="type">SwSet</span> *set_b</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="libsocialweb-SwSet.html#sw-set-add-from" title="sw_set_add_from ()">sw_set_add_from</a>                     (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>,
+                                                         <em class="parameter"><code><span class="type">SwSet</span> *from</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="libsocialweb-SwSet.html#sw-set-remove-from" title="sw_set_remove_from ()">sw_set_remove_from</a>                  (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>,
+                                                         <em class="parameter"><code><span class="type">SwSet</span> *from</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="libsocialweb-SwSet.html#sw-set-as-list" title="sw_set_as_list ()">sw_set_as_list</a>                      (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>);
+<span class="returnvalue">SwSet</span> *             <a class="link" href="libsocialweb-SwSet.html#sw-set-from-list" title="sw_set_from_list ()">sw_set_from_list</a>                    (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *list</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="libsocialweb-SwSet.html#sw-set-foreach" title="sw_set_foreach ()">sw_set_foreach</a>                      (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GFunc"><span class="type">GFunc</span></a> func</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</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="libsocialweb-SwSet.html#SwSetForeachRemoveFunc" title="SwSetForeachRemoveFunc ()">*SwSetForeachRemoveFunc</a>)           (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *object</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+<a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               <a class="link" href="libsocialweb-SwSet.html#sw-set-foreach-remove" title="sw_set_foreach_remove ()">sw_set_foreach_remove</a>               (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>,
                                                          <em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSetForeachRemoveFunc" title="SwSetForeachRemoveFunc ()"><span class="type">SwSetForeachRemoveFunc</span></a> func</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<span class="returnvalue">int</span>                 <a class="link" href="libsocialweb-SwSet.html#sw-set-size" title="sw_set_size ()">sw_set_size</a>                         (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            (<a class="link" href="libsocialweb-SwSet.html#SwSetFilterFunc" title="SwSetFilterFunc ()">*SwSetFilterFunc</a>)                  (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *object</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="returnvalue">SwSet</span></a> *             <a class="link" href="libsocialweb-SwSet.html#sw-set-filter" title="sw_set_filter ()">sw_set_filter</a>                       (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+<span class="returnvalue">int</span>                 <a class="link" href="libsocialweb-SwSet.html#sw-set-size" title="sw_set_size ()">sw_set_size</a>                         (<em class="parameter"><code><span class="type">SwSet</span> *set</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="libsocialweb-SwSet.html#SwSetFilterFunc" title="SwSetFilterFunc ()">*SwSetFilterFunc</a>)                  (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *object</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+<span class="returnvalue">SwSet</span> *             <a class="link" href="libsocialweb-SwSet.html#sw-set-filter" title="sw_set_filter ()">sw_set_filter</a>                       (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>,
                                                          <em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSetFilterFunc" title="SwSetFilterFunc ()"><span class="type">SwSetFilterFunc</span></a> func</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Description">
@@ -85,11 +84,6 @@
 </div>
 <div class="refsect1" title="Details">
 <a name="libsocialweb-SwSet.details"></a><h2>Details</h2>
-<div class="refsect2" title="SwSet">
-<a name="SwSet"></a><h3>SwSet</h3>
-<pre class="programlisting">typedef struct _SwSet SwSet;</pre>
-</div>
-<hr>
 <div class="refsect2" title="SW_TYPE_SET">
 <a name="SW-TYPE-SET:CAPS"></a><h3>SW_TYPE_SET</h3>
 <pre class="programlisting">#define SW_TYPE_SET sw_set_get_type ()
@@ -98,129 +92,129 @@
 <hr>
 <div class="refsect2" title="sw_set_get_type ()">
 <a name="sw-set-get-type"></a><h3>sw_set_get_type ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               sw_set_get_type                     (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               sw_set_get_type                     (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_set_new ()">
 <a name="sw-set-new"></a><h3>sw_set_new ()</h3>
-<pre class="programlisting"><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="returnvalue">SwSet</span></a> *             sw_set_new                          (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">SwSet</span> *             sw_set_new                          (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_set_new_full ()">
 <a name="sw-set-new-full"></a><h3>sw_set_new_full ()</h3>
-<pre class="programlisting"><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="returnvalue">SwSet</span></a> *             sw_set_new_full                     (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashFunc"><span class="type">GHashFunc</span></a> hash_func</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GEqualFunc"><span class="type">GEqualFunc</span></a> equal_func</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">SwSet</span> *             sw_set_new_full                     (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashFunc"><span class="type">GHashFunc</span></a> hash_func</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GEqualFunc"><span class="type">GEqualFunc</span></a> equal_func</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_set_ref ()">
 <a name="sw-set-ref"></a><h3>sw_set_ref ()</h3>
-<pre class="programlisting"><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="returnvalue">SwSet</span></a> *             sw_set_ref                          (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">SwSet</span> *             sw_set_ref                          (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_set_unref ()">
 <a name="sw-set-unref"></a><h3>sw_set_unref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                sw_set_unref                        (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                sw_set_unref                        (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_set_add ()">
 <a name="sw-set-add"></a><h3>sw_set_add ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                sw_set_add                          (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *item</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                sw_set_add                          (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *item</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_set_remove ()">
 <a name="sw-set-remove"></a><h3>sw_set_remove ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                sw_set_remove                       (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *item</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                sw_set_remove                       (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *item</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_set_has ()">
 <a name="sw-set-has"></a><h3>sw_set_has ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_set_has                          (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *item</code></em>);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_set_has                          (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *item</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_set_is_empty ()">
 <a name="sw-set-is-empty"></a><h3>sw_set_is_empty ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_set_is_empty                     (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_set_is_empty                     (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_set_empty ()">
 <a name="sw-set-empty"></a><h3>sw_set_empty ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                sw_set_empty                        (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                sw_set_empty                        (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_set_union ()">
 <a name="sw-set-union"></a><h3>sw_set_union ()</h3>
-<pre class="programlisting"><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="returnvalue">SwSet</span></a> *             sw_set_union                        (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set_a</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set_b</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">SwSet</span> *             sw_set_union                        (<em class="parameter"><code><span class="type">SwSet</span> *set_a</code></em>,
+                                                         <em class="parameter"><code><span class="type">SwSet</span> *set_b</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_set_difference ()">
 <a name="sw-set-difference"></a><h3>sw_set_difference ()</h3>
-<pre class="programlisting"><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="returnvalue">SwSet</span></a> *             sw_set_difference                   (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set_a</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set_b</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">SwSet</span> *             sw_set_difference                   (<em class="parameter"><code><span class="type">SwSet</span> *set_a</code></em>,
+                                                         <em class="parameter"><code><span class="type">SwSet</span> *set_b</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_set_add_from ()">
 <a name="sw-set-add-from"></a><h3>sw_set_add_from ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                sw_set_add_from                     (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *from</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                sw_set_add_from                     (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>,
+                                                         <em class="parameter"><code><span class="type">SwSet</span> *from</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_set_remove_from ()">
 <a name="sw-set-remove-from"></a><h3>sw_set_remove_from ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                sw_set_remove_from                  (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *from</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                sw_set_remove_from                  (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>,
+                                                         <em class="parameter"><code><span class="type">SwSet</span> *from</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_set_as_list ()">
 <a name="sw-set-as-list"></a><h3>sw_set_as_list ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             sw_set_as_list                      (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             sw_set_as_list                      (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_set_from_list ()">
 <a name="sw-set-from-list"></a><h3>sw_set_from_list ()</h3>
-<pre class="programlisting"><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="returnvalue">SwSet</span></a> *             sw_set_from_list                    (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *list</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">SwSet</span> *             sw_set_from_list                    (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *list</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_set_foreach ()">
 <a name="sw-set-foreach"></a><h3>sw_set_foreach ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                sw_set_foreach                      (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GFunc"><span class="type">GFunc</span></a> func</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                sw_set_foreach                      (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GFunc"><span class="type">GFunc</span></a> func</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="SwSetForeachRemoveFunc ()">
 <a name="SwSetForeachRemoveFunc"></a><h3>SwSetForeachRemoveFunc ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            (*SwSetForeachRemoveFunc)           (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *object</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            (*SwSetForeachRemoveFunc)           (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *object</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_set_foreach_remove ()">
 <a name="sw-set-foreach-remove"></a><h3>sw_set_foreach_remove ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               sw_set_foreach_remove               (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>,
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               sw_set_foreach_remove               (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>,
                                                          <em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSetForeachRemoveFunc" title="SwSetForeachRemoveFunc ()"><span class="type">SwSetForeachRemoveFunc</span></a> func</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_set_size ()">
 <a name="sw-set-size"></a><h3>sw_set_size ()</h3>
-<pre class="programlisting"><span class="returnvalue">int</span>                 sw_set_size                         (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">int</span>                 sw_set_size                         (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="SwSetFilterFunc ()">
 <a name="SwSetFilterFunc"></a><h3>SwSetFilterFunc ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            (*SwSetFilterFunc)                  (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *object</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            (*SwSetFilterFunc)                  (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *object</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_set_filter ()">
 <a name="sw-set-filter"></a><h3>sw_set_filter ()</h3>
-<pre class="programlisting"><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="returnvalue">SwSet</span></a> *             sw_set_filter                       (<em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>,
+<pre class="programlisting"><span class="returnvalue">SwSet</span> *             sw_set_filter                       (<em class="parameter"><code><span class="type">SwSet</span> *set</code></em>,
                                                          <em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSetFilterFunc" title="SwSetFilterFunc ()"><span class="type">SwSetFilterFunc</span></a> func</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 </div>
 </div>
 </div>
--- docs/libsocialweb/html/libsocialweb-sw-banned.html
+++ docs/libsocialweb/html/libsocialweb-sw-banned.html
@@ -37,9 +37,9 @@
 </tr></table></div>
 <div class="refsynopsisdiv" title="Synopsis">
 <a name="libsocialweb-sw-banned.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis"><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        <a class="link" href="libsocialweb-sw-banned.html#sw-ban-load" title="sw_ban_load ()">sw_ban_load</a>                         (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *service_name</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libsocialweb-sw-banned.html#sw-ban-save" title="sw_ban_save ()">sw_ban_save</a>                         (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *service_name</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *hash</code></em>);
+<pre class="synopsis"><a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        <a class="link" href="libsocialweb-sw-banned.html#sw-ban-load" title="sw_ban_load ()">sw_ban_load</a>                         (<em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *service_name</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="libsocialweb-sw-banned.html#sw-ban-save" title="sw_ban_save ()">sw_ban_save</a>                         (<em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *service_name</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> *hash</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Description">
@@ -49,13 +49,13 @@
 <a name="libsocialweb-sw-banned.details"></a><h2>Details</h2>
 <div class="refsect2" title="sw_ban_load ()">
 <a name="sw-ban-load"></a><h3>sw_ban_load ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        sw_ban_load                         (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *service_name</code></em>);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        sw_ban_load                         (<em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *service_name</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_ban_save ()">
 <a name="sw-ban-save"></a><h3>sw_ban_save ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                sw_ban_save                         (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *service_name</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *hash</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                sw_ban_save                         (<em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *service_name</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> *hash</code></em>);</pre>
 </div>
 </div>
 </div>
--- docs/libsocialweb/html/libsocialweb-sw-cache.html
+++ docs/libsocialweb/html/libsocialweb-sw-cache.html
@@ -38,15 +38,15 @@
 <div class="refsynopsisdiv" title="Synopsis">
 <a name="libsocialweb-sw-cache.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis"><span class="returnvalue">void</span>                <a class="link" href="libsocialweb-sw-cache.html#sw-cache-save" title="sw_cache_save ()">sw_cache_save</a>                       (<em class="parameter"><code><a class="link" href="SwService.html" title="SwService"><span class="type">SwService</span></a> *service</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *query</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *params</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>);
-<a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="returnvalue">SwSet</span></a> *             <a class="link" href="libsocialweb-sw-cache.html#sw-cache-load" title="sw_cache_load ()">sw_cache_load</a>                       (<em class="parameter"><code><a class="link" href="SwService.html" title="SwService"><span class="type">SwService</span></a> *service</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *query</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *params</code></em>);
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *query</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> *params</code></em>,
+                                                         <em class="parameter"><code><span class="type">SwSet</span> *set</code></em>);
+<span class="returnvalue">SwSet</span> *             <a class="link" href="libsocialweb-sw-cache.html#sw-cache-load" title="sw_cache_load ()">sw_cache_load</a>                       (<em class="parameter"><code><a class="link" href="SwService.html" title="SwService"><span class="type">SwService</span></a> *service</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *query</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> *params</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libsocialweb-sw-cache.html#sw-cache-drop" title="sw_cache_drop ()">sw_cache_drop</a>                       (<em class="parameter"><code><a class="link" href="SwService.html" title="SwService"><span class="type">SwService</span></a> *service</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *query</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *params</code></em>);
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *query</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> *params</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libsocialweb-sw-cache.html#sw-cache-drop-all" title="sw_cache_drop_all ()">sw_cache_drop_all</a>                   (<em class="parameter"><code><a class="link" href="SwService.html" title="SwService"><span class="type">SwService</span></a> *service</code></em>);
 </pre>
 </div>
@@ -58,9 +58,9 @@
 <div class="refsect2" title="sw_cache_save ()">
 <a name="sw-cache-save"></a><h3>sw_cache_save ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                sw_cache_save                       (<em class="parameter"><code><a class="link" href="SwService.html" title="SwService"><span class="type">SwService</span></a> *service</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *query</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *params</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> *set</code></em>);</pre>
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *query</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> *params</code></em>,
+                                                         <em class="parameter"><code><span class="type">SwSet</span> *set</code></em>);</pre>
 <p>
 Cache the items in <em class="parameter"><code>set</code></em> to disk.
 </p>
@@ -94,11 +94,11 @@
 <hr>
 <div class="refsect2" title="sw_cache_load ()">
 <a name="sw-cache-load"></a><h3>sw_cache_load ()</h3>
-<pre class="programlisting"><a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="returnvalue">SwSet</span></a> *             sw_cache_load                       (<em class="parameter"><code><a class="link" href="SwService.html" title="SwService"><span class="type">SwService</span></a> *service</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *query</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *params</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">SwSet</span> *             sw_cache_load                       (<em class="parameter"><code><a class="link" href="SwService.html" title="SwService"><span class="type">SwService</span></a> *service</code></em>,
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *query</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> *params</code></em>);</pre>
 <p>
-Load the cache for <em class="parameter"><code>service</code></em> from disk, returning a <a class="link" href="libsocialweb-SwSet.html#SwSet" title="SwSet"><span class="type">SwSet</span></a> if there was a
+Load the cache for <em class="parameter"><code>service</code></em> from disk, returning a <span class="type">SwSet</span> if there was a
 cache.
 </p>
 <div class="variablelist"><table border="0">
@@ -127,8 +127,8 @@
 <div class="refsect2" title="sw_cache_drop ()">
 <a name="sw-cache-drop"></a><h3>sw_cache_drop ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                sw_cache_drop                       (<em class="parameter"><code><a class="link" href="SwService.html" title="SwService"><span class="type">SwService</span></a> *service</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *query</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *params</code></em>);</pre>
+                                                         <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *query</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> *params</code></em>);</pre>
 <p>
 Free the cache for <em class="parameter"><code>service</code></em> from disk.
 </p>
--- docs/libsocialweb/html/libsocialweb-sw-client-monitor.html
+++ docs/libsocialweb/html/libsocialweb-sw-client-monitor.html
@@ -39,9 +39,9 @@
 <a name="libsocialweb-sw-client-monitor.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis"><span class="returnvalue">void</span>                <a class="link" href="libsocialweb-sw-client-monitor.html#sw-client-monitor-init" title="sw_client_monitor_init ()">sw_client_monitor_init</a>              (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libsocialweb-sw-client-monitor.html#sw-client-monitor-add" title="sw_client_monitor_add ()">sw_client_monitor_add</a>               (<em class="parameter"><code><span class="type">char</span> *sender</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *object</code></em>);
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *object</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libsocialweb-sw-client-monitor.html#sw-client-monitor-remove" title="sw_client_monitor_remove ()">sw_client_monitor_remove</a>            (<em class="parameter"><code><span class="type">char</span> *sender</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *object</code></em>);
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *object</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Description">
@@ -57,13 +57,13 @@
 <div class="refsect2" title="sw_client_monitor_add ()">
 <a name="sw-client-monitor-add"></a><h3>sw_client_monitor_add ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                sw_client_monitor_add               (<em class="parameter"><code><span class="type">char</span> *sender</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *object</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *object</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_client_monitor_remove ()">
 <a name="sw-client-monitor-remove"></a><h3>sw_client_monitor_remove ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                sw_client_monitor_remove            (<em class="parameter"><code><span class="type">char</span> *sender</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *object</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *object</code></em>);</pre>
 </div>
 </div>
 </div>
--- docs/libsocialweb/html/libsocialweb-sw-enum-types.html
+++ docs/libsocialweb/html/libsocialweb-sw-enum-types.html
@@ -37,9 +37,9 @@
 </tr></table></div>
 <div class="refsynopsisdiv" title="Synopsis">
 <a name="libsocialweb-sw-enum-types.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="libsocialweb-sw-enum-types.html#sw-service-error-get-type" title="sw_service_error_get_type ()">sw_service_error_get_type</a>           (<em class="parameter"><code><span class="type">void</span></code></em>);
+<pre class="synopsis"><a href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="libsocialweb-sw-enum-types.html#sw-service-error-get-type" title="sw_service_error_get_type ()">sw_service_error_get_type</a>           (<em class="parameter"><code><span class="type">void</span></code></em>);
 #define             <a class="link" href="libsocialweb-sw-enum-types.html#SW-TYPE-SERVICE-ERROR:CAPS" title="SW_TYPE_SERVICE_ERROR">SW_TYPE_SERVICE_ERROR</a>
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="libsocialweb-sw-enum-types.html#sw-debug-flags-get-type" title="sw_debug_flags_get_type ()">sw_debug_flags_get_type</a>             (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="libsocialweb-sw-enum-types.html#sw-debug-flags-get-type" title="sw_debug_flags_get_type ()">sw_debug_flags_get_type</a>             (<em class="parameter"><code><span class="type">void</span></code></em>);
 #define             <a class="link" href="libsocialweb-sw-enum-types.html#SW-TYPE-DEBUG-FLAGS:CAPS" title="SW_TYPE_DEBUG_FLAGS">SW_TYPE_DEBUG_FLAGS</a>
 </pre>
 </div>
@@ -50,7 +50,7 @@
 <a name="libsocialweb-sw-enum-types.details"></a><h2>Details</h2>
 <div class="refsect2" title="sw_service_error_get_type ()">
 <a name="sw-service-error-get-type"></a><h3>sw_service_error_get_type ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               sw_service_error_get_type           (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               sw_service_error_get_type           (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="SW_TYPE_SERVICE_ERROR">
@@ -61,7 +61,7 @@
 <hr>
 <div class="refsect2" title="sw_debug_flags_get_type ()">
 <a name="sw-debug-flags-get-type"></a><h3>sw_debug_flags_get_type ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               sw_debug_flags_get_type             (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               sw_debug_flags_get_type             (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="SW_TYPE_DEBUG_FLAGS">
--- docs/libsocialweb/html/libsocialweb-sw-keyfob.html
+++ docs/libsocialweb/html/libsocialweb-sw-keyfob.html
@@ -38,20 +38,20 @@
 <div class="refsynopsisdiv" title="Synopsis">
 <a name="libsocialweb-sw-keyfob.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis"><span class="returnvalue">void</span>                (<a class="link" href="libsocialweb-sw-keyfob.html#SwKeyfobCallback" title="SwKeyfobCallback ()">*SwKeyfobCallback</a>)                 (<em class="parameter"><code><a href="../rest/RestProxy.html"><span class="type">RestProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> authorised</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> authorised</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libsocialweb-sw-keyfob.html#sw-keyfob-oauth" title="sw_keyfob_oauth ()">sw_keyfob_oauth</a>                     (<em class="parameter"><code><a href="../rest/OAuthProxy.html"><span class="type">OAuthProxy</span></a> *proxy</code></em>,
                                                          <em class="parameter"><code><a class="link" href="libsocialweb-sw-keyfob.html#SwKeyfobCallback" title="SwKeyfobCallback ()"><span class="type">SwKeyfobCallback</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libsocialweb-sw-keyfob.html#sw-keyfob-oauth-sync" title="sw_keyfob_oauth_sync ()">sw_keyfob_oauth_sync</a>                (<em class="parameter"><code><a href="../rest/OAuthProxy.html"><span class="type">OAuthProxy</span></a> *proxy</code></em>);
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</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="libsocialweb-sw-keyfob.html#sw-keyfob-oauth-sync" title="sw_keyfob_oauth_sync ()">sw_keyfob_oauth_sync</a>                (<em class="parameter"><code><a href="../rest/OAuthProxy.html"><span class="type">OAuthProxy</span></a> *proxy</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libsocialweb-sw-keyfob.html#sw-keyfob-oauth2" title="sw_keyfob_oauth2 ()">sw_keyfob_oauth2</a>                    (<em class="parameter"><code><a href="../rest/OAuth2Proxy.html"><span class="type">OAuth2Proxy</span></a> *proxy</code></em>,
                                                          <em class="parameter"><code><a class="link" href="libsocialweb-sw-keyfob.html#SwKeyfobCallback" title="SwKeyfobCallback ()"><span class="type">SwKeyfobCallback</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libsocialweb-sw-keyfob.html#sw-keyfob-oauth2-sync" title="sw_keyfob_oauth2_sync ()">sw_keyfob_oauth2_sync</a>               (<em class="parameter"><code><a href="../rest/OAuth2Proxy.html"><span class="type">OAuth2Proxy</span></a> *proxy</code></em>);
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</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="libsocialweb-sw-keyfob.html#sw-keyfob-oauth2-sync" title="sw_keyfob_oauth2_sync ()">sw_keyfob_oauth2_sync</a>               (<em class="parameter"><code><a href="../rest/OAuth2Proxy.html"><span class="type">OAuth2Proxy</span></a> *proxy</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libsocialweb-sw-keyfob.html#sw-keyfob-flickr" title="sw_keyfob_flickr ()">sw_keyfob_flickr</a>                    (<em class="parameter"><code><a href="../rest/FlickrProxy.html"><span class="type">FlickrProxy</span></a> *proxy</code></em>,
                                                          <em class="parameter"><code><a class="link" href="libsocialweb-sw-keyfob.html#SwKeyfobCallback" title="SwKeyfobCallback ()"><span class="type">SwKeyfobCallback</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libsocialweb-sw-keyfob.html#sw-keyfob-flickr-sync" title="sw_keyfob_flickr_sync ()">sw_keyfob_flickr_sync</a>               (<em class="parameter"><code><a href="../rest/FlickrProxy.html"><span class="type">FlickrProxy</span></a> *proxy</code></em>);
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</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="libsocialweb-sw-keyfob.html#sw-keyfob-flickr-sync" title="sw_keyfob_flickr_sync ()">sw_keyfob_flickr_sync</a>               (<em class="parameter"><code><a href="../rest/FlickrProxy.html"><span class="type">FlickrProxy</span></a> *proxy</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Description">
@@ -62,44 +62,44 @@
 <div class="refsect2" title="SwKeyfobCallback ()">
 <a name="SwKeyfobCallback"></a><h3>SwKeyfobCallback ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                (*SwKeyfobCallback)                 (<em class="parameter"><code><a href="../rest/RestProxy.html"><span class="type">RestProxy</span></a> *proxy</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> authorised</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> authorised</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_keyfob_oauth ()">
 <a name="sw-keyfob-oauth"></a><h3>sw_keyfob_oauth ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                sw_keyfob_oauth                     (<em class="parameter"><code><a href="../rest/OAuthProxy.html"><span class="type">OAuthProxy</span></a> *proxy</code></em>,
                                                          <em class="parameter"><code><a class="link" href="libsocialweb-sw-keyfob.html#SwKeyfobCallback" title="SwKeyfobCallback ()"><span class="type">SwKeyfobCallback</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_keyfob_oauth_sync ()">
 <a name="sw-keyfob-oauth-sync"></a><h3>sw_keyfob_oauth_sync ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_keyfob_oauth_sync                (<em class="parameter"><code><a href="../rest/OAuthProxy.html"><span class="type">OAuthProxy</span></a> *proxy</code></em>);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_keyfob_oauth_sync                (<em class="parameter"><code><a href="../rest/OAuthProxy.html"><span class="type">OAuthProxy</span></a> *proxy</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_keyfob_oauth2 ()">
 <a name="sw-keyfob-oauth2"></a><h3>sw_keyfob_oauth2 ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                sw_keyfob_oauth2                    (<em class="parameter"><code><a href="../rest/OAuth2Proxy.html"><span class="type">OAuth2Proxy</span></a> *proxy</code></em>,
                                                          <em class="parameter"><code><a class="link" href="libsocialweb-sw-keyfob.html#SwKeyfobCallback" title="SwKeyfobCallback ()"><span class="type">SwKeyfobCallback</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_keyfob_oauth2_sync ()">
 <a name="sw-keyfob-oauth2-sync"></a><h3>sw_keyfob_oauth2_sync ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_keyfob_oauth2_sync               (<em class="parameter"><code><a href="../rest/OAuth2Proxy.html"><span class="type">OAuth2Proxy</span></a> *proxy</code></em>);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_keyfob_oauth2_sync               (<em class="parameter"><code><a href="../rest/OAuth2Proxy.html"><span class="type">OAuth2Proxy</span></a> *proxy</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_keyfob_flickr ()">
 <a name="sw-keyfob-flickr"></a><h3>sw_keyfob_flickr ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                sw_keyfob_flickr                    (<em class="parameter"><code><a href="../rest/FlickrProxy.html"><span class="type">FlickrProxy</span></a> *proxy</code></em>,
                                                          <em class="parameter"><code><a class="link" href="libsocialweb-sw-keyfob.html#SwKeyfobCallback" title="SwKeyfobCallback ()"><span class="type">SwKeyfobCallback</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_keyfob_flickr_sync ()">
 <a name="sw-keyfob-flickr-sync"></a><h3>sw_keyfob_flickr_sync ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_keyfob_flickr_sync               (<em class="parameter"><code><a href="../rest/FlickrProxy.html"><span class="type">FlickrProxy</span></a> *proxy</code></em>);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_keyfob_flickr_sync               (<em class="parameter"><code><a href="../rest/FlickrProxy.html"><span class="type">FlickrProxy</span></a> *proxy</code></em>);</pre>
 </div>
 </div>
 </div>
--- docs/libsocialweb/html/libsocialweb-sw-keystore.html
+++ docs/libsocialweb/html/libsocialweb-sw-keystore.html
@@ -37,7 +37,7 @@
 </tr></table></div>
 <div class="refsynopsisdiv" title="Synopsis">
 <a name="libsocialweb-sw-keystore.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libsocialweb-sw-keystore.html#sw-keystore-get-key-secret" title="sw_keystore_get_key_secret ()">sw_keystore_get_key_secret</a>          (<em class="parameter"><code>const <span class="type">char</span> *service</code></em>,
+<pre class="synopsis"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libsocialweb-sw-keystore.html#sw-keystore-get-key-secret" title="sw_keystore_get_key_secret ()">sw_keystore_get_key_secret</a>          (<em class="parameter"><code>const <span class="type">char</span> *service</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> **key</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> **secret</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="libsocialweb-sw-keystore.html#sw-keystore-get-key" title="sw_keystore_get_key ()">sw_keystore_get_key</a>                 (<em class="parameter"><code>const <span class="type">char</span> *service</code></em>);
@@ -50,7 +50,7 @@
 <a name="libsocialweb-sw-keystore.details"></a><h2>Details</h2>
 <div class="refsect2" title="sw_keystore_get_key_secret ()">
 <a name="sw-keystore-get-key-secret"></a><h3>sw_keystore_get_key_secret ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_keystore_get_key_secret          (<em class="parameter"><code>const <span class="type">char</span> *service</code></em>,
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_keystore_get_key_secret          (<em class="parameter"><code>const <span class="type">char</span> *service</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> **key</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> **secret</code></em>);</pre>
 </div>
--- docs/libsocialweb/html/libsocialweb-sw-module.html
+++ docs/libsocialweb/html/libsocialweb-sw-module.html
@@ -37,8 +37,8 @@
 </tr></table></div>
 <div class="refsynopsisdiv" title="Synopsis">
 <a name="libsocialweb-sw-module.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       <a class="link" href="libsocialweb-sw-module.html#sw-module-get-name" title="sw_module_get_name ()">sw_module_get_name</a>                  (<em class="parameter"><code><span class="type">void</span></code></em>);
-const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>         <a class="link" href="libsocialweb-sw-module.html#sw-module-get-type" title="sw_module_get_type ()">sw_module_get_type</a>                  (<em class="parameter"><code><span class="type">void</span></code></em>);
+<pre class="synopsis">const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       <a class="link" href="libsocialweb-sw-module.html#sw-module-get-name" title="sw_module_get_name ()">sw_module_get_name</a>                  (<em class="parameter"><code><span class="type">void</span></code></em>);
+const <a href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>         <a class="link" href="libsocialweb-sw-module.html#sw-module-get-type" title="sw_module_get_type ()">sw_module_get_type</a>                  (<em class="parameter"><code><span class="type">void</span></code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Description">
@@ -48,12 +48,12 @@
 <a name="libsocialweb-sw-module.details"></a><h2>Details</h2>
 <div class="refsect2" title="sw_module_get_name ()">
 <a name="sw-module-get-name"></a><h3>sw_module_get_name ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       sw_module_get_name                  (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting">const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       sw_module_get_name                  (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_module_get_type ()">
 <a name="sw-module-get-type"></a><h3>sw_module_get_type ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>         sw_module_get_type                  (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting">const <a href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>         sw_module_get_type                  (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 </div>
 </div>
 </div>
--- docs/libsocialweb/html/libsocialweb-sw-online.html
+++ docs/libsocialweb/html/libsocialweb-sw-online.html
@@ -37,13 +37,13 @@
 </tr></table></div>
 <div class="refsynopsisdiv" title="Synopsis">
 <a name="libsocialweb-sw-online.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libsocialweb-sw-online.html#sw-is-online" title="sw_is_online ()">sw_is_online</a>                        (<em class="parameter"><code><span class="type">void</span></code></em>);
-<span class="returnvalue">void</span>                (<a class="link" href="libsocialweb-sw-online.html#SwOnlineNotify" title="SwOnlineNotify ()">*SwOnlineNotify</a>)                   (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> online</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+<pre class="synopsis"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libsocialweb-sw-online.html#sw-is-online" title="sw_is_online ()">sw_is_online</a>                        (<em class="parameter"><code><span class="type">void</span></code></em>);
+<span class="returnvalue">void</span>                (<a class="link" href="libsocialweb-sw-online.html#SwOnlineNotify" title="SwOnlineNotify ()">*SwOnlineNotify</a>)                   (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> online</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libsocialweb-sw-online.html#sw-online-add-notify" title="sw_online_add_notify ()">sw_online_add_notify</a>                (<em class="parameter"><code><a class="link" href="libsocialweb-sw-online.html#SwOnlineNotify" title="SwOnlineNotify ()"><span class="type">SwOnlineNotify</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libsocialweb-sw-online.html#sw-online-remove-notify" title="sw_online_remove_notify ()">sw_online_remove_notify</a>             (<em class="parameter"><code><a class="link" href="libsocialweb-sw-online.html#SwOnlineNotify" title="SwOnlineNotify ()"><span class="type">SwOnlineNotify</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Description">
@@ -53,25 +53,25 @@
 <a name="libsocialweb-sw-online.details"></a><h2>Details</h2>
 <div class="refsect2" title="sw_is_online ()">
 <a name="sw-is-online"></a><h3>sw_is_online ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_is_online                        (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            sw_is_online                        (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="SwOnlineNotify ()">
 <a name="SwOnlineNotify"></a><h3>SwOnlineNotify ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*SwOnlineNotify)                   (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> online</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*SwOnlineNotify)                   (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> online</code></em>,
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_online_add_notify ()">
 <a name="sw-online-add-notify"></a><h3>sw_online_add_notify ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                sw_online_add_notify                (<em class="parameter"><code><a class="link" href="libsocialweb-sw-online.html#SwOnlineNotify" title="SwOnlineNotify ()"><span class="type">SwOnlineNotify</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_online_remove_notify ()">
 <a name="sw-online-remove-notify"></a><h3>sw_online_remove_notify ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                sw_online_remove_notify             (<em class="parameter"><code><a class="link" href="libsocialweb-sw-online.html#SwOnlineNotify" title="SwOnlineNotify ()"><span class="type">SwOnlineNotify</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 </div>
 </div>
 </div>
--- docs/libsocialweb/html/libsocialweb-sw-utils.html
+++ docs/libsocialweb/html/libsocialweb-sw-utils.html
@@ -39,8 +39,7 @@
 <a name="libsocialweb-sw-utils.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis"><span class="returnvalue">time_t</span>              <a class="link" href="libsocialweb-sw-utils.html#sw-time-t-from-string" title="sw_time_t_from_string ()">sw_time_t_from_string</a>               (<em class="parameter"><code>const <span class="type">char</span> *s</code></em>);
 <span class="returnvalue">char</span> *              <a class="link" href="libsocialweb-sw-utils.html#sw-time-t-to-string" title="sw_time_t_to_string ()">sw_time_t_to_string</a>                 (<em class="parameter"><code><span class="type">time_t</span> t</code></em>);
-<span class="returnvalue">char</span> *              <a class="link" href="libsocialweb-sw-utils.html#sw-hash-string-dict" title="sw_hash_string_dict ()">sw_hash_string_dict</a>                 (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *hash</code></em>);
-<span class="returnvalue">int</span>                 <a class="link" href="libsocialweb-sw-utils.html#sw-next-opid" title="sw_next_opid ()">sw_next_opid</a>                        (<em class="parameter"><code><span class="type">void</span></code></em>);
+<span class="returnvalue">char</span> *              <a class="link" href="libsocialweb-sw-utils.html#sw-hash-string-dict" title="sw_hash_string_dict ()">sw_hash_string_dict</a>                 (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *hash</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Description">
@@ -60,17 +59,7 @@
 <hr>
 <div class="refsect2" title="sw_hash_string_dict ()">
 <a name="sw-hash-string-dict"></a><h3>sw_hash_string_dict ()</h3>
-<pre class="programlisting"><span class="returnvalue">char</span> *              sw_hash_string_dict                 (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *hash</code></em>);</pre>
-</div>
-<hr>
-<div class="refsect2" title="sw_next_opid ()">
-<a name="sw-next-opid"></a><h3>sw_next_opid ()</h3>
-<pre class="programlisting"><span class="returnvalue">int</span>                 sw_next_opid                        (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-Get the next operation ID.  Operation IDs are globally unique for a
-libsocialweb instance.  In the current implementation, they are simply
-incrementing integers.
-</p>
+<pre class="programlisting"><span class="returnvalue">char</span> *              sw_hash_string_dict                 (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *hash</code></em>);</pre>
 </div>
 </div>
 </div>
--- docs/libsocialweb/html/libsocialweb-sw-web.html
+++ docs/libsocialweb/html/libsocialweb-sw-web.html
@@ -42,10 +42,10 @@
 <span class="returnvalue">char</span> *              <a class="link" href="libsocialweb-sw-web.html#sw-web-download-image" title="sw_web_download_image ()">sw_web_download_image</a>               (<em class="parameter"><code>const <span class="type">char</span> *url</code></em>);
 <span class="returnvalue">void</span>                (<a class="link" href="libsocialweb-sw-web.html#ImageDownloadCallback" title="ImageDownloadCallback ()">*ImageDownloadCallback</a>)            (<em class="parameter"><code>const <span class="type">char</span> *url</code></em>,
                                                          <em class="parameter"><code><span class="type">char</span> *file</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libsocialweb-sw-web.html#sw-web-download-image-async" title="sw_web_download_image_async ()">sw_web_download_image_async</a>         (<em class="parameter"><code>const <span class="type">char</span> *url</code></em>,
                                                          <em class="parameter"><code><a class="link" href="libsocialweb-sw-web.html#ImageDownloadCallback" title="ImageDownloadCallback ()"><span class="type">ImageDownloadCallback</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Description">
@@ -72,14 +72,14 @@
 <a name="ImageDownloadCallback"></a><h3>ImageDownloadCallback ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                (*ImageDownloadCallback)            (<em class="parameter"><code>const <span class="type">char</span> *url</code></em>,
                                                          <em class="parameter"><code><span class="type">char</span> *file</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2" title="sw_web_download_image_async ()">
 <a name="sw-web-download-image-async"></a><h3>sw_web_download_image_async ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                sw_web_download_image_async         (<em class="parameter"><code>const <span class="type">char</span> *url</code></em>,
                                                          <em class="parameter"><code><a class="link" href="libsocialweb-sw-web.html#ImageDownloadCallback" title="ImageDownloadCallback ()"><span class="type">ImageDownloadCallback</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 </div>
 </div>
 </div>
--- docs/libsocialweb/html/libsocialweb.devhelp
+++ docs/libsocialweb/html/libsocialweb.devhelp
@@ -11,7 +11,6 @@
       <sub name="sw-debug" link="libsocialweb-sw-debug.html"/>
       <sub name="sw-enum-types" link="libsocialweb-sw-enum-types.html"/>
       <sub name="SwItemView" link="SwItemView.html"/>
-      <sub name="SwItemStream" link="SwItemStream.html"/>
       <sub name="SwItem" link="SwItem.html"/>
       <sub name="sw-module" link="libsocialweb-sw-module.html"/>
       <sub name="sw-online" link="libsocialweb-sw-online.html"/>
@@ -46,7 +45,9 @@
     <function name="sw_client_monitor_init ()" link="libsocialweb-sw-client-monitor.html#sw-client-monitor-init"/>
     <function name="sw_client_monitor_add ()" link="libsocialweb-sw-client-monitor.html#sw-client-monitor-add"/>
     <function name="sw_client_monitor_remove ()" link="libsocialweb-sw-client-monitor.html#sw-client-monitor-remove"/>
+    <function name="SwCorePrivate" link="SwCore.html#SwCorePrivate"/>
     <function name="SwCore" link="SwCore.html#SwCore-struct"/>
+    <function name="SwCoreClass" link="SwCore.html#SwCoreClass"/>
     <function name="sw_core_new ()" link="SwCore.html#sw-core-new"/>
     <function name="sw_core_run ()" link="SwCore.html#sw-core-run"/>
     <function name="sw_core_is_item_banned ()" link="SwCore.html#sw-core-is-item-banned"/>
@@ -69,17 +70,7 @@
     <function name="sw_item_view_get_service ()" link="SwItemView.html#sw-item-view-get-service"/>
     <function name="The "object-path" property" link="SwItemView.html#SwItemView--object-path"/>
     <function name="The "service" property" link="SwItemView.html#SwItemView--service"/>
-    <function name="SwItemStream" link="SwItemStream.html#SwItemStream-struct"/>
-    <function name="sw_item_stream_get_object_path ()" link="SwItemStream.html#sw-item-stream-get-object-path"/>
-    <function name="sw_item_stream_get_service ()" link="SwItemStream.html#sw-item-stream-get-service"/>
-    <function name="sw_item_stream_add_items ()" link="SwItemStream.html#sw-item-stream-add-items"/>
-    <function name="sw_item_stream_add_item ()" link="SwItemStream.html#sw-item-stream-add-item"/>
-    <function name="sw_item_stream_update_items ()" link="SwItemStream.html#sw-item-stream-update-items"/>
-    <function name="sw_item_stream_update_item ()" link="SwItemStream.html#sw-item-stream-update-item"/>
-    <function name="sw_item_stream_remove_items ()" link="SwItemStream.html#sw-item-stream-remove-items"/>
-    <function name="sw_item_stream_remove_item ()" link="SwItemStream.html#sw-item-stream-remove-item"/>
-    <function name="The "object-path" property" link="SwItemStream.html#SwItemStream--object-path"/>
-    <function name="The "service" property" link="SwItemStream.html#SwItemStream--service"/>
+    <function name="SwItemPrivate" link="SwItem.html#SwItemPrivate"/>
     <function name="SwItem" link="SwItem.html#SwItem-struct"/>
     <function name="SwItemClass" link="SwItem.html#SwItemClass"/>
     <function name="sw_item_new ()" link="SwItem.html#sw-item-new"/>
@@ -101,6 +92,8 @@
     <function name="sw_item_equal ()" link="SwItem.html#sw-item-equal"/>
     <function name="sw_item_set_new ()" link="SwItem.html#sw-item-set-new"/>
     <function name="The "ready" property" link="SwItem.html#SwItem--ready"/>
+    <function name="The "ready" property" link="SwItem.html#SwItem--ready"/>
+    <function name="The "changed" signal" link="SwItem.html#SwItem-changed"/>
     <function name="The "changed" signal" link="SwItem.html#SwItem-changed"/>
     <function name="sw_module_get_name ()" link="libsocialweb-sw-module.html#sw-module-get-name"/>
     <function name="sw_module_get_type ()" link="libsocialweb-sw-module.html#sw-module-get-type"/>
@@ -120,18 +113,10 @@
     <function name="CAN_UPDATE_STATUS" link="SwService.html#CAN-UPDATE-STATUS:CAPS"/>
     <function name="CAN_REQUEST_AVATAR" link="SwService.html#CAN-REQUEST-AVATAR:CAPS"/>
     <function name="CAN_GEOTAG" link="SwService.html#CAN-GEOTAG:CAPS"/>
-    <function name="CAN_UPDATE_STATUS_WITH_GEOTAG" link="SwService.html#CAN-UPDATE-STATUS-WITH-GEOTAG:CAPS"/>
-    <function name="HAS_AVATAR_IFACE" link="SwService.html#HAS-AVATAR-IFACE:CAPS"/>
-    <function name="HAS_BANISHABLE_IFACE" link="SwService.html#HAS-BANISHABLE-IFACE:CAPS"/>
-    <function name="HAS_PHOTO_UPLOAD_IFACE" link="SwService.html#HAS-PHOTO-UPLOAD-IFACE:CAPS"/>
-    <function name="HAS_QUERY_IFACE" link="SwService.html#HAS-QUERY-IFACE:CAPS"/>
-    <function name="HAS_UPDATE_STATUS_IFACE" link="SwService.html#HAS-UPDATE-STATUS-IFACE:CAPS"/>
     <function name="sw_service_get_name ()" link="SwService.html#sw-service-get-name"/>
     <function name="sw_service_emit_capabilities_changed ()" link="SwService.html#sw-service-emit-capabilities-changed"/>
     <function name="sw_service_emit_user_changed ()" link="SwService.html#sw-service-emit-user-changed"/>
     <function name="sw_service_is_uid_banned ()" link="SwService.html#sw-service-is-uid-banned"/>
-    <function name="sw_service_has_cap ()" link="SwService.html#sw-service-has-cap"/>
-    <function name="SwSet" link="libsocialweb-SwSet.html#SwSet"/>
     <function name="SW_TYPE_SET" link="libsocialweb-SwSet.html#SW-TYPE-SET:CAPS"/>
     <function name="sw_set_get_type ()" link="libsocialweb-SwSet.html#sw-set-get-type"/>
     <function name="sw_set_new ()" link="libsocialweb-SwSet.html#sw-set-new"/>
@@ -158,7 +143,6 @@
     <function name="sw_time_t_from_string ()" link="libsocialweb-sw-utils.html#sw-time-t-from-string"/>
     <function name="sw_time_t_to_string ()" link="libsocialweb-sw-utils.html#sw-time-t-to-string"/>
     <function name="sw_hash_string_dict ()" link="libsocialweb-sw-utils.html#sw-hash-string-dict"/>
-    <function name="sw_next_opid ()" link="libsocialweb-sw-utils.html#sw-next-opid"/>
     <function name="sw_web_make_sync_session ()" link="libsocialweb-sw-web.html#sw-web-make-sync-session"/>
     <function name="sw_web_make_async_session ()" link="libsocialweb-sw-web.html#sw-web-make-async-session"/>
     <function name="sw_web_download_image ()" link="libsocialweb-sw-web.html#sw-web-download-image"/>
--- docs/libsocialweb/html/libsocialweb.devhelp2
+++ docs/libsocialweb/html/libsocialweb.devhelp2
@@ -11,7 +11,6 @@
       <sub name="sw-debug" link="libsocialweb-sw-debug.html"/>
       <sub name="sw-enum-types" link="libsocialweb-sw-enum-types.html"/>
       <sub name="SwItemView" link="SwItemView.html"/>
-      <sub name="SwItemStream" link="SwItemStream.html"/>
       <sub name="SwItem" link="SwItem.html"/>
       <sub name="sw-module" link="libsocialweb-sw-module.html"/>
       <sub name="sw-online" link="libsocialweb-sw-online.html"/>
@@ -46,7 +45,9 @@
     <keyword type="function" name="sw_client_monitor_init ()" link="libsocialweb-sw-client-monitor.html#sw-client-monitor-init"/>
     <keyword type="function" name="sw_client_monitor_add ()" link="libsocialweb-sw-client-monitor.html#sw-client-monitor-add"/>
     <keyword type="function" name="sw_client_monitor_remove ()" link="libsocialweb-sw-client-monitor.html#sw-client-monitor-remove"/>
+    <keyword type="struct" name="SwCorePrivate" link="SwCore.html#SwCorePrivate"/>
     <keyword type="struct" name="SwCore" link="SwCore.html#SwCore-struct"/>
+    <keyword type="struct" name="SwCoreClass" link="SwCore.html#SwCoreClass"/>
     <keyword type="function" name="sw_core_new ()" link="SwCore.html#sw-core-new"/>
     <keyword type="function" name="sw_core_run ()" link="SwCore.html#sw-core-run"/>
     <keyword type="function" name="sw_core_is_item_banned ()" link="SwCore.html#sw-core-is-item-banned"/>
@@ -69,17 +70,7 @@
     <keyword type="function" name="sw_item_view_get_service ()" link="SwItemView.html#sw-item-view-get-service"/>
     <keyword type="property" name="The "object-path" property" link="SwItemView.html#SwItemView--object-path"/>
     <keyword type="property" name="The "service" property" link="SwItemView.html#SwItemView--service"/>
-    <keyword type="struct" name="SwItemStream" link="SwItemStream.html#SwItemStream-struct"/>
-    <keyword type="function" name="sw_item_stream_get_object_path ()" link="SwItemStream.html#sw-item-stream-get-object-path"/>
-    <keyword type="function" name="sw_item_stream_get_service ()" link="SwItemStream.html#sw-item-stream-get-service"/>
-    <keyword type="function" name="sw_item_stream_add_items ()" link="SwItemStream.html#sw-item-stream-add-items"/>
-    <keyword type="function" name="sw_item_stream_add_item ()" link="SwItemStream.html#sw-item-stream-add-item"/>
-    <keyword type="function" name="sw_item_stream_update_items ()" link="SwItemStream.html#sw-item-stream-update-items"/>
-    <keyword type="function" name="sw_item_stream_update_item ()" link="SwItemStream.html#sw-item-stream-update-item"/>
-    <keyword type="function" name="sw_item_stream_remove_items ()" link="SwItemStream.html#sw-item-stream-remove-items"/>
-    <keyword type="function" name="sw_item_stream_remove_item ()" link="SwItemStream.html#sw-item-stream-remove-item"/>
-    <keyword type="property" name="The "object-path" property" link="SwItemStream.html#SwItemStream--object-path"/>
-    <keyword type="property" name="The "service" property" link="SwItemStream.html#SwItemStream--service"/>
+    <keyword type="struct" name="SwItemPrivate" link="SwItem.html#SwItemPrivate"/>
     <keyword type="struct" name="SwItem" link="SwItem.html#SwItem-struct"/>
     <keyword type="struct" name="SwItemClass" link="SwItem.html#SwItemClass"/>
     <keyword type="function" name="sw_item_new ()" link="SwItem.html#sw-item-new"/>
@@ -101,6 +92,8 @@
     <keyword type="function" name="sw_item_equal ()" link="SwItem.html#sw-item-equal"/>
     <keyword type="function" name="sw_item_set_new ()" link="SwItem.html#sw-item-set-new"/>
     <keyword type="property" name="The "ready" property" link="SwItem.html#SwItem--ready"/>
+    <keyword type="property" name="The "ready" property" link="SwItem.html#SwItem--ready"/>
+    <keyword type="signal" name="The "changed" signal" link="SwItem.html#SwItem-changed"/>
     <keyword type="signal" name="The "changed" signal" link="SwItem.html#SwItem-changed"/>
     <keyword type="function" name="sw_module_get_name ()" link="libsocialweb-sw-module.html#sw-module-get-name"/>
     <keyword type="function" name="sw_module_get_type ()" link="libsocialweb-sw-module.html#sw-module-get-type"/>
@@ -120,18 +113,10 @@
     <keyword type="macro" name="CAN_UPDATE_STATUS" link="SwService.html#CAN-UPDATE-STATUS:CAPS"/>
     <keyword type="macro" name="CAN_REQUEST_AVATAR" link="SwService.html#CAN-REQUEST-AVATAR:CAPS"/>
     <keyword type="macro" name="CAN_GEOTAG" link="SwService.html#CAN-GEOTAG:CAPS"/>
-    <keyword type="macro" name="CAN_UPDATE_STATUS_WITH_GEOTAG" link="SwService.html#CAN-UPDATE-STATUS-WITH-GEOTAG:CAPS"/>
-    <keyword type="macro" name="HAS_AVATAR_IFACE" link="SwService.html#HAS-AVATAR-IFACE:CAPS"/>
-    <keyword type="macro" name="HAS_BANISHABLE_IFACE" link="SwService.html#HAS-BANISHABLE-IFACE:CAPS"/>
-    <keyword type="macro" name="HAS_PHOTO_UPLOAD_IFACE" link="SwService.html#HAS-PHOTO-UPLOAD-IFACE:CAPS"/>
-    <keyword type="macro" name="HAS_QUERY_IFACE" link="SwService.html#HAS-QUERY-IFACE:CAPS"/>
-    <keyword type="macro" name="HAS_UPDATE_STATUS_IFACE" link="SwService.html#HAS-UPDATE-STATUS-IFACE:CAPS"/>
     <keyword type="function" name="sw_service_get_name ()" link="SwService.html#sw-service-get-name"/>
     <keyword type="function" name="sw_service_emit_capabilities_changed ()" link="SwService.html#sw-service-emit-capabilities-changed"/>
     <keyword type="function" name="sw_service_emit_user_changed ()" link="SwService.html#sw-service-emit-user-changed"/>
     <keyword type="function" name="sw_service_is_uid_banned ()" link="SwService.html#sw-service-is-uid-banned"/>
-    <keyword type="function" name="sw_service_has_cap ()" link="SwService.html#sw-service-has-cap"/>
-    <keyword type="struct" name="SwSet" link="libsocialweb-SwSet.html#SwSet"/>
     <keyword type="macro" name="SW_TYPE_SET" link="libsocialweb-SwSet.html#SW-TYPE-SET:CAPS"/>
     <keyword type="function" name="sw_set_get_type ()" link="libsocialweb-SwSet.html#sw-set-get-type"/>
     <keyword type="function" name="sw_set_new ()" link="libsocialweb-SwSet.html#sw-set-new"/>
@@ -158,7 +143,6 @@
     <keyword type="function" name="sw_time_t_from_string ()" link="libsocialweb-sw-utils.html#sw-time-t-from-string"/>
     <keyword type="function" name="sw_time_t_to_string ()" link="libsocialweb-sw-utils.html#sw-time-t-to-string"/>
     <keyword type="function" name="sw_hash_string_dict ()" link="libsocialweb-sw-utils.html#sw-hash-string-dict"/>
-    <keyword type="function" name="sw_next_opid ()" link="libsocialweb-sw-utils.html#sw-next-opid"/>
     <keyword type="function" name="sw_web_make_sync_session ()" link="libsocialweb-sw-web.html#sw-web-make-sync-session"/>
     <keyword type="function" name="sw_web_make_async_session ()" link="libsocialweb-sw-web.html#sw-web-make-async-session"/>
     <keyword type="function" name="sw_web_download_image ()" link="libsocialweb-sw-web.html#sw-web-download-image"/>
--- docs/libsocialweb/html/object-tree.html
+++ docs/libsocialweb/html/object-tree.html
@@ -23,11 +23,10 @@
 <div class="titlepage"><div><div><h2 class="title">
 <a name="object-tree"></a>Object Hierarchy</h2></div></div></div>
 <pre class="screen">
-    <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
-        <a class="link" href="SwCore.html" title="SwCore">SwCore</a>
+    <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject">GObject</a>
         <a class="link" href="SwItem.html" title="SwItem">SwItem</a>
+        <a class="link" href="SwCore.html" title="SwCore">SwCore</a>
         <a class="link" href="SwItemView.html" title="SwItemView">SwItemView</a>
-        <a class="link" href="SwItemStream.html" title="SwItemStream">SwItemStream</a>
         <a class="link" href="SwService.html" title="SwService">SwService</a>
 </pre>
 </div>
--- interfaces/Makefile.am
+++ interfaces/Makefile.am
@@ -14,8 +14,8 @@
 DBUS_SPECS = sw-core.xml sw-service.xml \
 	     sw-item-view.xml sw-query.xml \
 	     sw-avatar.xml sw-status-update.xml \
-	     sw-photo-upload.xml sw-banishable.xml\
-	     lastfm.xml
+	     sw-photo-upload.xml sw-banishable.xml \
+	     sw-video-upload.xml lastfm.xml
 
 %-ginterface.h %-ginterface.c: %.xml Makefile.am
 	$(AM_V_GEN)python $(top_srcdir)/tools/glib-ginterface-gen.py --include='"sw-marshals.h"' --filename=$(basename $@) $< Sw_
@@ -34,8 +34,8 @@
 	sw-status-update-ginterface.h \
 	sw-avatar-ginterface.h \
 	sw-photo-upload-ginterface.h \
-	sw-banishable-ginterface.h
-
+	sw-banishable-ginterface.h \
+	sw-video-upload-ginterface.h
 
 %-bindings.h: %.xml
 	$(AM_V_GEN)dbus-binding-tool --mode=glib-client --output=$@ --prefix=$(subst -,_,$*) $^
--- interfaces/Makefile.in
+++ interfaces/Makefile.in
@@ -76,6 +76,7 @@
 	libsocialweb_ginterfaces_la-sw-status-update-ginterface.lo \
 	libsocialweb_ginterfaces_la-sw-photo-upload-ginterface.lo \
 	libsocialweb_ginterfaces_la-sw-banishable-ginterface.lo \
+	libsocialweb_ginterfaces_la-sw-video-upload-ginterface.lo \
 	libsocialweb_ginterfaces_la-lastfm-ginterface.lo
 am__objects_5 = $(am__objects_1) $(am__objects_4)
 am__objects_6 = libsocialweb_ginterfaces_la-sw-marshals.lo
@@ -330,8 +331,8 @@
 DBUS_SPECS = sw-core.xml sw-service.xml \
 	     sw-item-view.xml sw-query.xml \
 	     sw-avatar.xml sw-status-update.xml \
-	     sw-photo-upload.xml sw-banishable.xml\
-	     lastfm.xml
+	     sw-photo-upload.xml sw-banishable.xml \
+	     sw-video-upload.xml lastfm.xml
 
 GINTERFACE_SOURCES = \
 	$(DBUS_SPECS:.xml=-ginterface.h) \
@@ -346,7 +347,8 @@
 	sw-status-update-ginterface.h \
 	sw-avatar-ginterface.h \
 	sw-photo-upload-ginterface.h \
-	sw-banishable-ginterface.h
+	sw-banishable-ginterface.h \
+	sw-video-upload-ginterface.h
 
 BINDINGS_SOURCES = $(DBUS_SPECS:.xml=-bindings.h)
 libsocialweb_bindings_la_SOURCES = $(BINDINGS_SOURCES) $(MARSHALS_SOURCES)
@@ -421,6 +423,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsocialweb_ginterfaces_la-sw-query-ginterface.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsocialweb_ginterfaces_la-sw-service-ginterface.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsocialweb_ginterfaces_la-sw-status-update-ginterface.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsocialweb_ginterfaces_la-sw-video-upload-ginterface.Plo at am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -518,6 +521,14 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsocialweb_ginterfaces_la_CFLAGS) $(CFLAGS) -c -o libsocialweb_ginterfaces_la-sw-banishable-ginterface.lo `test -f 'sw-banishable-ginterface.c' || echo '$(srcdir)/'`sw-banishable-ginterface.c
 
+libsocialweb_ginterfaces_la-sw-video-upload-ginterface.lo: sw-video-upload-ginterface.c
+ at 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) $(libsocialweb_ginterfaces_la_CFLAGS) $(CFLAGS) -MT libsocialweb_ginterfaces_la-sw-video-upload-ginterface.lo -MD -MP -MF $(DEPDIR)/libsocialweb_ginterfaces_la-sw-video-upload-ginterface.Tpo -c -o libsocialweb_ginterfaces_la-sw-video-upload-ginterface.lo `test -f 'sw-video-upload-ginterface.c' || echo '$(srcdir)/'`sw-video-upload-ginterface.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsocialweb_ginterfaces_la-sw-video-upload-ginterface.Tpo $(DEPDIR)/libsocialweb_ginterfaces_la-sw-video-upload-ginterface.Plo
+ at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sw-video-upload-ginterface.c' object='libsocialweb_ginterfaces_la-sw-video-upload-ginterface.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsocialweb_ginterfaces_la_CFLAGS) $(CFLAGS) -c -o libsocialweb_ginterfaces_la-sw-video-upload-ginterface.lo `test -f 'sw-video-upload-ginterface.c' || echo '$(srcdir)/'`sw-video-upload-ginterface.c
+
 libsocialweb_ginterfaces_la-lastfm-ginterface.lo: lastfm-ginterface.c
 @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) $(libsocialweb_ginterfaces_la_CFLAGS) $(CFLAGS) -MT libsocialweb_ginterfaces_la-lastfm-ginterface.lo -MD -MP -MF $(DEPDIR)/libsocialweb_ginterfaces_la-lastfm-ginterface.Tpo -c -o libsocialweb_ginterfaces_la-lastfm-ginterface.lo `test -f 'lastfm-ginterface.c' || echo '$(srcdir)/'`lastfm-ginterface.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsocialweb_ginterfaces_la-lastfm-ginterface.Tpo $(DEPDIR)/libsocialweb_ginterfaces_la-lastfm-ginterface.Plo
--- interfaces/sw-marshals.c
+++ interfaces/sw-marshals.c
@@ -21,7 +21,6 @@
 #define g_marshal_value_peek_boxed(v)    g_value_get_boxed (v)
 #define g_marshal_value_peek_pointer(v)  g_value_get_pointer (v)
 #define g_marshal_value_peek_object(v)   g_value_get_object (v)
-#define g_marshal_value_peek_variant(v)  g_value_get_variant (v)
 #else /* !G_ENABLE_DEBUG */
 /* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
  *          Do not access GValues directly in your code. Instead, use the
@@ -45,7 +44,6 @@
 #define g_marshal_value_peek_boxed(v)    (v)->data[0].v_pointer
 #define g_marshal_value_peek_pointer(v)  (v)->data[0].v_pointer
 #define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
-#define g_marshal_value_peek_variant(v)  (v)->data[0].v_pointer
 #endif /* !G_ENABLE_DEBUG */
 
 
--- interfaces/sw-video-upload-bindings.h
+++ interfaces/sw-video-upload-bindings.h
+/* Generated by dbus-binding-tool; do not edit! */
+
+#include <glib.h>
+#include <dbus/dbus-glib.h>
+
+G_BEGIN_DECLS
+
+#ifndef _DBUS_GLIB_ASYNC_DATA_FREE
+#define _DBUS_GLIB_ASYNC_DATA_FREE
+static
+#ifdef G_HAVE_INLINE
+inline
+#endif
+void
+_dbus_glib_async_data_free (gpointer stuff)
+{
+	g_slice_free (DBusGAsyncData, stuff);
+}
+#endif
+
+#ifndef DBUS_GLIB_CLIENT_WRAPPERS_com_meego_libsocialweb_VideoUpload
+#define DBUS_GLIB_CLIENT_WRAPPERS_com_meego_libsocialweb_VideoUpload
+
+static
+#ifdef G_HAVE_INLINE
+inline
+#endif
+gboolean
+com_meego_libsocialweb_VideoUpload_upload_video (DBusGProxy *proxy, const char * IN_local_filename, const GHashTable* IN_fields, gint* OUT_opid, GError **error)
+
+{
+  return dbus_g_proxy_call (proxy, "UploadVideo", error, G_TYPE_STRING, IN_local_filename, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING), IN_fields, G_TYPE_INVALID, G_TYPE_INT, OUT_opid, G_TYPE_INVALID);
+}
+
+typedef void (*com_meego_libsocialweb_VideoUpload_upload_video_reply) (DBusGProxy *proxy, gint OUT_opid, GError *error, gpointer userdata);
+
+static void
+com_meego_libsocialweb_VideoUpload_upload_video_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
+{
+  DBusGAsyncData *data = (DBusGAsyncData*) user_data;
+  GError *error = NULL;
+  gint OUT_opid;
+  dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INT, &OUT_opid, G_TYPE_INVALID);
+  (*(com_meego_libsocialweb_VideoUpload_upload_video_reply)data->cb) (proxy, OUT_opid, error, data->userdata);
+  return;
+}
+
+static
+#ifdef G_HAVE_INLINE
+inline
+#endif
+DBusGProxyCall*
+com_meego_libsocialweb_VideoUpload_upload_video_async (DBusGProxy *proxy, const char * IN_local_filename, const GHashTable* IN_fields, com_meego_libsocialweb_VideoUpload_upload_video_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, "UploadVideo", com_meego_libsocialweb_VideoUpload_upload_video_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_STRING, IN_local_filename, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING), IN_fields, G_TYPE_INVALID);
+}
+#endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_com_meego_libsocialweb_VideoUpload */
+
+G_END_DECLS
--- interfaces/sw-video-upload-ginterface.c
+++ interfaces/sw-video-upload-ginterface.c
+#include "sw-video-upload-ginterface.h"
+
+#include "sw-marshals.h"
+
+static const DBusGObjectInfo _sw_video_upload_iface_object_info;
+
+struct _SwVideoUploadIfaceClass {
+    GTypeInterface parent_class;
+    sw_video_upload_iface_upload_video_impl upload_video;
+};
+
+enum {
+    SIGNAL_VIDEO_UPLOAD_IFACE_VideoUploadProgress,
+    N_VIDEO_UPLOAD_IFACE_SIGNALS
+};
+static guint video_upload_iface_signals[N_VIDEO_UPLOAD_IFACE_SIGNALS] = {0};
+
+static void sw_video_upload_iface_base_init (gpointer klass);
+
+GType
+sw_video_upload_iface_get_type (void)
+{
+  static GType type = 0;
+
+  if (G_UNLIKELY (type == 0))
+    {
+      static const GTypeInfo info = {
+        sizeof (SwVideoUploadIfaceClass),
+        sw_video_upload_iface_base_init, /* base_init */
+        NULL, /* base_finalize */
+        NULL, /* class_init */
+        NULL, /* class_finalize */
+        NULL, /* class_data */
+        0,
+        0, /* n_preallocs */
+        NULL /* instance_init */
+      };
+
+      type = g_type_register_static (G_TYPE_INTERFACE,
+          "SwVideoUploadIface", &info, 0);
+    }
+
+  return type;
+}
+
+/**
+ * sw_video_upload_iface_upload_video_impl:
+ * @self: The object implementing this interface
+ * @in_local_filename: const gchar * (FIXME, generate documentation)
+ * @in_fields: GHashTable * (FIXME, generate documentation)
+ * @context: Used to return values or throw an error
+ *
+ * The signature of an implementation of the D-Bus method
+ * UploadVideo on interface com.meego.libsocialweb.VideoUpload.
+ */
+static void
+sw_video_upload_iface_upload_video (SwVideoUploadIface *self,
+    const gchar *in_local_filename,
+    GHashTable *in_fields,
+    DBusGMethodInvocation *context)
+{
+  sw_video_upload_iface_upload_video_impl impl = (SW_VIDEO_UPLOAD_IFACE_GET_CLASS (self)->upload_video);
+
+  if (impl != NULL)
+    {
+      (impl) (self,
+        in_local_filename,
+        in_fields,
+        context);
+    }
+  else
+    {
+      GError e = { DBUS_GERROR, 
+           DBUS_GERROR_UNKNOWN_METHOD,
+           "Method not implemented" };
+
+      dbus_g_method_return_error (context, &e);
+    }
+}
+
+/**
+ * sw_video_upload_iface_implement_upload_video:
+ * @klass: A class whose instances implement this interface
+ * @impl: A callback used to implement the UploadVideo D-Bus method
+ *
+ * Register an implementation for the UploadVideo method in the vtable
+ * of an implementation of this interface. To be called from
+ * the interface init function.
+ */
+void
+sw_video_upload_iface_implement_upload_video (SwVideoUploadIfaceClass *klass, sw_video_upload_iface_upload_video_impl impl)
+{
+  klass->upload_video = impl;
+}
+
+/**
+ * sw_video_upload_iface_emit_video_upload_progress:
+ * @instance: The object implementing this interface
+ * @arg_opid: gint  (FIXME, generate documentation)
+ * @arg_progress: gint  (FIXME, generate documentation)
+ * @arg_error_message: const gchar * (FIXME, generate documentation)
+ *
+ * Type-safe wrapper around g_signal_emit to emit the
+ * VideoUploadProgress signal on interface com.meego.libsocialweb.VideoUpload.
+ */
+void
+sw_video_upload_iface_emit_video_upload_progress (gpointer instance,
+    gint arg_opid,
+    gint arg_progress,
+    const gchar *arg_error_message)
+{
+  g_assert (instance != NULL);
+  g_assert (G_TYPE_CHECK_INSTANCE_TYPE (instance, SW_TYPE_VIDEO_UPLOAD_IFACE));
+  g_signal_emit (instance,
+      video_upload_iface_signals[SIGNAL_VIDEO_UPLOAD_IFACE_VideoUploadProgress],
+      0,
+      arg_opid,
+      arg_progress,
+      arg_error_message);
+}
+
+static inline void
+sw_video_upload_iface_base_init_once (gpointer klass G_GNUC_UNUSED)
+{
+  dbus_g_object_type_install_info (sw_video_upload_iface_get_type (),
+      &_sw_video_upload_iface_object_info);
+
+  /**
+   * SwVideoUploadIface::video-upload-progress:
+   * @arg_opid: gint  (FIXME, generate documentation)
+   * @arg_progress: gint  (FIXME, generate documentation)
+   * @arg_error_message: const gchar * (FIXME, generate documentation)
+   *
+   * The VideoUploadProgress D-Bus signal is emitted whenever this GObject signal is.
+   */
+  video_upload_iface_signals[SIGNAL_VIDEO_UPLOAD_IFACE_VideoUploadProgress] =
+  g_signal_new ("video-upload-progress",
+      G_OBJECT_CLASS_TYPE (klass),
+      G_SIGNAL_RUN_LAST|G_SIGNAL_DETAILED,
+      0,
+      NULL, NULL,
+      sw_marshal_VOID__INT_INT_STRING,
+      G_TYPE_NONE,
+      3,
+      G_TYPE_INT,
+      G_TYPE_INT,
+      G_TYPE_STRING);
+
+}
+static void
+sw_video_upload_iface_base_init (gpointer klass)
+{
+  static gboolean initialized = FALSE;
+
+  if (!initialized)
+    {
+      initialized = TRUE;
+      sw_video_upload_iface_base_init_once (klass);
+    }
+}
+static const DBusGMethodInfo _sw_video_upload_iface_methods[] = {
+  { (GCallback) sw_video_upload_iface_upload_video, sw_marshal_VOID__STRING_BOXED_POINTER, 0 },
+};
+
+static const DBusGObjectInfo _sw_video_upload_iface_object_info = {
+  0,
+  _sw_video_upload_iface_methods,
+  1,
+"com.meego.libsocialweb.VideoUpload\0UploadVideo\0A\0local_filename\0I\0s\0fields\0I\0a{ss}\0opid\0O\0F\0N\0i\0\0\0",
+"com.meego.libsocialweb.VideoUpload\0VideoUploadProgress\0\0",
+"\0\0",
+};
+
+
--- interfaces/sw-video-upload-ginterface.h
+++ interfaces/sw-video-upload-ginterface.h
+#include <glib-object.h>
+#include <dbus/dbus-glib.h>
+
+G_BEGIN_DECLS
+
+/**
+ * SwVideoUploadIface:
+ *
+ * Dummy typedef representing any implementation of this interface.
+ */
+typedef struct _SwVideoUploadIface SwVideoUploadIface;
+
+/**
+ * SwVideoUploadIfaceClass:
+ *
+ * The class of SwVideoUploadIface.
+ */
+typedef struct _SwVideoUploadIfaceClass SwVideoUploadIfaceClass;
+
+GType sw_video_upload_iface_get_type (void);
+#define SW_TYPE_VIDEO_UPLOAD_IFACE \
+  (sw_video_upload_iface_get_type ())
+#define SW_VIDEO_UPLOAD_IFACE(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), SW_TYPE_VIDEO_UPLOAD_IFACE, SwVideoUploadIface))
+#define SW_IS_VIDEO_UPLOAD_IFACE(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), SW_TYPE_VIDEO_UPLOAD_IFACE))
+#define SW_VIDEO_UPLOAD_IFACE_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_INTERFACE((obj), SW_TYPE_VIDEO_UPLOAD_IFACE, SwVideoUploadIfaceClass))
+
+
+typedef void (*sw_video_upload_iface_upload_video_impl) (SwVideoUploadIface *self,
+    const gchar *in_local_filename,
+    GHashTable *in_fields,
+    DBusGMethodInvocation *context);
+void sw_video_upload_iface_implement_upload_video (SwVideoUploadIfaceClass *klass, sw_video_upload_iface_upload_video_impl impl);
+/**
+ * sw_video_upload_iface_return_from_upload_video:
+ * @context: The D-Bus method invocation context
+ * @out_opid: gint  (FIXME, generate documentation)
+ *
+ * Return successfully by calling dbus_g_method_return().
+ * This inline function exists only to provide type-safety.
+ */
+static inline
+/* this comment is to stop gtkdoc realising this is static */
+void sw_video_upload_iface_return_from_upload_video (DBusGMethodInvocation *context,
+    gint out_opid);
+static inline void
+sw_video_upload_iface_return_from_upload_video (DBusGMethodInvocation *context,
+    gint out_opid)
+{
+  dbus_g_method_return (context,
+      out_opid);
+}
+
+void sw_video_upload_iface_emit_video_upload_progress (gpointer instance,
+    gint arg_opid,
+    gint arg_progress,
+    const gchar *arg_error_message);
+
+
+G_END_DECLS
--- interfaces/sw-video-upload.xml
+++ interfaces/sw-video-upload.xml
+<?xml version="1.0" encoding="utf-8"?>
+
+<node name="/Video_Upload_Iface"
+      xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
+      xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <interface name="com.meego.libsocialweb.VideoUpload">
+    <doc:doc>
+      <doc:summary>An interface for uploading videos.</doc:summary>
+    </doc:doc>
+
+    <method name="UploadVideo" tp:name-for-bindings="Upload_Video">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Upload the video @local_filename.  The upload will be performed
+            asynchronously and @opid can be used to identify the upload in the
+            #VideoUpload::VideoUploadProgress signal.
+          </doc:para>
+          <doc:para>
+            @fields is a set of key-value pairs that are passed to the service.
+            None of these are required and not all services support all of the
+            keys.  Generic keys are:
+          </doc:para>
+          <doc:list>
+            <doc:item>
+              <doc:term>title</doc:term>
+              <doc:definition>The video's title</doc:definition>
+            </doc:item>
+          </doc:list>
+        </doc:description>
+      </doc:doc>
+
+      <arg name="local_filename" type="s" direction="in">
+        <doc:doc>
+          <doc:summary>The local filename of the image to upload.</doc:summary>
+        </doc:doc>
+      </arg>
+
+      <arg name="fields" type="a{ss}" direction="in">
+        <doc:doc>
+          <doc:summary>Key-value pairs containing metadata.</doc:summary>
+        </doc:doc>
+      </arg>
+
+      <arg name="opid" type="i" direction="out">
+        <doc:doc>
+          <doc:summary>Operation identifier, used in the #VideoUpload::VideoUploadProgress signal.</doc:summary>
+        </doc:doc>
+      </arg>
+    </method>
+
+    <signal name="VideoUploadProgress" tp:name-for-bindings="Video_Upload_Progress">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Emitted periodically as the upload is performed.  @progress can go
+            from 0 to 100 as the upload is performed. If there is an error then
+            @progress is -1 and @error_message is set.
+          </doc:para>
+          <doc:para>
+            This signal is guaranteed to be emitted at least once with either
+            @progress at 100 (i.e. upload complete) or an error state.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+
+      <arg name="opid" type="i">
+        <doc:doc>
+          <doc:summary>Operation identifier, as returned by UploadVideo().</doc:summary>
+        </doc:doc>
+      </arg>
+
+      <!-- 100 for complete, -1 for error -->
+      <arg name="progress" type="i">
+        <doc:doc>
+          <doc:summary>Current progress, the normal range being 0 (not started)
+          to 100 (completed), with -1 meaning an error occurred.</doc:summary>
+        </doc:doc>
+      </arg>
+
+      <arg name="error_message" type="s">
+        <doc:doc>
+          <doc:summary>The human-readable error message.  This will be set if @progress is -1.</doc:summary>
+        </doc:doc>
+      </arg>
+    </signal>
+  </interface>
+</node>
--- libsocialweb-client/sw-client-item-view.c
+++ libsocialweb-client/sw-client-item-view.c
@@ -442,14 +442,16 @@
                        NULL);
 }
 
+/* This is to avoid multiple almost identical callbacks */
 static void
-_sw_client_item_view_start_cb (DBusGProxy *proxy,
-                                   GError     *error,
-                                   gpointer    userdata)
+_sw_client_item_view_generic_cb (DBusGProxy *proxy,
+                                 GError     *error,
+                                 gpointer    userdata)
 {
   if (error)
   {
-    g_warning (G_STRLOC ": Error when starting item_view: %s",
+    g_warning (G_STRLOC ": Error when calling %s: %s",
+               (const gchar *)userdata,
                error->message);
     g_error_free (error);
   }
@@ -461,31 +463,36 @@
   SwClientItemViewPrivate *priv = GET_PRIVATE (item_view);
 
   com_meego_libsocialweb_ItemView_start_async (priv->proxy,
-                                         _sw_client_item_view_start_cb,
-                                         NULL);
+                                               _sw_client_item_view_generic_cb,
+                                               (gpointer)G_STRFUNC);
 }
 
-
-static void
-_sw_client_item_view_refresh_cb (DBusGProxy *proxy,
-                                     GError     *error,
-                                     gpointer    userdata)
+void
+sw_client_item_view_refresh (SwClientItemView *item_view)
 {
-  if (error)
-  {
-    g_warning (G_STRLOC ": Error when refreshing item_view: %s",
-               error->message);
-    g_error_free (error);
-  }
+  SwClientItemViewPrivate *priv = GET_PRIVATE (item_view);
+
+  com_meego_libsocialweb_ItemView_refresh_async (priv->proxy,
+                                                 _sw_client_item_view_generic_cb,
+                                                 (gpointer)G_STRFUNC);
 }
 
 void
-sw_client_item_view_refresh (SwClientItemView *item_view)
+sw_client_item_view_stop (SwClientItemView *item_view)
 {
   SwClientItemViewPrivate *priv = GET_PRIVATE (item_view);
 
-  com_meego_libsocialweb_ItemView_refresh_async (priv->proxy,
-                                           _sw_client_item_view_refresh_cb,
-                                           NULL);
+  com_meego_libsocialweb_ItemView_stop_async (priv->proxy,
+                                              _sw_client_item_view_generic_cb,
+                                              (gpointer)G_STRFUNC);
 }
 
+void
+sw_client_item_view_close (SwClientItemView *item_view)
+{
+  SwClientItemViewPrivate *priv = GET_PRIVATE (item_view);
+
+  com_meego_libsocialweb_ItemView_close_async (priv->proxy,
+                                              _sw_client_item_view_generic_cb,
+                                              (gpointer)G_STRFUNC);
+}
--- libsocialweb-client/sw-client-item-view.h
+++ libsocialweb-client/sw-client-item-view.h
@@ -58,6 +58,8 @@
 SwClientItemView *_sw_client_item_view_new_for_path (const gchar *item_view_path);
 void sw_client_item_view_start (SwClientItemView *item_view);
 void sw_client_item_view_refresh (SwClientItemView *item_view);
+void sw_client_item_view_stop (SwClientItemView *item_view);
+void sw_client_item_view_close (SwClientItemView *item_view);
 
 G_END_DECLS
 
--- libsocialweb-client/sw-client-service.c
+++ libsocialweb-client/sw-client-service.c
@@ -28,6 +28,7 @@
 #include <interfaces/sw-avatar-bindings.h>
 #include <interfaces/sw-banishable-bindings.h>
 #include <interfaces/sw-photo-upload-bindings.h>
+#include <interfaces/sw-video-upload-bindings.h>
 #include <interfaces/sw-marshals.h>
 
 G_DEFINE_TYPE (SwClientService, sw_client_service, G_TYPE_OBJECT)
@@ -55,6 +56,7 @@
   STATUS_UPDATE_IFACE,
   BANISHABLE_IFACE,
   PHOTO_UPLOAD_IFACE,
+  VIDEO_UPLOAD_IFACE,
   LAST_IFACE
 } SwServiceIface;
 
@@ -72,7 +74,8 @@
   "com.meego.libsocialweb.Query",
   "com.meego.libsocialweb.StatusUpdate",
   "com.meego.libsocialweb.Banishable",
-  "com.meego.libsocialweb.PhotoUpload"
+  "com.meego.libsocialweb.PhotoUpload",
+  "com.meego.libsocialweb.VideoUpload"
 };
 
 static guint signals[LAST_SIGNAL] = { 0 };
@@ -388,11 +391,12 @@
   GCallback cb;
   gpointer userdata;
 
-  /* Used for photo upload */
+  /* Used for photo and video upload */
   GFileProgressCallback progress_cb;
   gpointer progress_cb_data;
   guint64 filesize;
   gint opid;
+  SwServiceIface iface;
   GHashTable *fields;
 } SwClientServiceCallClosure;
 
@@ -528,7 +532,7 @@
 }
 
 static void
-_upload_photo_progress_cb (DBusGProxy *proxy,
+_upload_file_progress_cb (DBusGProxy *proxy,
                            gint opid,
                            gint progress,
                            const char *error_message,
@@ -561,7 +565,9 @@
     res = g_simple_async_result_new (G_OBJECT (closure->service),
                                      (GAsyncReadyCallback) closure->cb,
                                      closure->userdata,
-                                     sw_client_service_upload_photo);
+                                     closure->iface == PHOTO_UPLOAD_IFACE ?
+                                     sw_client_service_upload_photo :
+                                     sw_client_service_upload_video);
     g_simple_async_result_set_op_res_gboolean (res, TRUE);
     g_simple_async_result_complete_in_idle (res);
     g_object_unref (res);
@@ -571,10 +577,10 @@
 }
 
 static void
-_upload_photo_cb (DBusGProxy *proxy,
-                  gint opid,
-                  GError *error,
-                  gpointer userdata)
+_upload_file_cb (DBusGProxy *proxy,
+		 gint opid,
+		 GError *error,
+		 gpointer userdata)
 {
   SwClientServiceCallClosure *closure = (SwClientServiceCallClosure *) userdata;
 
@@ -594,7 +600,7 @@
 }
 
 static void
-got_photo_size_cb (GObject *source_object,
+got_file_size_cb (GObject *source_object,
                    GAsyncResult *res,
                    gpointer userdata)
 {
@@ -602,6 +608,7 @@
   SwClientServicePrivate *priv = GET_PRIVATE (closure->service);
   GFileInfo *info;
   char *filename;
+  const char *signal;
 
   info = g_file_query_info_finish (G_FILE (source_object), res, NULL);
   if (info == NULL ||
@@ -625,15 +632,24 @@
                                                         G_FILE_ATTRIBUTE_STANDARD_SIZE);
   g_object_unref (info);
 
-  dbus_g_proxy_connect_signal (priv->proxies[PHOTO_UPLOAD_IFACE], "PhotoUploadProgress",
-                               G_CALLBACK (_upload_photo_progress_cb), closure, NULL);
+  signal = (closure->iface == PHOTO_UPLOAD_IFACE ? "PhotoUploadProgress" : "VideoUploadProgress");
+  dbus_g_proxy_connect_signal (priv->proxies[closure->iface], signal,
+			       G_CALLBACK (_upload_file_progress_cb), closure, NULL);
 
   filename = g_file_get_path (G_FILE (source_object));
-  com_meego_libsocialweb_PhotoUpload_upload_photo_async (priv->proxies[PHOTO_UPLOAD_IFACE],
-                                                         filename,
-                                                         closure->fields,
-                                                         _upload_photo_cb,
-                                                         closure);
+  if (closure->iface == PHOTO_UPLOAD_IFACE) {
+    com_meego_libsocialweb_PhotoUpload_upload_photo_async (priv->proxies[PHOTO_UPLOAD_IFACE],
+							   filename,
+							   closure->fields,
+							   _upload_file_cb,
+							   closure);
+  } else {
+    com_meego_libsocialweb_VideoUpload_upload_video_async (priv->proxies[VIDEO_UPLOAD_IFACE],
+							   filename,
+							   closure->fields,
+							   _upload_file_cb,
+							   closure);
+  }
   g_hash_table_unref (closure->fields);
   closure->fields = NULL;
 
@@ -641,14 +657,15 @@
 }
 
 gboolean
-sw_client_service_upload_photo (SwClientService                      *service,
-                                const char                           *filename,
-                                const GHashTable                     *fields,
-                                GCancellable                         *cancellable,
-                                GFileProgressCallback                 progress_callback,
-                                gpointer                              progress_callback_data,
-                                GAsyncReadyCallback                   callback,
-                                gpointer                              userdata)
+_sw_client_service_upload (SwClientService                      *service,
+			   SwServiceIface                        iface,
+			   const char                           *filename,
+			   const GHashTable                     *fields,
+			   GCancellable                         *cancellable,
+			   GFileProgressCallback                 progress_callback,
+			   gpointer                              progress_callback_data,
+			   GAsyncReadyCallback                   callback,
+			   gpointer                              userdata)
 {
   SwClientServicePrivate *priv = GET_PRIVATE (service);
   SwClientServiceCallClosure *closure;
@@ -656,7 +673,7 @@
 
   if (!_sw_client_service_setup_proxy_for_iface (service,
                                                  priv->name,
-                                                 PHOTO_UPLOAD_IFACE,
+                                                 iface,
                                                  NULL)) {
     return FALSE;
   }
@@ -667,6 +684,7 @@
   closure->service = g_object_ref (service);
   closure->userdata = userdata;
   closure->cb = G_CALLBACK (callback);
+  closure->iface = iface;
   if (fields)
     closure->fields = g_hash_table_ref ((GHashTable *) fields);
   else
@@ -678,7 +696,7 @@
                            G_FILE_QUERY_INFO_NONE,
                            0,
                            NULL,
-                           got_photo_size_cb,
+                           got_file_size_cb,
                            closure);
   g_object_unref (file);
 
@@ -686,9 +704,51 @@
 }
 
 gboolean
-sw_client_service_upload_photo_finish (SwClientService  *service,
-                                       GAsyncResult     *res,
-                                       GError          **error)
+sw_client_service_upload_photo (SwClientService                      *service,
+                                const char                           *filename,
+                                const GHashTable                     *fields,
+                                GCancellable                         *cancellable,
+                                GFileProgressCallback                 progress_callback,
+                                gpointer                              progress_callback_data,
+                                GAsyncReadyCallback                   callback,
+                                gpointer                              userdata)
+{
+	return _sw_client_service_upload (service,
+					  PHOTO_UPLOAD_IFACE,
+					  filename,
+					  fields,
+					  cancellable,
+					  progress_callback,
+					  progress_callback_data,
+					  callback,
+					  userdata);
+}
+
+gboolean
+sw_client_service_upload_video (SwClientService                      *service,
+				const char                           *filename,
+				const GHashTable                     *fields,
+				GCancellable                         *cancellable,
+				GFileProgressCallback                 progress_callback,
+				gpointer                              progress_callback_data,
+				GAsyncReadyCallback                   callback,
+				gpointer                              userdata)
+{
+	return _sw_client_service_upload (service,
+					  VIDEO_UPLOAD_IFACE,
+					  filename,
+					  fields,
+					  cancellable,
+					  progress_callback,
+					  progress_callback_data,
+					  callback,
+					  userdata);
+}
+
+gboolean
+_sw_client_service_upload_finish (SwClientService  *service,
+				  GAsyncResult     *res,
+				  GError          **error)
 {
   GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
   gboolean ret;
@@ -708,6 +768,22 @@
   return ret;
 }
 
+gboolean
+sw_client_service_upload_photo_finish (SwClientService  *service,
+                                       GAsyncResult     *res,
+                                       GError          **error)
+{
+  return _sw_client_service_upload_finish (service, res, error);
+}
+
+gboolean
+sw_client_service_upload_video_finish (SwClientService  *service,
+                                       GAsyncResult     *res,
+                                       GError          **error)
+{
+  return _sw_client_service_upload_finish (service, res, error);
+}
+
 static void
 _request_avatar_cb (DBusGProxy *proxy,
                     GError     *error,
--- libsocialweb-client/sw-client-service.h
+++ libsocialweb-client/sw-client-service.h
@@ -69,6 +69,7 @@
 #define HAS_UPDATE_STATUS_IFACE "has-update-status-iface"
 #define HAS_AVATAR_IFACE "has-avatar-iface"
 #define HAS_PHOTO_UPLOAD_IFACE "has-photo-upload-iface"
+#define HAS_VIDEO_UPLOAD_IFACE "has-video-upload-iface"
 #define HAS_BANISHABLE_IFACE "has-banishable-iface"
 #define HAS_QUERY_IFACE "has-query-iface"
 
@@ -127,6 +128,20 @@
                                        GAsyncResult     *res,
                                        GError          **error);
 
+gboolean
+sw_client_service_upload_video (SwClientService                      *service,
+                                const char                           *filename,
+                                const GHashTable                     *fields,
+                                GCancellable                         *cancellable,
+                                GFileProgressCallback                 progress_callback,
+                                gpointer                              progress_callback_data,
+                                GAsyncReadyCallback                   callback,
+                                gpointer                              userdata);
+gboolean
+sw_client_service_upload_video_finish (SwClientService  *service,
+                                       GAsyncResult     *res,
+                                       GError          **error);
+
 typedef void (*SwClientServiceQueryOpenViewCallback) (SwClientService  *query,
                                                       SwClientItemView *item_view,
                                                       gpointer          userdata);
--- libsocialweb/Makefile.am
+++ libsocialweb/Makefile.am
@@ -46,6 +46,7 @@
 	sw-debug.h \
 	sw-web.h \
 	sw-set.h \
+	sw-cache.h \
 	sw-item.h \
 	sw-module.h \
 	sw-utils.h
--- libsocialweb/Makefile.in
+++ libsocialweb/Makefile.in
@@ -394,6 +394,7 @@
 	sw-debug.h \
 	sw-web.h \
 	sw-set.h \
+	sw-cache.h \
 	sw-item.h \
 	sw-module.h \
 	sw-utils.h
--- libsocialweb/sw-enum-types.c
+++ libsocialweb/sw-enum-types.c
@@ -49,6 +49,7 @@
         { SW_DEBUG_CORE, "SW_DEBUG_CORE", "core" },
         { SW_DEBUG_VIMEO, "SW_DEBUG_VIMEO", "vimeo" },
         { SW_DEBUG_FLICKR, "SW_DEBUG_FLICKR", "flickr" },
+        { SW_DEBUG_CLIENT_MONITOR, "SW_DEBUG_CLIENT_MONITOR", "client-monitor" },
         { 0, NULL, NULL }
       };
       GType g_enum_type_id;
--- libsocialweb/sw-item-stream.c
+++ libsocialweb/sw-item-stream.c
@@ -172,8 +172,11 @@
 static void
 sw_item_stream_default_close (SwItemStream *item_stream)
 {
+  SwItemStreamPrivate *priv = GET_PRIVATE (item_stream);
   SwCore *core;
 
+  SW_DEBUG (VIEWS, "%s called on %s", G_STRFUNC, priv->object_path);
+
   core = sw_core_dup_singleton ();
   dbus_g_connection_unregister_g_object (sw_core_get_connection (core),
                                          G_OBJECT (item_stream));
@@ -229,6 +232,9 @@
                       DBusGMethodInvocation *context)
 {
   SwItemStream *item_stream = SW_ITEM_STREAM (iface);
+  SwItemStreamPrivate *priv = GET_PRIVATE (item_stream);
+
+  SW_DEBUG (VIEWS, "%s called on %s", G_STRFUNC, priv->object_path);
 
   if (SW_ITEM_STREAM_GET_CLASS (iface)->start)
     SW_ITEM_STREAM_GET_CLASS (iface)->start (item_stream);
@@ -241,6 +247,9 @@
                         DBusGMethodInvocation *context)
 {
   SwItemStream *item_stream = SW_ITEM_STREAM (iface);
+  SwItemStreamPrivate *priv = GET_PRIVATE (item_stream);
+
+  SW_DEBUG (VIEWS, "%s called on %s", G_STRFUNC, priv->object_path);
 
   if (SW_ITEM_STREAM_GET_CLASS (iface)->refresh)
     SW_ITEM_STREAM_GET_CLASS (iface)->refresh (item_stream);
@@ -253,6 +262,9 @@
                    DBusGMethodInvocation *context)
 {
   SwItemStream *item_stream = SW_ITEM_STREAM (iface);
+  SwItemStreamPrivate *priv = GET_PRIVATE (item_stream);
+
+  SW_DEBUG (VIEWS, "%s called on %s", G_STRFUNC, priv->object_path);
 
   if (SW_ITEM_STREAM_GET_CLASS (iface)->stop)
     SW_ITEM_STREAM_GET_CLASS (iface)->stop (item_stream);
@@ -265,6 +277,9 @@
                     DBusGMethodInvocation *context)
 {
   SwItemStream *item_stream = SW_ITEM_STREAM (iface);
+  SwItemStreamPrivate *priv = GET_PRIVATE (item_stream);
+
+  SW_DEBUG (VIEWS, "%s called on %s", G_STRFUNC, priv->object_path);
 
   if (SW_ITEM_STREAM_GET_CLASS (iface)->close)
     SW_ITEM_STREAM_GET_CLASS (iface)->close (item_stream);
--- libsocialweb/sw-item-view.c
+++ libsocialweb/sw-item-view.c
@@ -183,7 +183,7 @@
 sw_item_view_constructed (GObject *object)
 {
   SwItemView *item_view = SW_ITEM_VIEW (object);
-  SwItemViewPrivate *priv = GET_PRIVATE (object);
+  SwItemViewPrivate *priv = GET_PRIVATE (item_view);
   SwCore *core;
 
   core = sw_core_dup_singleton ();
@@ -203,8 +203,11 @@
 static void
 sw_item_view_default_close (SwItemView *item_view)
 {
+  SwItemViewPrivate *priv = GET_PRIVATE (item_view);
   SwCore *core;
 
+  SW_DEBUG (VIEWS, "%s called on %s", G_STRFUNC, priv->object_path);
+
   core = sw_core_dup_singleton ();
   dbus_g_connection_unregister_g_object (sw_core_get_connection (core),
                                          G_OBJECT (item_view));
@@ -266,6 +269,9 @@
                     DBusGMethodInvocation *context)
 {
   SwItemView *item_view = SW_ITEM_VIEW (iface);
+  SwItemViewPrivate *priv = GET_PRIVATE (item_view);
+
+  SW_DEBUG (VIEWS, "%s called on %s", G_STRFUNC, priv->object_path);
 
   if (SW_ITEM_VIEW_GET_CLASS (iface)->start)
     SW_ITEM_VIEW_GET_CLASS (iface)->start (item_view);
@@ -278,6 +284,9 @@
                       DBusGMethodInvocation *context)
 {
   SwItemView *item_view = SW_ITEM_VIEW (iface);
+  SwItemViewPrivate *priv = GET_PRIVATE (item_view);
+
+  SW_DEBUG (VIEWS, "%s called on %s", G_STRFUNC, priv->object_path);
 
   if (SW_ITEM_VIEW_GET_CLASS (iface)->refresh)
     SW_ITEM_VIEW_GET_CLASS (iface)->refresh (item_view);
@@ -290,6 +299,9 @@
                    DBusGMethodInvocation *context)
 {
   SwItemView *item_view = SW_ITEM_VIEW (iface);
+  SwItemViewPrivate *priv = GET_PRIVATE (item_view);
+
+  SW_DEBUG (VIEWS, "%s called on %s", G_STRFUNC, priv->object_path);
 
   if (SW_ITEM_VIEW_GET_CLASS (iface)->stop)
     SW_ITEM_VIEW_GET_CLASS (iface)->stop (item_view);
@@ -302,6 +314,9 @@
                     DBusGMethodInvocation *context)
 {
   SwItemView *item_view = SW_ITEM_VIEW (iface);
+  SwItemViewPrivate *priv = GET_PRIVATE (item_view);
+
+  SW_DEBUG (VIEWS, "%s called on %s", G_STRFUNC, priv->object_path);
 
   if (SW_ITEM_VIEW_GET_CLASS (iface)->close)
     SW_ITEM_VIEW_GET_CLASS (iface)->close (item_view);
--- libsocialweb/sw-service.h
+++ libsocialweb/sw-service.h
@@ -79,6 +79,7 @@
 #define HAS_UPDATE_STATUS_IFACE "has-update-status-iface"
 #define HAS_AVATAR_IFACE "has-avatar-iface"
 #define HAS_PHOTO_UPLOAD_IFACE "has-photo-upload-iface"
+#define HAS_VIDEO_UPLOAD_IFACE "has-video-upload-iface"
 #define HAS_BANISHABLE_IFACE "has-banishable-iface"
 #define HAS_QUERY_IFACE "has-query-iface"
 
--- po/ko.po
+++ po/ko.po
@@ -1,17 +1,20 @@
-# 
+#
+# Park Shinjo <peremen at gmail.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-03-10 10:36+0000\n"
-"PO-Revision-Date: \n"
-"Last-Translator: GLS <tomas.galicia at intel.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-07-10 05:51+0900\n"
+"Last-Translator: Park Shinjo <peremen at gmail.com>\n"
+"Language-Team: Korean <peremen at gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Korean\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../services/lastfm/lastfm.keys.in.h:1
 msgid "Last.fm"
@@ -19,15 +22,15 @@
 
 #: ../services/lastfm/lastfm.keys.in.h:2
 msgid "Last.fm is a music service that learns what you love. Every track you play will tell your Last.fm profile something about what you like. It can connect you to other people who like what you like - and recommend songs from their music collections and yours too."
-msgstr "Last.fm은 당신이 좋아하는 뮤직 서비스입니다. 당신이 플래이하는 모든 트랙은 당신이 좋아하는 Last.fm 프로파일을 나타낼 것입니다. 이것은 당신과 취향이 같은 다른 사람들은 연결할수 있으며 서로의 뮤직 콜렉션에서 다른 음악을 소개 할수도 있습니다. "
+msgstr "Last.fm은 개인 맞춤형 음악 서비스입니다. 재생하는 곡을 기억하여 Last.fm 프로필에 좋아하는 곡 정보를 업데이트합니다. 나와 같은 곡을 좋아하는 사람을 연결해 주며, 서로가 좋아하는 음악을 추천해 줍니다."
 
 #: ../services/twitter/twitter.keys.in.h:1
 msgid "Twitter"
-msgstr "Twitter"
+msgstr "트위터"
 
 #: ../services/twitter/twitter.keys.in.h:2
 msgid "Twitter is a service for friends, family, and co–workers to communicate and stay connected through the exchange of quick, frequent answers to one simple question: What are you doing?"
-msgstr "Twitter는 친구, 가족 그리고 돌료와의 소통과 서로의 안부같은  짧은 질문을 자주 주고 받을수 있도록 연결해주는 서비스입니다. "
+msgstr "트위터는 친구, 가족, 동료와 대화하고 빠르게 정보를 교환할 수 있는 네트워크입니다."
 
 #: ../services/flickr/flickr.keys.in.h:1
 msgid "Flickr"
@@ -35,7 +38,7 @@
 
 #: ../services/flickr/flickr.keys.in.h:2
 msgid "Flickr - almost certainly the best online photo management and sharing application in the world."
-msgstr "Flickr - 최상의 온라인 포토 관리 그리고 응용 프로그램 공유 "
+msgstr "Flickr - 전 세계 최고의 온라인 사진 관리 및 공유 사이트입니다."
 
 #: ../services/myspace/myspace.keys.in.h:1
 msgid "MySpace"
@@ -43,22 +46,23 @@
 
 #: ../services/myspace/myspace.keys.in.h:2
 msgid "MySpace is a leading social portal for connecting people, content, and culture from around the world. Create a profile, share photos, professional and viral videos, blog, instant message your friends, and listen to music on the world’s largest music community."
-msgstr "MySpace는 가장 인기있는 소셜 포털로 전 세계 사람들과 컨텐츠 그리고 문화를 연결할 수 있습니다.  "
+msgstr "MySpace는 전 세계의 사람, 문화를 잇는 소셜 포털입니다. 프로필을 만들고, 사진과 동영상을 공유하고, 블로그에 글을 쓰고, 친구들과 실시간 메시지를 주고받으며, 음악을 들을 수 있습니다."
 
 #: ../services/digg/digg.keys.in.h:1
 msgid "Digg"
-msgstr "디그"
+msgstr "Digg"
 
 #. Translators "[track title] by [artist]"
 #: ../services/lastfm/lastfm.c:149
 #, c-format
 msgid "%s by %s"
-msgstr "%s x %s"
+msgstr "%s by %s"
 
 #: ../services/digg/digg.keys.in.h:2
 msgid "Digg - to share news, video and images"
-msgstr "디그 - 뉴스, 비디오, 이미지 등을 공유하는 것"
+msgstr "Digg - 뉴스, 동영상, 사진 공유하기"
 
 #: ../services/lastfm/lastfm.c:153
 msgid "Unknown"
 msgstr "알 수 없음"
+
--- services/twitter/twitter-item-stream.c
+++ services/twitter/twitter-item-stream.c
@@ -183,6 +183,16 @@
                 "date",
                 _make_date (json_object_get_string_member (root_o, "created_at")));
 
+  if (json_object_has_member (user_o, "profile_image_url"))
+  {
+    sw_item_request_image_fetch (item,
+                               TRUE,
+                               "authoricon",
+                               json_object_get_string_member (user_o, "profile_image_url"));
+  }
+
+
+
   if (geo_o)
   {
     JsonArray *coords;
@@ -226,7 +236,6 @@
     priv->buf_size = 0;
   }
 
-  g_debug (G_STRLOC ": Adding %d to string buffer", (gint)len);
   priv->cur_buffer = g_string_append_len (priv->cur_buffer,
                                           buf,
                                           len);
@@ -235,7 +244,6 @@
   /* Get rid of any preceding new lines */
   while (priv->cur_buffer->str[0]=='\r') {
     priv->cur_buffer = g_string_erase (priv->cur_buffer, 0, 2);
-    g_debug (G_STRLOC ": filtering new lines");
   }
 
   /* Format is <message byte count>\r\n */
@@ -246,12 +254,8 @@
                                               '\n');
     gint newline_pos = message_buf - priv->cur_buffer->str;
 
-    g_debug (G_STRLOC ": newline pos = %d, message_length = %d, priv->buf_size = %d",
-             newline_pos, message_length, priv->buf_size);
-
     if (priv->buf_size >= newline_pos + 1 + message_length)
     {
-      g_debug (G_STRLOC ": Consuming data!");
 
       priv->cur_buffer = g_string_erase (priv->cur_buffer, 0, newline_pos + 1);
 
@@ -262,11 +266,29 @@
       {
         g_warning (G_STRLOC ": error parsing json: %s", error->message);
       } else {
-        SwItem *item = _create_item_from_node (json_parser_get_root (priv->parser));
-        SwService *service = sw_item_stream_get_service (SW_ITEM_STREAM (item_stream));
-
-        sw_item_set_service (item, service);
-        sw_item_stream_add_item (item_stream, item);
+        SwItem *item;
+        SwService *service;
+        const gchar *content;
+        const gchar *track_params;
+
+        item = _create_item_from_node (json_parser_get_root (priv->parser));
+        service = sw_item_stream_get_service (SW_ITEM_STREAM (item_stream));
+
+        /* Check if this item actually matches the track parameter due to
+         * needing to substitute spaces for commas to give a union
+         */
+        content = sw_item_get (item, "content");
+
+        track_params = g_hash_table_lookup (priv->params, "keywords");
+
+        if (strstr (content, track_params))
+        {
+          sw_item_set_service (item, service);
+          sw_item_stream_add_item (item_stream, item);
+          g_object_unref (item);
+        } else {
+          g_object_unref (item);
+        }
       }
 
       priv->cur_buffer = g_string_erase (priv->cur_buffer, 0, message_length);
@@ -282,7 +304,7 @@
 {
   SwTwitterItemStreamPrivate *priv = GET_PRIVATE (item_stream);
   RestProxyCall *call;
-  const gchar *track_params;
+  gchar *track_params;
 
   call = rest_proxy_new_call (priv->proxy);
   g_object_set (priv->proxy, "url-format", "http://stream.twitter.com/", NULL);
@@ -290,7 +312,7 @@
   rest_proxy_call_set_function (call, "1/statuses/filter.json");
   rest_proxy_call_set_method (call, "POST");
 
-  track_params = g_hash_table_lookup (priv->params, "keywords");
+  track_params = g_strdup (g_hash_table_lookup (priv->params, "keywords"));
 
   if (!track_params)
   {
@@ -298,6 +320,12 @@
     return;
   }
 
+  /*
+   * We have to convert spaces to commas and then filter the received data on
+   * the version with spaces due to limitations in the twitter API
+   */
+  track_params = g_strdelimit (track_params, " ", ',');
+
   rest_proxy_call_add_param (call, "track", track_params);
   rest_proxy_call_add_param (call, "delimited", "length");
 
@@ -306,6 +334,8 @@
                               (GObject *)item_stream,
                               NULL,
                               NULL);
+
+  g_free (track_params);
 }
 
 static void
--- services/twitter/twitter-item-view.c
+++ services/twitter/twitter-item-view.c
@@ -224,7 +224,7 @@
   sw_item_put (item, "id", url);
   sw_item_take (item, "url", url);
 
-  user_name = rest_xml_node_find (node, "name")->content;
+  user_name = rest_xml_node_find (u_node, "name")->content;
   sw_item_put (item, "author", user_name);
 
   content = rest_xml_node_find (node, "text")->content;
@@ -420,7 +420,7 @@
   SwService *service;
   GError *error = NULL;
 
-  if (error) {
+  if (error_in) {
     g_warning (G_STRLOC ": Error getting trending topic data: %s", error_in->message);
     return;
   }
@@ -470,7 +470,7 @@
         sw_item_put (item, "content", json_object_get_string_member (trend_o,
                                                                      "name"));
 
-        sw_set_add (set, item);
+        sw_set_add (set, (GObject *)item);
         g_object_unref (item);
       }
       g_list_free (values);

++++++ libsocialweb.yaml
--- libsocialweb.yaml
+++ libsocialweb.yaml
@@ -1,6 +1,6 @@
 Name: libsocialweb
 Summary: A social data aggregator
-Version: 0.25.5
+Version: 0.25.6
 Release: 1
 Group: System Environment/Desktop
 License: LGPL 2.1



More information about the MeeGo-commits mailing list