glib inlined into SameTime

git-svn-id: http://svn.miranda-ng.org/main/trunk@8685 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

64 files changed, 0 insertions, 11539 deletions

diff --git a/protocols/Sametime/src/glib/include/glib.h b/protocols/Sametime/src/glib/include/glib.h
deleted file mode 100644
index 06d0190b24..0000000000
--- a/protocols/Sametime/src/glib/include/glib.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_LIB_H__
-#define __G_LIB_H__
-
-#define __GLIB_H_INSIDE__
-
-#include <glib/galloca.h>
-#include <glib/garray.h>
-#include <glib/gasyncqueue.h>
-#include <glib/gatomic.h>
-#include <glib/gbacktrace.h>
-#include <glib/gbase64.h>
-#include <glib/gbitlock.h>
-#include <glib/gbookmarkfile.h>
-#include <glib/gcache.h>
-#include <glib/gchecksum.h>
-#include <glib/gcompletion.h>
-#include <glib/gconvert.h>
-#include <glib/gdataset.h>
-#include <glib/gdate.h>
-#include <glib/gdatetime.h>
-#include <glib/gdir.h>
-#include <glib/gerror.h>
-#include <glib/gfileutils.h>
-#include <glib/ghash.h>
-#include <glib/ghook.h>
-#include <glib/ghostutils.h>
-#include <glib/giochannel.h>
-#include <glib/gkeyfile.h>
-#include <glib/glist.h>
-#include <glib/gmacros.h>
-#include <glib/gmain.h>
-#include <glib/gmappedfile.h>
-#include <glib/gmarkup.h>
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
-#include <glib/gnode.h>
-#include <glib/goption.h>
-#include <glib/gpattern.h>
-#include <glib/gpoll.h>
-#include <glib/gprimes.h>
-#include <glib/gqsort.h>
-#include <glib/gquark.h>
-#include <glib/gqueue.h>
-#include <glib/grand.h>
-#include <glib/grel.h>
-#include <glib/gregex.h>
-#include <glib/gscanner.h>
-#include <glib/gsequence.h>
-#include <glib/gshell.h>
-#include <glib/gslice.h>
-#include <glib/gslist.h>
-#include <glib/gspawn.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gstring.h>
-#include <glib/gtestutils.h>
-#include <glib/gthread.h>
-#include <glib/gthreadpool.h>
-#include <glib/gtimer.h>
-#include <glib/gtimezone.h>
-#include <glib/gtree.h>
-#include <glib/gtypes.h>
-#include <glib/gunicode.h>
-#include <glib/gurifuncs.h>
-#include <glib/gutils.h>
-#include <glib/gvarianttype.h>
-#include <glib/gvariant.h>
-#ifdef G_PLATFORM_WIN32
-#include <glib/gwin32.h>
-#endif
-
-#undef __GLIB_H_INSIDE__
-
-#endif /* __G_LIB_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/galloca.h b/protocols/Sametime/src/glib/include/glib/galloca.h
deleted file mode 100644
index 8876836a6f..0000000000
--- a/protocols/Sametime/src/glib/include/glib/galloca.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_ALLOCA_H__
-#define __G_ALLOCA_H__
-
-#include <glib/gtypes.h>
-
-#ifdef  __GNUC__
-/* GCC does the right thing */
-# undef alloca
-# define alloca(size)   __builtin_alloca (size)
-#elif defined (GLIB_HAVE_ALLOCA_H)
-/* a native and working alloca.h is there */ 
-# include <alloca.h>
-#else /* !__GNUC__ && !GLIB_HAVE_ALLOCA_H */
-# if defined(_MSC_VER) || defined(__DMC__)
-#  include <malloc.h>
-#  define alloca _alloca
-# else /* !_MSC_VER && !__DMC__ */
-#  ifdef _AIX
-#   pragma alloca
-#  else /* !_AIX */
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-G_BEGIN_DECLS
-char *alloca ();
-G_END_DECLS
-#   endif /* !alloca */
-#  endif /* !_AIX */
-# endif /* !_MSC_VER && !__DMC__ */
-#endif /* !__GNUC__ && !GLIB_HAVE_ALLOCA_H */
-
-/**
- * g_alloca:
- * @size: number of bytes to allocate.
- * 
- * Allocates @size bytes on the stack; these bytes will be freed when the current
- * stack frame is cleaned up. This macro essentially just wraps the alloca()
- * function present on most UNIX variants.
- * Thus it provides the same advantages and pitfalls as alloca():
- * <variablelist>
- *   <varlistentry><term></term><listitem><para>
- *     + alloca() is very fast, as on most systems it's implemented by just adjusting
- *     the stack pointer register.
- *   </para></listitem></varlistentry>
- *   <varlistentry><term></term><listitem><para>
- *     + It doesn't cause any memory fragmentation, within its scope, separate alloca()
- *     blocks just build up and are released together at function end.
- *   </para></listitem></varlistentry>
- *   <varlistentry><term></term><listitem><para>
- *     - Allocation sizes have to fit into the current stack frame. For instance in a
- *       threaded environment on Linux, the per-thread stack size is limited to 2 Megabytes,
- *       so be sparse with alloca() uses.
- *   </para></listitem></varlistentry>
- *   <varlistentry><term></term><listitem><para>
- *     - Allocation failure due to insufficient stack space is not indicated with a %NULL
- *       return like e.g. with malloc(). Instead, most systems probably handle it the same
- *       way as out of stack space situations from infinite function recursion, i.e.
- *       with a segmentation fault.
- *   </para></listitem></varlistentry>
- *   <varlistentry><term></term><listitem><para>
- *     - Special care has to be taken when mixing alloca() with GNU C variable sized arrays.
- *       Stack space allocated with alloca() in the same scope as a variable sized array
- *       will be freed together with the variable sized array upon exit of that scope, and
- *       not upon exit of the enclosing function scope.
- *   </para></listitem></varlistentry>
- * </variablelist>
- * 
- * Returns: space for @size bytes, allocated on the stack
- */
-#define g_alloca(size)		 alloca (size)
-/**
- * g_newa:
- * @struct_type: Type of memory chunks to be allocated
- * @n_structs: Number of chunks to be allocated
- * 
- * Wraps g_alloca() in a more typesafe manner.
- * 
- * Returns: Pointer to stack space for @n_structs chunks of type @struct_type
- */
-#define g_newa(struct_type, n_structs)	((struct_type*) g_alloca (sizeof (struct_type) * (gsize) (n_structs)))
-
-#endif /* __G_ALLOCA_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/garray.h b/protocols/Sametime/src/glib/include/glib/garray.h
deleted file mode 100644
index 6bc51f797e..0000000000
--- a/protocols/Sametime/src/glib/include/glib/garray.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_ARRAY_H__
-#define __G_ARRAY_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GArray		GArray;
-typedef struct _GByteArray	GByteArray;
-typedef struct _GPtrArray	GPtrArray;
-
-struct _GArray
-{
-  gchar *data;
-  guint len;
-};
-
-struct _GByteArray
-{
-  guint8 *data;
-  guint	  len;
-};
-
-struct _GPtrArray
-{
-  gpointer *pdata;
-  guint	    len;
-};
-
-/* Resizable arrays. remove fills any cleared spot and shortens the
- * array, while preserving the order. remove_fast will distort the
- * order by moving the last element to the position of the removed.
- */
-
-#define g_array_append_val(a,v)	  g_array_append_vals (a, &(v), 1)
-#define g_array_prepend_val(a,v)  g_array_prepend_vals (a, &(v), 1)
-#define g_array_insert_val(a,i,v) g_array_insert_vals (a, i, &(v), 1)
-#define g_array_index(a,t,i)      (((t*) (void *) (a)->data) [(i)])
-
-GArray* g_array_new               (gboolean          zero_terminated,
-				   gboolean          clear_,
-				   guint             element_size);
-GArray* g_array_sized_new         (gboolean          zero_terminated,
-				   gboolean          clear_,
-				   guint             element_size,
-				   guint             reserved_size);
-gchar*  g_array_free              (GArray           *array,
-				   gboolean          free_segment);
-GArray *g_array_ref               (GArray           *array);
-void    g_array_unref             (GArray           *array);
-guint   g_array_get_element_size  (GArray           *array);
-GArray* g_array_append_vals       (GArray           *array,
-				   gconstpointer     data,
-				   guint             len);
-GArray* g_array_prepend_vals      (GArray           *array,
-				   gconstpointer     data,
-				   guint             len);
-GArray* g_array_insert_vals       (GArray           *array,
-				   guint             index_,
-				   gconstpointer     data,
-				   guint             len);
-GArray* g_array_set_size          (GArray           *array,
-				   guint             length);
-GArray* g_array_remove_index      (GArray           *array,
-				   guint             index_);
-GArray* g_array_remove_index_fast (GArray           *array,
-				   guint             index_);
-GArray* g_array_remove_range      (GArray           *array,
-				   guint             index_,
-				   guint             length);
-void    g_array_sort              (GArray           *array,
-				   GCompareFunc      compare_func);
-void    g_array_sort_with_data    (GArray           *array,
-				   GCompareDataFunc  compare_func,
-				   gpointer          user_data);
-
-/* Resizable pointer array.  This interface is much less complicated
- * than the above.  Add appends a pointer.  Remove fills any cleared 
- * spot and shortens the array. remove_fast will again distort order.  
- */
-#define    g_ptr_array_index(array,index_) ((array)->pdata)[index_]
-GPtrArray* g_ptr_array_new                (void);
-GPtrArray* g_ptr_array_new_with_free_func (GDestroyNotify    element_free_func);
-GPtrArray* g_ptr_array_sized_new          (guint             reserved_size);
-gpointer*  g_ptr_array_free               (GPtrArray        *array,
-					   gboolean          free_seg);
-GPtrArray* g_ptr_array_ref                (GPtrArray        *array);
-void       g_ptr_array_unref              (GPtrArray        *array);
-void       g_ptr_array_set_free_func      (GPtrArray        *array,
-                                           GDestroyNotify    element_free_func);
-void       g_ptr_array_set_size           (GPtrArray        *array,
-					   gint              length);
-gpointer   g_ptr_array_remove_index       (GPtrArray        *array,
-					   guint             index_);
-gpointer   g_ptr_array_remove_index_fast  (GPtrArray        *array,
-					   guint             index_);
-gboolean   g_ptr_array_remove             (GPtrArray        *array,
-					   gpointer          data);
-gboolean   g_ptr_array_remove_fast        (GPtrArray        *array,
-					   gpointer          data);
-void       g_ptr_array_remove_range       (GPtrArray        *array,
-					   guint             index_,
-					   guint             length);
-void       g_ptr_array_add                (GPtrArray        *array,
-					   gpointer          data);
-void       g_ptr_array_sort               (GPtrArray        *array,
-					   GCompareFunc      compare_func);
-void       g_ptr_array_sort_with_data     (GPtrArray        *array,
-					   GCompareDataFunc  compare_func,
-					   gpointer          user_data);
-void       g_ptr_array_foreach            (GPtrArray        *array,
-					   GFunc             func,
-					   gpointer          user_data);
-
-
-/* Byte arrays, an array of guint8.  Implemented as a GArray,
- * but type-safe.
- */
-
-GByteArray* g_byte_array_new               (void);
-GByteArray* g_byte_array_sized_new         (guint             reserved_size);
-guint8*     g_byte_array_free              (GByteArray       *array,
-					    gboolean          free_segment);
-GByteArray *g_byte_array_ref               (GByteArray       *array);
-void        g_byte_array_unref             (GByteArray       *array);
-GByteArray* g_byte_array_append            (GByteArray       *array,
-					    const guint8     *data,
-					    guint             len);
-GByteArray* g_byte_array_prepend           (GByteArray       *array,
-					    const guint8     *data,
-					    guint             len);
-GByteArray* g_byte_array_set_size          (GByteArray       *array,
-					    guint             length);
-GByteArray* g_byte_array_remove_index      (GByteArray       *array,
-					    guint             index_);
-GByteArray* g_byte_array_remove_index_fast (GByteArray       *array,
-					    guint             index_);
-GByteArray* g_byte_array_remove_range      (GByteArray       *array,
-					    guint             index_,
-					    guint             length);
-void        g_byte_array_sort              (GByteArray       *array,
-					    GCompareFunc      compare_func);
-void        g_byte_array_sort_with_data    (GByteArray       *array,
-					    GCompareDataFunc  compare_func,
-					    gpointer          user_data);
-
-G_END_DECLS
-
-#endif /* __G_ARRAY_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gasyncqueue.h b/protocols/Sametime/src/glib/include/glib/gasyncqueue.h
deleted file mode 100644
index 9da43e36da..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gasyncqueue.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_ASYNCQUEUE_H__
-#define __G_ASYNCQUEUE_H__
-
-#include <glib/gthread.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GAsyncQueue GAsyncQueue;
-
-/* Asyncronous Queues, can be used to communicate between threads */
-
-/* Get a new GAsyncQueue with the ref_count 1 */
-GAsyncQueue*  g_async_queue_new                 (void);
-
-GAsyncQueue*  g_async_queue_new_full            (GDestroyNotify item_free_func);
-
-/* Lock and unlock a GAsyncQueue. All functions lock the queue for
- * themselves, but in certain cirumstances you want to hold the lock longer,
- * thus you lock the queue, call the *_unlocked functions and unlock it again.
- */
-void         g_async_queue_lock                 (GAsyncQueue      *queue);
-void         g_async_queue_unlock               (GAsyncQueue      *queue);
-
-/* Ref and unref the GAsyncQueue. */
-GAsyncQueue* g_async_queue_ref                  (GAsyncQueue      *queue);
-void         g_async_queue_unref                (GAsyncQueue      *queue);
-
-#ifndef G_DISABLE_DEPRECATED
-/* You don't have to hold the lock for calling *_ref and *_unref anymore. */
-void         g_async_queue_ref_unlocked         (GAsyncQueue      *queue);
-void         g_async_queue_unref_and_unlock     (GAsyncQueue      *queue);
-#endif /* !G_DISABLE_DEPRECATED */
-
-/* Push data into the async queue. Must not be NULL. */
-void         g_async_queue_push                 (GAsyncQueue      *queue,
-						 gpointer          data);
-void         g_async_queue_push_unlocked        (GAsyncQueue      *queue,
-						 gpointer          data);
-
-void         g_async_queue_push_sorted          (GAsyncQueue      *queue,
-						 gpointer          data,
-						 GCompareDataFunc  func,
-						 gpointer          user_data);
-void         g_async_queue_push_sorted_unlocked (GAsyncQueue      *queue,
-						 gpointer          data,
-						 GCompareDataFunc  func,
-						 gpointer          user_data);
-
-/* Pop data from the async queue. When no data is there, the thread is blocked
- * until data arrives.
- */
-gpointer     g_async_queue_pop                  (GAsyncQueue      *queue);
-gpointer     g_async_queue_pop_unlocked         (GAsyncQueue      *queue);
-
-/* Try to pop data. NULL is returned in case of empty queue. */
-gpointer     g_async_queue_try_pop              (GAsyncQueue      *queue);
-gpointer     g_async_queue_try_pop_unlocked     (GAsyncQueue      *queue);
-
-
-
-/* Wait for data until at maximum until end_time is reached. NULL is returned
- * in case of empty queue. 
- */
-gpointer     g_async_queue_timed_pop            (GAsyncQueue      *queue,
-						 GTimeVal         *end_time);
-gpointer     g_async_queue_timed_pop_unlocked   (GAsyncQueue      *queue,
-						 GTimeVal         *end_time);
-
-/* Return the length of the queue. Negative values mean that threads
- * are waiting, positve values mean that there are entries in the
- * queue. Actually this function returns the length of the queue minus
- * the number of waiting threads, g_async_queue_length == 0 could also
- * mean 'n' entries in the queue and 'n' thread waiting. Such can
- * happen due to locking of the queue or due to scheduling. 
- */
-gint         g_async_queue_length               (GAsyncQueue      *queue);
-gint         g_async_queue_length_unlocked      (GAsyncQueue      *queue);
-void         g_async_queue_sort                 (GAsyncQueue      *queue,
-						 GCompareDataFunc  func,
-						 gpointer          user_data);
-void         g_async_queue_sort_unlocked        (GAsyncQueue      *queue,
-						 GCompareDataFunc  func,
-						 gpointer          user_data);
-
-/* Private API */
-GMutex*      _g_async_queue_get_mutex           (GAsyncQueue      *queue);
-
-G_END_DECLS
-
-#endif /* __G_ASYNCQUEUE_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gatomic.h b/protocols/Sametime/src/glib/include/glib/gatomic.h
deleted file mode 100644
index ddd39b8a3a..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gatomic.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * g_atomic_*: atomic operations.
- * Copyright (C) 2003 Sebastian Wilhelmi
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_ATOMIC_H__
-#define __G_ATOMIC_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-gint     g_atomic_int_exchange_and_add         (volatile gint G_GNUC_MAY_ALIAS *atomic,
-						gint      	   val);
-void     g_atomic_int_add                      (volatile gint G_GNUC_MAY_ALIAS *atomic,
-						gint      	   val);
-gboolean g_atomic_int_compare_and_exchange     (volatile gint G_GNUC_MAY_ALIAS *atomic,
-						gint      	   oldval,
-						gint      	   newval);
-gboolean g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomic, 
-						gpointer  	   oldval, 
-						gpointer  	   newval);
-
-gint     g_atomic_int_get                      (volatile gint G_GNUC_MAY_ALIAS *atomic);
-void     g_atomic_int_set                      (volatile gint G_GNUC_MAY_ALIAS *atomic,
-						gint               newval);
-gpointer g_atomic_pointer_get                  (volatile gpointer G_GNUC_MAY_ALIAS *atomic);
-void     g_atomic_pointer_set                  (volatile gpointer G_GNUC_MAY_ALIAS *atomic,
-						gpointer           newval);
-
-#ifndef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
-# define g_atomic_int_get(atomic) 		((gint)*(atomic))
-# define g_atomic_int_set(atomic, newval) 	((void) (*(atomic) = (newval)))
-# define g_atomic_pointer_get(atomic) 		((gpointer)*(atomic))
-# define g_atomic_pointer_set(atomic, newval)	((void) (*(atomic) = (newval)))
-#else
-# define g_atomic_int_get(atomic) \
- ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gint) ? 1 : -1]), \
-  (g_atomic_int_get) ((volatile gint G_GNUC_MAY_ALIAS *) (volatile void *) (atomic)))
-# define g_atomic_int_set(atomic, newval) \
- ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gint) ? 1 : -1]), \
-  (g_atomic_int_set) ((volatile gint G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
-# define g_atomic_pointer_get(atomic) \
- ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
-  (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic)))
-# define g_atomic_pointer_set(atomic, newval) \
- ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
-  (g_atomic_pointer_set) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
-#endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
-
-/**
- * g_atomic_int_inc:
- * @atomic: a pointer to an integer.
- *
- * Atomically increments the integer pointed to by @atomic by 1.
- *
- * Since: 2.4
- */
-#define g_atomic_int_inc(atomic) (g_atomic_int_add ((atomic), 1))
-
-/**
- * g_atomic_int_dec_and_test:
- * @atomic: a pointer to an integer
- *
- * Atomically decrements the integer pointed to by @atomic by 1.
- *
- * Returns: %TRUE if the integer pointed to by @atomic is 0
- *     after decrementing it
- *
- * Since: 2.4
- */
-#define g_atomic_int_dec_and_test(atomic) \
-  (g_atomic_int_exchange_and_add ((atomic), -1) == 1)
-
-G_END_DECLS
-
-#endif /* __G_ATOMIC_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gbacktrace.h b/protocols/Sametime/src/glib/include/glib/gbacktrace.h
deleted file mode 100644
index 43a0c46a21..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gbacktrace.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_BACKTRACE_H__
-#define __G_BACKTRACE_H__
-
-#include <glib/gtypes.h>
-#include <signal.h>
-
-G_BEGIN_DECLS
-
-/* Fatal error handlers.
- * g_on_error_query() will prompt the user to either
- * [E]xit, [H]alt, [P]roceed or show [S]tack trace.
- * g_on_error_stack_trace() invokes gdb, which attaches to the current
- * process and shows a stack trace.
- * These function may cause different actions on non-unix platforms.
- * The prg_name arg is required by gdb to find the executable, if it is
- * passed as NULL, g_on_error_query() will try g_get_prgname().
- */
-void g_on_error_query (const gchar *prg_name);
-void g_on_error_stack_trace (const gchar *prg_name);
-
-/* Hacker macro to place breakpoints for selected machines.
- * Actual use is strongly discouraged of course ;)
- */
-#if (defined (__i386__) || defined (__x86_64__)) && defined (__GNUC__) && __GNUC__ >= 2
-#  define G_BREAKPOINT()        G_STMT_START{ __asm__ __volatile__ ("int $03"); }G_STMT_END
-#elif (defined (_MSC_VER) || defined (__DMC__)) && defined (_M_IX86)
-#  define G_BREAKPOINT()        G_STMT_START{ __asm int 3h }G_STMT_END
-#elif defined (_MSC_VER)
-#  define G_BREAKPOINT()        G_STMT_START{ __debugbreak(); }G_STMT_END
-#elif defined (__alpha__) && !defined(__osf__) && defined (__GNUC__) && __GNUC__ >= 2
-#  define G_BREAKPOINT()        G_STMT_START{ __asm__ __volatile__ ("bpt"); }G_STMT_END
-#else   /* !__i386__ && !__alpha__ */
-#  define G_BREAKPOINT()        G_STMT_START{ raise (SIGTRAP); }G_STMT_END
-#endif  /* __i386__ */
-
-G_END_DECLS
-
-#endif /* __G_BACKTRACE_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gbase64.h b/protocols/Sametime/src/glib/include/glib/gbase64.h
deleted file mode 100644
index 930389a674..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gbase64.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* gbase64.h - Base64 coding functions
- *
- *  Copyright (C) 2005  Alexander Larsson <alexl@redhat.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_BASE64_H__
-#define __G_BASE64_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-gsize   g_base64_encode_step    (const guchar *in,
-                                 gsize         len,
-                                 gboolean      break_lines,
-                                 gchar        *out,
-                                 gint         *state,
-                                 gint         *save);
-gsize   g_base64_encode_close   (gboolean      break_lines,
-                                 gchar        *out,
-                                 gint         *state,
-                                 gint         *save);
-gchar*  g_base64_encode         (const guchar *data,
-                                 gsize         len) G_GNUC_MALLOC;
-gsize   g_base64_decode_step    (const gchar  *in,
-                                 gsize         len,
-                                 guchar       *out,
-                                 gint         *state,
-                                 guint        *save);
-guchar *g_base64_decode         (const gchar  *text,
-                                 gsize        *out_len) G_GNUC_MALLOC;
-guchar *g_base64_decode_inplace (gchar        *text,
-                                 gsize        *out_len);
-
-
-G_END_DECLS
-
-#endif /* __G_BASE64_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gbitlock.h b/protocols/Sametime/src/glib/include/glib/gbitlock.h
deleted file mode 100644
index 5f6a67fd84..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gbitlock.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright © 2008 Ryan Lortie
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_BITLOCK_H__
-#define __G_BITLOCK_H__
-
-#include <glib/gtypes.h>
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-G_BEGIN_DECLS
-
-void      g_bit_lock                      (volatile gint *address,
-                                           gint           lock_bit);
-gboolean  g_bit_trylock                   (volatile gint *address,
-                                           gint           lock_bit);
-void      g_bit_unlock                    (volatile gint *address,
-                                           gint           lock_bit);
-
-G_END_DECLS
-
-#endif /* __G_BITLOCK_H_ */
diff --git a/protocols/Sametime/src/glib/include/glib/gbookmarkfile.h b/protocols/Sametime/src/glib/include/glib/gbookmarkfile.h
deleted file mode 100644
index f663ebf27f..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gbookmarkfile.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/* gbookmarkfile.h: parsing and building desktop bookmarks
- *
- * Copyright (C) 2005-2006 Emmanuele Bassi
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_BOOKMARK_FILE_H__
-#define __G_BOOKMARK_FILE_H__
-
-#include <glib/gerror.h>
-#include <time.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_BOOKMARK_FILE_ERROR:
- *
- * Error domain for bookmark file parsing.
- * Errors in this domain will be from the #GBookmarkFileError
- * enumeration. See #GError for information on error domains.
- */
-#define G_BOOKMARK_FILE_ERROR	(g_bookmark_file_error_quark ())
-
-
-/**
- * GBookmarkFileError:
- * @G_BOOKMARK_FILE_ERROR_INVALID_URI: URI was ill-formed
- * @G_BOOKMARK_FILE_ERROR_INVALID_VALUE: a requested field was not found
- * @G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED: a requested application did
- *     not register a bookmark
- * @G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND: a requested URI was not found
- * @G_BOOKMARK_FILE_ERROR_READ: document was ill formed
- * @G_BOOKMARK_FILE_ERROR_UNKNOWN_ENCODING: the text being parsed was
- *     in an unknown encoding
- * @G_BOOKMARK_FILE_ERROR_WRITE: an error occurred while writing
- * @G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND: requested file was not found
- *
- * Error codes returned by bookmark file parsing.
- */
-typedef enum
-{
-  G_BOOKMARK_FILE_ERROR_INVALID_URI,
-  G_BOOKMARK_FILE_ERROR_INVALID_VALUE,
-  G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED,
-  G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
-  G_BOOKMARK_FILE_ERROR_READ,
-  G_BOOKMARK_FILE_ERROR_UNKNOWN_ENCODING,
-  G_BOOKMARK_FILE_ERROR_WRITE,
-  G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND
-} GBookmarkFileError;
-
-GQuark g_bookmark_file_error_quark (void);
-
-/**
- * GBookmarkFile:
- *
- * The <structname>GBookmarkFile</structname> struct contains only
- * private data and should not be directly accessed.
- */
-typedef struct _GBookmarkFile GBookmarkFile;
-
-GBookmarkFile *g_bookmark_file_new                 (void);
-void           g_bookmark_file_free                (GBookmarkFile  *bookmark);
-
-gboolean       g_bookmark_file_load_from_file      (GBookmarkFile  *bookmark,
-						    const gchar    *filename,
-						    GError        **error);
-gboolean       g_bookmark_file_load_from_data      (GBookmarkFile  *bookmark,
-						    const gchar    *data,
-						    gsize           length,
-						    GError        **error);
-gboolean       g_bookmark_file_load_from_data_dirs (GBookmarkFile  *bookmark,
-						    const gchar    *file,
-						    gchar         **full_path,
-						    GError        **error);
-gchar *        g_bookmark_file_to_data             (GBookmarkFile  *bookmark,
-						    gsize          *length,
-						    GError        **error) G_GNUC_MALLOC;
-gboolean       g_bookmark_file_to_file             (GBookmarkFile  *bookmark,
-						    const gchar    *filename,
-						    GError        **error);
-
-void           g_bookmark_file_set_title           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *title);
-gchar *        g_bookmark_file_get_title           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error) G_GNUC_MALLOC;
-void           g_bookmark_file_set_description     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *description);
-gchar *        g_bookmark_file_get_description     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error) G_GNUC_MALLOC;
-void           g_bookmark_file_set_mime_type       (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *mime_type);
-gchar *        g_bookmark_file_get_mime_type       (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error) G_GNUC_MALLOC;
-void           g_bookmark_file_set_groups          (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar   **groups,
-						    gsize           length);
-void           g_bookmark_file_add_group           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *group);
-gboolean       g_bookmark_file_has_group           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *group,
-						    GError        **error);
-gchar **       g_bookmark_file_get_groups          (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gsize          *length,
-						    GError        **error) G_GNUC_MALLOC;
-void           g_bookmark_file_add_application     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    const gchar    *exec);
-gboolean       g_bookmark_file_has_application     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    GError        **error);
-gchar **       g_bookmark_file_get_applications    (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gsize          *length,
-						    GError        **error) G_GNUC_MALLOC;
-gboolean       g_bookmark_file_set_app_info        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    const gchar    *exec,
-						    gint            count,
-						    time_t          stamp,
-						    GError        **error);
-gboolean       g_bookmark_file_get_app_info        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    gchar         **exec,
-						    guint          *count,
-						    time_t         *stamp,
-						    GError        **error);
-void           g_bookmark_file_set_is_private      (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gboolean        is_private);
-gboolean       g_bookmark_file_get_is_private      (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-void           g_bookmark_file_set_icon            (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *href,
-						    const gchar    *mime_type);
-gboolean       g_bookmark_file_get_icon            (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gchar         **href,
-						    gchar         **mime_type,
-						    GError        **error);
-void           g_bookmark_file_set_added           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    time_t          added);
-time_t         g_bookmark_file_get_added           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-void           g_bookmark_file_set_modified        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    time_t          modified);
-time_t         g_bookmark_file_get_modified        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-void           g_bookmark_file_set_visited         (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    time_t          visited);
-time_t         g_bookmark_file_get_visited         (GBookmarkFile  *bookmark,
-						    const gchar    *uri, 
-						    GError        **error);
-gboolean       g_bookmark_file_has_item            (GBookmarkFile  *bookmark,
-						    const gchar    *uri);
-gint           g_bookmark_file_get_size            (GBookmarkFile  *bookmark);
-gchar **       g_bookmark_file_get_uris            (GBookmarkFile  *bookmark,
-						    gsize          *length) G_GNUC_MALLOC;
-gboolean       g_bookmark_file_remove_group        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *group,
-						    GError        **error);
-gboolean       g_bookmark_file_remove_application  (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    GError        **error);
-gboolean       g_bookmark_file_remove_item         (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-gboolean       g_bookmark_file_move_item           (GBookmarkFile  *bookmark,
-						    const gchar    *old_uri,
-						    const gchar    *new_uri,
-						    GError        **error);
-
-G_END_DECLS
-
-#endif /* __G_BOOKMARK_FILE_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gcache.h b/protocols/Sametime/src/glib/include/glib/gcache.h
deleted file mode 100644
index 7d60d5888c..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gcache.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_CACHE_H__
-#define __G_CACHE_H__
-
-#include <glib/glist.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GCache          GCache;
-
-typedef gpointer        (*GCacheNewFunc)        (gpointer       key);
-typedef gpointer        (*GCacheDupFunc)        (gpointer       value);
-typedef void            (*GCacheDestroyFunc)    (gpointer       value);
-
-/* Caches
- */
-GCache*  g_cache_new           (GCacheNewFunc      value_new_func,
-                                GCacheDestroyFunc  value_destroy_func,
-                                GCacheDupFunc      key_dup_func,
-                                GCacheDestroyFunc  key_destroy_func,
-                                GHashFunc          hash_key_func,
-                                GHashFunc          hash_value_func,
-                                GEqualFunc         key_equal_func);
-void     g_cache_destroy       (GCache            *cache);
-gpointer g_cache_insert        (GCache            *cache,
-                                gpointer           key);
-void     g_cache_remove        (GCache            *cache,
-                                gconstpointer      value);
-void     g_cache_key_foreach   (GCache            *cache,
-                                GHFunc             func,
-                                gpointer           user_data);
-#ifndef G_DISABLE_DEPRECATED
-void     g_cache_value_foreach (GCache            *cache,
-                                GHFunc             func,
-                                gpointer           user_data);
-#endif
-
-G_END_DECLS
-
-#endif /* __G_CACHE_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gchecksum.h b/protocols/Sametime/src/glib/include/glib/gchecksum.h
deleted file mode 100644
index 57aea103f7..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gchecksum.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* gchecksum.h - data hashing functions
- *
- * Copyright (C) 2007  Emmanuele Bassi  <ebassi@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_CHECKSUM_H__
-#define __G_CHECKSUM_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GChecksumType:
- * @G_CHECKSUM_MD5: Use the MD5 hashing algorithm
- * @G_CHECKSUM_SHA1: Use the SHA-1 hashing algorithm
- * @G_CHECKSUM_SHA256: Use the SHA-256 hashing algorithm
- *
- * The hashing algorithm to be used by #GChecksum when performing the
- * digest of some data.
- *
- * Note that the #GChecksumType enumeration may be extended at a later
- * date to include new hashing algorithm types.
- *
- * Since: 2.16
- */
-typedef enum {
-  G_CHECKSUM_MD5,
-  G_CHECKSUM_SHA1,
-  G_CHECKSUM_SHA256
-} GChecksumType;
-
-/**
- * GChecksum:
- *
- * An opaque structure representing a checksumming operation.
- * To create a new GChecksum, use g_checksum_new(). To free
- * a GChecksum, use g_checksum_free().
- *
- * Since: 2.16
- */
-typedef struct _GChecksum       GChecksum;
-
-gssize                g_checksum_type_get_length    (GChecksumType    checksum_type);
-
-GChecksum *           g_checksum_new                (GChecksumType    checksum_type);
-void                  g_checksum_reset              (GChecksum       *checksum);
-GChecksum *           g_checksum_copy               (const GChecksum *checksum);
-void                  g_checksum_free               (GChecksum       *checksum);
-void                  g_checksum_update             (GChecksum       *checksum,
-                                                     const guchar    *data,
-                                                     gssize           length);
-G_CONST_RETURN gchar *g_checksum_get_string         (GChecksum       *checksum);
-void                  g_checksum_get_digest         (GChecksum       *checksum,
-                                                     guint8          *buffer,
-                                                     gsize           *digest_len);
-
-gchar                *g_compute_checksum_for_data   (GChecksumType    checksum_type,
-                                                     const guchar    *data,
-                                                     gsize            length);
-gchar                *g_compute_checksum_for_string (GChecksumType    checksum_type,
-                                                     const gchar     *str,
-                                                     gssize           length);
-
-G_END_DECLS
-
-#endif /* __G_CHECKSUM_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gcompletion.h b/protocols/Sametime/src/glib/include/glib/gcompletion.h
deleted file mode 100644
index 04c024fc5a..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gcompletion.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_COMPLETION_H__
-#define __G_COMPLETION_H__
-
-#include <glib/glist.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GCompletion     GCompletion;
-
-typedef gchar*          (*GCompletionFunc)      (gpointer);
-
-/* GCompletion
- */
-
-typedef gint (*GCompletionStrncmpFunc) (const gchar *s1,
-					const gchar *s2,
-					gsize        n);
-
-struct _GCompletion
-{
-  GList* items;
-  GCompletionFunc func;
- 
-  gchar* prefix;
-  GList* cache;
-  GCompletionStrncmpFunc strncmp_func;
-};
-
-#ifndef G_DISABLE_DEPRECATED
-
-GCompletion* g_completion_new           (GCompletionFunc func);
-void         g_completion_add_items     (GCompletion*    cmp,
-                                         GList*          items);
-void         g_completion_remove_items  (GCompletion*    cmp,
-                                         GList*          items);
-void         g_completion_clear_items   (GCompletion*    cmp);
-GList*       g_completion_complete      (GCompletion*    cmp,
-                                         const gchar*    prefix,
-                                         gchar**         new_prefix);
-GList*       g_completion_complete_utf8 (GCompletion  *cmp,
-                                         const gchar*    prefix,
-                                         gchar**         new_prefix);
-void         g_completion_set_compare   (GCompletion *cmp,
-				         GCompletionStrncmpFunc strncmp_func);
-void         g_completion_free          (GCompletion*    cmp);
-
-#endif
-
-G_END_DECLS
-
-#endif /* __G_COMPLETION_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gconvert.h b/protocols/Sametime/src/glib/include/glib/gconvert.h
deleted file mode 100644
index e4c20d77d5..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gconvert.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_CONVERT_H__
-#define __G_CONVERT_H__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-/**
- * GConvertError:
- * @G_CONVERT_ERROR_NO_CONVERSION: Conversion between the requested character
- *     sets is not supported.
- * @G_CONVERT_ERROR_ILLEGAL_SEQUENCE: Invalid byte sequence in conversion input.
- * @G_CONVERT_ERROR_FAILED: Conversion failed for some reason.
- * @G_CONVERT_ERROR_PARTIAL_INPUT: Partial character sequence at end of input.
- * @G_CONVERT_ERROR_BAD_URI: URI is invalid.
- * @G_CONVERT_ERROR_NOT_ABSOLUTE_PATH: Pathname is not an absolute path.
- *
- * Error codes returned by character set conversion routines.
- */
-typedef enum
-{
-  G_CONVERT_ERROR_NO_CONVERSION,
-  G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
-  G_CONVERT_ERROR_FAILED,
-  G_CONVERT_ERROR_PARTIAL_INPUT,
-  G_CONVERT_ERROR_BAD_URI,
-  G_CONVERT_ERROR_NOT_ABSOLUTE_PATH
-} GConvertError;
-
-/**
- * G_CONVERT_ERROR:
- *
- * Error domain for character set conversions. Errors in this domain will
- * be from the #GConvertError enumeration. See #GError for information on
- * error domains.
- */
-#define G_CONVERT_ERROR g_convert_error_quark()
-GQuark g_convert_error_quark (void);
-
-/**
- * GIconv:
- *
- * The <structname>GIConv</structname> struct wraps an
- * iconv() conversion descriptor. It contains private data
- * and should only be accessed using the following functions.
- */
-typedef struct _GIConv *GIConv;
-
-GIConv g_iconv_open   (const gchar  *to_codeset,
-		       const gchar  *from_codeset);
-gsize  g_iconv        (GIConv        converter,
-		       gchar       **inbuf,
-		       gsize        *inbytes_left,
-		       gchar       **outbuf,
-		       gsize        *outbytes_left);
-gint   g_iconv_close  (GIConv        converter);
-
-
-gchar* g_convert               (const gchar  *str,
-				gssize        len,            
-				const gchar  *to_codeset,
-				const gchar  *from_codeset,
-				gsize        *bytes_read,     
-				gsize        *bytes_written,  
-				GError      **error) G_GNUC_MALLOC;
-gchar* g_convert_with_iconv    (const gchar  *str,
-				gssize        len,
-				GIConv        converter,
-				gsize        *bytes_read,     
-				gsize        *bytes_written,  
-				GError      **error) G_GNUC_MALLOC;
-gchar* g_convert_with_fallback (const gchar  *str,
-				gssize        len,            
-				const gchar  *to_codeset,
-				const gchar  *from_codeset,
-				const gchar  *fallback,
-				gsize        *bytes_read,     
-				gsize        *bytes_written,  
-				GError      **error) G_GNUC_MALLOC;
-
-
-/* Convert between libc's idea of strings and UTF-8.
- */
-gchar* g_locale_to_utf8   (const gchar  *opsysstring,
-			   gssize        len,            
-			   gsize        *bytes_read,     
-			   gsize        *bytes_written,  
-			   GError      **error) G_GNUC_MALLOC;
-gchar* g_locale_from_utf8 (const gchar  *utf8string,
-			   gssize        len,            
-			   gsize        *bytes_read,     
-			   gsize        *bytes_written,  
-			   GError      **error) G_GNUC_MALLOC;
-
-/* Convert between the operating system (or C runtime)
- * representation of file names and UTF-8.
- */
-#ifdef G_OS_WIN32
-#define g_filename_to_utf8 g_filename_to_utf8_utf8
-#define g_filename_from_utf8 g_filename_from_utf8_utf8
-#define g_filename_from_uri g_filename_from_uri_utf8
-#define g_filename_to_uri g_filename_to_uri_utf8 
-#endif
-
-gchar* g_filename_to_utf8   (const gchar  *opsysstring,
-			     gssize        len,            
-			     gsize        *bytes_read,     
-			     gsize        *bytes_written,  
-			     GError      **error) G_GNUC_MALLOC;
-gchar* g_filename_from_utf8 (const gchar  *utf8string,
-			     gssize        len,            
-			     gsize        *bytes_read,     
-			     gsize        *bytes_written,  
-			     GError      **error) G_GNUC_MALLOC;
-
-gchar *g_filename_from_uri (const gchar *uri,
-			    gchar      **hostname,
-			    GError     **error) G_GNUC_MALLOC;
-  
-gchar *g_filename_to_uri   (const gchar *filename,
-			    const gchar *hostname,
-			    GError     **error) G_GNUC_MALLOC;
-gchar *g_filename_display_name (const gchar *filename) G_GNUC_MALLOC;
-gboolean g_get_filename_charsets (G_CONST_RETURN gchar ***charsets);
-
-gchar *g_filename_display_basename (const gchar *filename) G_GNUC_MALLOC;
-
-gchar **g_uri_list_extract_uris (const gchar *uri_list) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __G_CONVERT_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gdataset.h b/protocols/Sametime/src/glib/include/glib/gdataset.h
deleted file mode 100644
index 2733ffb033..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gdataset.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_DATASET_H__
-#define __G_DATASET_H__
-
-#include <glib/gquark.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GData           GData;
-
-typedef void            (*GDataForeachFunc)     (GQuark         key_id,
-                                                 gpointer       data,
-                                                 gpointer       user_data);
-
-/* Keyed Data List
- */
-void     g_datalist_init                (GData            **datalist);
-void     g_datalist_clear               (GData            **datalist);
-gpointer g_datalist_id_get_data         (GData            **datalist,
-					 GQuark             key_id);
-void     g_datalist_id_set_data_full    (GData            **datalist,
-					 GQuark             key_id,
-					 gpointer           data,
-					 GDestroyNotify     destroy_func);
-gpointer g_datalist_id_remove_no_notify (GData            **datalist,
-					 GQuark             key_id);
-void     g_datalist_foreach             (GData            **datalist,
-					 GDataForeachFunc   func,
-					 gpointer           user_data);
-
-/**
- * G_DATALIST_FLAGS_MASK:
- *
- * A bitmask that restricts the possible flags passed to
- * g_datalist_set_flags(). Passing a flags value where
- * flags & ~G_DATALIST_FLAGS_MASK != 0 is an error.
- */
-#define G_DATALIST_FLAGS_MASK 0x3
-
-void     g_datalist_set_flags           (GData            **datalist,
-					 guint              flags);
-void     g_datalist_unset_flags         (GData            **datalist,
-					 guint              flags);
-guint    g_datalist_get_flags           (GData            **datalist);
-
-#define   g_datalist_id_set_data(dl, q, d)      \
-     g_datalist_id_set_data_full ((dl), (q), (d), NULL)
-#define   g_datalist_id_remove_data(dl, q)      \
-     g_datalist_id_set_data ((dl), (q), NULL)
-#define   g_datalist_get_data(dl, k)            \
-     (g_datalist_id_get_data ((dl), g_quark_try_string (k)))
-#define   g_datalist_set_data_full(dl, k, d, f) \
-     g_datalist_id_set_data_full ((dl), g_quark_from_string (k), (d), (f))
-#define   g_datalist_remove_no_notify(dl, k)    \
-     g_datalist_id_remove_no_notify ((dl), g_quark_try_string (k))
-#define   g_datalist_set_data(dl, k, d)         \
-     g_datalist_set_data_full ((dl), (k), (d), NULL)
-#define   g_datalist_remove_data(dl, k)         \
-     g_datalist_id_set_data ((dl), g_quark_try_string (k), NULL)
-
-
-/* Location Associated Keyed Data
- */
-void      g_dataset_destroy             (gconstpointer    dataset_location);
-gpointer  g_dataset_id_get_data         (gconstpointer    dataset_location,
-                                         GQuark           key_id);
-void      g_dataset_id_set_data_full    (gconstpointer    dataset_location,
-                                         GQuark           key_id,
-                                         gpointer         data,
-                                         GDestroyNotify   destroy_func);
-gpointer  g_dataset_id_remove_no_notify (gconstpointer    dataset_location,
-                                         GQuark           key_id);
-void      g_dataset_foreach             (gconstpointer    dataset_location,
-                                         GDataForeachFunc func,
-                                         gpointer         user_data);
-#define   g_dataset_id_set_data(l, k, d)        \
-     g_dataset_id_set_data_full ((l), (k), (d), NULL)
-#define   g_dataset_id_remove_data(l, k)        \
-     g_dataset_id_set_data ((l), (k), NULL)
-#define   g_dataset_get_data(l, k)              \
-     (g_dataset_id_get_data ((l), g_quark_try_string (k)))
-#define   g_dataset_set_data_full(l, k, d, f)   \
-     g_dataset_id_set_data_full ((l), g_quark_from_string (k), (d), (f))
-#define   g_dataset_remove_no_notify(l, k)      \
-     g_dataset_id_remove_no_notify ((l), g_quark_try_string (k))
-#define   g_dataset_set_data(l, k, d)           \
-     g_dataset_set_data_full ((l), (k), (d), NULL)
-#define   g_dataset_remove_data(l, k)           \
-     g_dataset_id_set_data ((l), g_quark_try_string (k), NULL)
-
-G_END_DECLS
-
-#endif /* __G_DATASET_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gdate.h b/protocols/Sametime/src/glib/include/glib/gdate.h
deleted file mode 100644
index cb1f566155..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gdate.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_DATE_H__
-#define __G_DATE_H__
-
-#include <time.h>
-
-#include <glib/gtypes.h>
-#include <glib/gquark.h>
-
-G_BEGIN_DECLS
-
-/* GDate
- *
- * Date calculations (not time for now, to be resolved). These are a
- * mutant combination of Steffen Beyer's DateCalc routines
- * (http://www.perl.com/CPAN/authors/id/STBEY/) and Jon Trowbridge's
- * date routines (written for in-house software).  Written by Havoc
- * Pennington <hp@pobox.com>
- */
-
-typedef gint32  GTime;
-typedef guint16 GDateYear;
-typedef guint8  GDateDay;   /* day of the month */
-typedef struct _GDate GDate;
-
-/* enum used to specify order of appearance in parsed date strings */
-typedef enum
-{
-  G_DATE_DAY   = 0,
-  G_DATE_MONTH = 1,
-  G_DATE_YEAR  = 2
-} GDateDMY;
-
-/* actual week and month values */
-typedef enum
-{
-  G_DATE_BAD_WEEKDAY  = 0,
-  G_DATE_MONDAY       = 1,
-  G_DATE_TUESDAY      = 2,
-  G_DATE_WEDNESDAY    = 3,
-  G_DATE_THURSDAY     = 4,
-  G_DATE_FRIDAY       = 5,
-  G_DATE_SATURDAY     = 6,
-  G_DATE_SUNDAY       = 7
-} GDateWeekday;
-typedef enum
-{
-  G_DATE_BAD_MONTH = 0,
-  G_DATE_JANUARY   = 1,
-  G_DATE_FEBRUARY  = 2,
-  G_DATE_MARCH     = 3,
-  G_DATE_APRIL     = 4,
-  G_DATE_MAY       = 5,
-  G_DATE_JUNE      = 6,
-  G_DATE_JULY      = 7,
-  G_DATE_AUGUST    = 8,
-  G_DATE_SEPTEMBER = 9,
-  G_DATE_OCTOBER   = 10,
-  G_DATE_NOVEMBER  = 11,
-  G_DATE_DECEMBER  = 12
-} GDateMonth;
-
-#define G_DATE_BAD_JULIAN 0U
-#define G_DATE_BAD_DAY    0U
-#define G_DATE_BAD_YEAR   0U
-
-/* Note: directly manipulating structs is generally a bad idea, but
- * in this case it's an *incredibly* bad idea, because all or part
- * of this struct can be invalid at any given time. Use the functions,
- * or you will get hosed, I promise.
- */
-struct _GDate
-{
-  guint julian_days : 32; /* julian days representation - we use a
-                           *  bitfield hoping that 64 bit platforms
-                           *  will pack this whole struct in one big
-                           *  int
-                           */
-
-  guint julian : 1;    /* julian is valid */
-  guint dmy    : 1;    /* dmy is valid */
-
-  /* DMY representation */
-  guint day    : 6;
-  guint month  : 4;
-  guint year   : 16;
-};
-
-/* g_date_new() returns an invalid date, you then have to _set() stuff
- * to get a usable object. You can also allocate a GDate statically,
- * then call g_date_clear() to initialize.
- */
-GDate*       g_date_new                   (void);
-GDate*       g_date_new_dmy               (GDateDay     day,
-                                           GDateMonth   month,
-                                           GDateYear    year);
-GDate*       g_date_new_julian            (guint32      julian_day);
-void         g_date_free                  (GDate       *date);
-
-/* check g_date_valid() after doing an operation that might fail, like
- * _parse.  Almost all g_date operations are undefined on invalid
- * dates (the exceptions are the mutators, since you need those to
- * return to validity).
- */
-gboolean     g_date_valid                 (const GDate *date);
-gboolean     g_date_valid_day             (GDateDay     day) G_GNUC_CONST;
-gboolean     g_date_valid_month           (GDateMonth month) G_GNUC_CONST;
-gboolean     g_date_valid_year            (GDateYear  year) G_GNUC_CONST;
-gboolean     g_date_valid_weekday         (GDateWeekday weekday) G_GNUC_CONST;
-gboolean     g_date_valid_julian          (guint32 julian_date) G_GNUC_CONST;
-gboolean     g_date_valid_dmy             (GDateDay     day,
-                                           GDateMonth   month,
-                                           GDateYear    year) G_GNUC_CONST;
-
-GDateWeekday g_date_get_weekday           (const GDate *date);
-GDateMonth   g_date_get_month             (const GDate *date);
-GDateYear    g_date_get_year              (const GDate *date);
-GDateDay     g_date_get_day               (const GDate *date);
-guint32      g_date_get_julian            (const GDate *date);
-guint        g_date_get_day_of_year       (const GDate *date);
-/* First monday/sunday is the start of week 1; if we haven't reached
- * that day, return 0. These are not ISO weeks of the year; that
- * routine needs to be added.
- * these functions return the number of weeks, starting on the
- * corrsponding day
- */
-guint        g_date_get_monday_week_of_year (const GDate *date);
-guint        g_date_get_sunday_week_of_year (const GDate *date);
-guint        g_date_get_iso8601_week_of_year (const GDate *date);
-
-/* If you create a static date struct you need to clear it to get it
- * in a sane state before use. You can clear a whole array at
- * once with the ndates argument.
- */
-void         g_date_clear                 (GDate       *date,
-                                           guint        n_dates);
-
-/* The parse routine is meant for dates typed in by a user, so it
- * permits many formats but tries to catch common typos. If your data
- * needs to be strictly validated, it is not an appropriate function.
- */
-void         g_date_set_parse             (GDate       *date,
-                                           const gchar *str);
-void         g_date_set_time_t            (GDate       *date,
-					   time_t       timet);
-void         g_date_set_time_val          (GDate       *date,
-					   GTimeVal    *timeval);
-#ifndef G_DISABLE_DEPRECATED
-void         g_date_set_time              (GDate       *date,
-                                           GTime        time_);
-#endif
-void         g_date_set_month             (GDate       *date,
-                                           GDateMonth   month);
-void         g_date_set_day               (GDate       *date,
-                                           GDateDay     day);
-void         g_date_set_year              (GDate       *date,
-                                           GDateYear    year);
-void         g_date_set_dmy               (GDate       *date,
-                                           GDateDay     day,
-                                           GDateMonth   month,
-                                           GDateYear    y);
-void         g_date_set_julian            (GDate       *date,
-                                           guint32      julian_date);
-gboolean     g_date_is_first_of_month     (const GDate *date);
-gboolean     g_date_is_last_of_month      (const GDate *date);
-
-/* To go forward by some number of weeks just go forward weeks*7 days */
-void         g_date_add_days              (GDate       *date,
-                                           guint        n_days);
-void         g_date_subtract_days         (GDate       *date,
-                                           guint        n_days);
-
-/* If you add/sub months while day > 28, the day might change */
-void         g_date_add_months            (GDate       *date,
-                                           guint        n_months);
-void         g_date_subtract_months       (GDate       *date,
-                                           guint        n_months);
-
-/* If it's feb 29, changing years can move you to the 28th */
-void         g_date_add_years             (GDate       *date,
-                                           guint        n_years);
-void         g_date_subtract_years        (GDate       *date,
-                                           guint        n_years);
-gboolean     g_date_is_leap_year          (GDateYear    year) G_GNUC_CONST;
-guint8       g_date_get_days_in_month     (GDateMonth   month,
-                                           GDateYear    year) G_GNUC_CONST;
-guint8       g_date_get_monday_weeks_in_year  (GDateYear    year) G_GNUC_CONST;
-guint8       g_date_get_sunday_weeks_in_year  (GDateYear    year) G_GNUC_CONST;
-
-/* Returns the number of days between the two dates.  If date2 comes
-   before date1, a negative value is return. */
-gint         g_date_days_between          (const GDate *date1,
-					   const GDate *date2);
-
-/* qsort-friendly (with a cast...) */
-gint         g_date_compare               (const GDate *lhs,
-                                           const GDate *rhs);
-void         g_date_to_struct_tm          (const GDate *date,
-                                           struct tm   *tm);
-
-void         g_date_clamp                 (GDate *date,
-					   const GDate *min_date,
-					   const GDate *max_date);
-
-/* Swap date1 and date2's values if date1 > date2. */
-void         g_date_order                 (GDate *date1, GDate *date2);
-
-/* Just like strftime() except you can only use date-related formats.
- *   Using a time format is undefined.
- */
-gsize        g_date_strftime              (gchar       *s,
-                                           gsize        slen,
-                                           const gchar *format,
-                                           const GDate *date);
-
-#ifndef G_DISABLE_DEPRECATED
-
-#define g_date_weekday 			g_date_get_weekday
-#define g_date_month 			g_date_get_month
-#define g_date_year 			g_date_get_year
-#define g_date_day 			g_date_get_day
-#define g_date_julian 			g_date_get_julian
-#define g_date_day_of_year 		g_date_get_day_of_year
-#define g_date_monday_week_of_year 	g_date_get_monday_week_of_year
-#define g_date_sunday_week_of_year 	g_date_get_sunday_week_of_year
-#define g_date_days_in_month 		g_date_get_days_in_month
-#define g_date_monday_weeks_in_year 	g_date_get_monday_weeks_in_year
-#define g_date_sunday_weeks_in_year	g_date_get_sunday_weeks_in_year
-
-#endif /* G_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __G_DATE_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gdatetime.h b/protocols/Sametime/src/glib/include/glib/gdatetime.h
deleted file mode 100644
index b76df89c7e..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gdatetime.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (C) 2009-2010 Christian Hergert <chris@dronelabs.com>
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * licence, or (at your option) any later version.
- *
- * This is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
- * USA.
- *
- * Authors: Christian Hergert <chris@dronelabs.com>
- *          Thiago Santos <thiago.sousa.santos@collabora.co.uk>
- *          Emmanuele Bassi <ebassi@linux.intel.com>
- *          Ryan Lortie <desrt@desrt.ca>
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_DATE_TIME_H__
-#define __G_DATE_TIME_H__
-
-#include <glib/gtimezone.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_TIME_SPAN_DAY:
- *
- * Evaluates to a time span of one day.
- *
- * Since: 2.26
- */
-#define G_TIME_SPAN_DAY                 (G_GINT64_CONSTANT (86400000000))
-
-/**
- * G_TIME_SPAN_HOUR:
- *
- * Evaluates to a time span of one hour.
- *
- * Since: 2.26
- */
-#define G_TIME_SPAN_HOUR                (G_GINT64_CONSTANT (3600000000))
-
-/**
- * G_TIME_SPAN_MINUTE:
- *
- * Evaluates to a time span of one minute.
- *
- * Since: 2.26
- */
-#define G_TIME_SPAN_MINUTE              (G_GINT64_CONSTANT (60000000))
-
-/**
- * G_TIME_SPAN_SECOND:
- *
- * Evaluates to a time span of one second.
- *
- * Since: 2.26
- */
-#define G_TIME_SPAN_SECOND              (G_GINT64_CONSTANT (1000000))
-
-/**
- * G_TIME_SPAN_MILLISECOND:
- *
- * Evaluates to a time span of one millisecond.
- *
- * Since: 2.26
- */
-#define G_TIME_SPAN_MILLISECOND         (G_GINT64_CONSTANT (1000))
-
-/**
- * GTimeSpan:
- *
- * A value representing an interval of time, in microseconds.
- *
- * Since: 2.26
- */
-typedef gint64 GTimeSpan;
-
-/**
- * GDateTime:
- *
- * <structname>GDateTime</structname> is an opaque structure whose members
- * cannot be accessed directly.
- *
- * Since: 2.26
- */
-typedef struct _GDateTime GDateTime;
-
-void                    g_date_time_unref                               (GDateTime      *datetime);
-GDateTime *             g_date_time_ref                                 (GDateTime      *datetime);
-
-GDateTime *             g_date_time_new_now                             (GTimeZone      *tz);
-GDateTime *             g_date_time_new_now_local                       (void);
-GDateTime *             g_date_time_new_now_utc                         (void);
-
-GDateTime *             g_date_time_new_from_unix_local                 (gint64          t);
-GDateTime *             g_date_time_new_from_unix_utc                   (gint64          t);
-
-GDateTime *             g_date_time_new_from_timeval_local              (const GTimeVal *tv);
-GDateTime *             g_date_time_new_from_timeval_utc                (const GTimeVal *tv);
-
-GDateTime *             g_date_time_new                                 (GTimeZone      *tz,
-                                                                         gint            year,
-                                                                         gint            month,
-                                                                         gint            day,
-                                                                         gint            hour,
-                                                                         gint            minute,
-                                                                         gdouble         seconds);
-GDateTime *             g_date_time_new_local                           (gint            year,
-                                                                         gint            month,
-                                                                         gint            day,
-                                                                         gint            hour,
-                                                                         gint            minute,
-                                                                         gdouble         seconds);
-GDateTime *             g_date_time_new_utc                             (gint            year,
-                                                                         gint            month,
-                                                                         gint            day,
-                                                                         gint            hour,
-                                                                         gint            minute,
-                                                                         gdouble         seconds);
-
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add                                 (GDateTime      *datetime,
-                                                                         GTimeSpan       timespan);
-
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_years                           (GDateTime      *datetime,
-                                                                         gint            years);
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_months                          (GDateTime      *datetime,
-                                                                         gint            months);
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_weeks                           (GDateTime      *datetime,
-                                                                         gint            weeks);
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_days                            (GDateTime      *datetime,
-                                                                         gint            days);
-
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_hours                           (GDateTime      *datetime,
-                                                                         gint            hours);
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_minutes                         (GDateTime      *datetime,
-                                                                         gint            minutes);
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_seconds                         (GDateTime      *datetime,
-                                                                         gdouble         seconds);
-
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_full                            (GDateTime      *datetime,
-                                                                         gint            years,
-                                                                         gint            months,
-                                                                         gint            days,
-                                                                         gint            hours,
-                                                                         gint            minutes,
-                                                                         gdouble         seconds);
-
-gint                    g_date_time_compare                             (gconstpointer   dt1,
-                                                                         gconstpointer   dt2);
-GTimeSpan               g_date_time_difference                          (GDateTime      *end,
-                                                                         GDateTime      *begin);
-guint                   g_date_time_hash                                (gconstpointer   datetime);
-gboolean                g_date_time_equal                               (gconstpointer   dt1,
-                                                                         gconstpointer   dt2);
-
-void                    g_date_time_get_ymd                             (GDateTime      *datetime,
-                                                                         gint           *year,
-                                                                         gint           *month,
-                                                                         gint           *day);
-
-gint                    g_date_time_get_year                            (GDateTime      *datetime);
-gint                    g_date_time_get_month                           (GDateTime      *datetime);
-gint                    g_date_time_get_day_of_month                    (GDateTime      *datetime);
-
-gint                    g_date_time_get_week_numbering_year             (GDateTime      *datetime);
-gint                    g_date_time_get_week_of_year                    (GDateTime      *datetime);
-gint                    g_date_time_get_day_of_week                     (GDateTime      *datetime);
-
-gint                    g_date_time_get_day_of_year                     (GDateTime      *datetime);
-
-gint                    g_date_time_get_hour                            (GDateTime      *datetime);
-gint                    g_date_time_get_minute                          (GDateTime      *datetime);
-gint                    g_date_time_get_second                          (GDateTime      *datetime);
-gint                    g_date_time_get_microsecond                     (GDateTime      *datetime);
-gdouble                 g_date_time_get_seconds                         (GDateTime      *datetime);
-
-gint64                  g_date_time_to_unix                             (GDateTime      *datetime);
-gboolean                g_date_time_to_timeval                          (GDateTime      *datetime,
-                                                                         GTimeVal       *tv);
-
-GTimeSpan               g_date_time_get_utc_offset                      (GDateTime      *datetime);
-const gchar *           g_date_time_get_timezone_abbreviation           (GDateTime      *datetime);
-gboolean                g_date_time_is_daylight_savings                 (GDateTime      *datetime);
-
-GDateTime *             g_date_time_to_timezone                         (GDateTime      *datetime,
-                                                                         GTimeZone      *tz);
-GDateTime *             g_date_time_to_local                            (GDateTime      *datetime);
-GDateTime *             g_date_time_to_utc                              (GDateTime      *datetime);
-
-gchar *                 g_date_time_format                              (GDateTime      *datetime,
-                                                                         const gchar    *format) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __G_DATE_TIME_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gdir.h b/protocols/Sametime/src/glib/include/glib/gdir.h
deleted file mode 100644
index 85e989695a..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gdir.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * gdir.c: Simplified wrapper around the DIRENT functions.
- *
- * Copyright 2001 Hans Breuer
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_DIR_H__
-#define __G_DIR_H__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GDir GDir;
-
-#ifdef G_OS_WIN32
-/* For DLL ABI stability, keep old names for old (non-UTF-8) functionality. */
-#define g_dir_open g_dir_open_utf8
-#define g_dir_read_name g_dir_read_name_utf8
-#endif
-
-GDir    *                g_dir_open           (const gchar  *path,
-					       guint         flags,
-					       GError      **error);
-G_CONST_RETURN gchar    *g_dir_read_name      (GDir         *dir);
-void                     g_dir_rewind         (GDir         *dir);
-void                     g_dir_close          (GDir         *dir);
-
-G_END_DECLS
-
-#endif /* __G_DIR_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gerror.h b/protocols/Sametime/src/glib/include/glib/gerror.h
deleted file mode 100644
index b303487782..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gerror.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* gerror.h - Error reporting system
- *
- *  Copyright 2000 Red Hat, Inc.
- *
- * The Gnome Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The Gnome Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_ERROR_H__
-#define __G_ERROR_H__
-
-#include <stdarg.h>
-
-#include <glib/gquark.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GError GError;
-
-struct _GError
-{
-  GQuark       domain;
-  gint         code;
-  gchar       *message;
-};
-
-GError*  g_error_new           (GQuark         domain,
-                                gint           code,
-                                const gchar   *format,
-                                ...) G_GNUC_PRINTF (3, 4);
-
-GError*  g_error_new_literal   (GQuark         domain,
-                                gint           code,
-                                const gchar   *message);
-GError*  g_error_new_valist    (GQuark         domain,
-                                gint           code,
-                                const gchar   *format,
-                                va_list        args);
-
-void     g_error_free          (GError        *error);
-GError*  g_error_copy          (const GError  *error);
-
-gboolean g_error_matches       (const GError  *error,
-                                GQuark         domain,
-                                gint           code);
-
-/* if (err) *err = g_error_new(domain, code, format, ...), also has
- * some sanity checks.
- */
-void     g_set_error           (GError       **err,
-                                GQuark         domain,
-                                gint           code,
-                                const gchar   *format,
-                                ...) G_GNUC_PRINTF (4, 5);
-
-void     g_set_error_literal   (GError       **err,
-                                GQuark         domain,
-                                gint           code,
-                                const gchar   *message);
-
-/* if (dest) *dest = src; also has some sanity checks.
- */
-void     g_propagate_error     (GError       **dest,
-				GError        *src);
-
-/* if (err && *err) { g_error_free(*err); *err = NULL; } */
-void     g_clear_error         (GError       **err);
-
-/* if (err) prefix the formatted string to the ->message */
-void     g_prefix_error               (GError       **err,
-                                       const gchar   *format,
-                                       ...) G_GNUC_PRINTF (2, 3);
-
-/* g_propagate_error then g_error_prefix on dest */
-void     g_propagate_prefixed_error   (GError       **dest,
-                                       GError        *src,
-                                       const gchar   *format,
-                                       ...) G_GNUC_PRINTF (3, 4);
-
-G_END_DECLS
-
-#endif /* __G_ERROR_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gfileutils.h b/protocols/Sametime/src/glib/include/glib/gfileutils.h
deleted file mode 100644
index d8f9d3bea1..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gfileutils.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* gfileutils.h - File utility functions
- *
- *  Copyright 2000 Red Hat, Inc.
- *
- * GLib is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_FILEUTILS_H__
-#define __G_FILEUTILS_H__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-#define G_FILE_ERROR g_file_error_quark ()
-
-typedef enum
-{
-  G_FILE_ERROR_EXIST,
-  G_FILE_ERROR_ISDIR,
-  G_FILE_ERROR_ACCES,
-  G_FILE_ERROR_NAMETOOLONG,
-  G_FILE_ERROR_NOENT,
-  G_FILE_ERROR_NOTDIR,
-  G_FILE_ERROR_NXIO,
-  G_FILE_ERROR_NODEV,
-  G_FILE_ERROR_ROFS,
-  G_FILE_ERROR_TXTBSY,
-  G_FILE_ERROR_FAULT,
-  G_FILE_ERROR_LOOP,
-  G_FILE_ERROR_NOSPC,
-  G_FILE_ERROR_NOMEM,
-  G_FILE_ERROR_MFILE,
-  G_FILE_ERROR_NFILE,
-  G_FILE_ERROR_BADF,
-  G_FILE_ERROR_INVAL,
-  G_FILE_ERROR_PIPE,
-  G_FILE_ERROR_AGAIN,
-  G_FILE_ERROR_INTR,
-  G_FILE_ERROR_IO,
-  G_FILE_ERROR_PERM,
-  G_FILE_ERROR_NOSYS,
-  G_FILE_ERROR_FAILED
-} GFileError;
-
-/* For backward-compat reasons, these are synced to an old 
- * anonymous enum in libgnome. But don't use that enum
- * in new code.
- */
-typedef enum
-{
-  G_FILE_TEST_IS_REGULAR    = 1 << 0,
-  G_FILE_TEST_IS_SYMLINK    = 1 << 1,
-  G_FILE_TEST_IS_DIR        = 1 << 2,
-  G_FILE_TEST_IS_EXECUTABLE = 1 << 3,
-  G_FILE_TEST_EXISTS        = 1 << 4
-} GFileTest;
-
-GQuark     g_file_error_quark      (void);
-/* So other code can generate a GFileError */
-GFileError g_file_error_from_errno (gint err_no);
-
-#ifdef G_OS_WIN32
-#define g_file_test g_file_test_utf8
-#define g_file_get_contents g_file_get_contents_utf8
-#define g_mkstemp g_mkstemp_utf8
-#define g_file_open_tmp g_file_open_tmp_utf8
-#endif
-
-gboolean g_file_test         (const gchar  *filename,
-                              GFileTest     test);
-gboolean g_file_get_contents (const gchar  *filename,
-                              gchar       **contents,
-                              gsize        *length,    
-                              GError      **error);
-gboolean g_file_set_contents (const gchar *filename,
-			      const gchar *contents,
-			      gssize	     length,
-			      GError	   **error);
-gchar   *g_file_read_link    (const gchar  *filename,
-			      GError      **error);
-
-/* Wrapper / workalike for mkstemp() */
-gint    g_mkstemp            (gchar        *tmpl);
-gint    g_mkstemp_full       (gchar        *tmpl,
-                              int           flags,
-                              int           mode);
-
-/* Wrapper for g_mkstemp */
-gint    g_file_open_tmp      (const gchar  *tmpl,
-			      gchar       **name_used,
-			      GError      **error);
-
-char *g_format_size_for_display (goffset size);
-
-gchar *g_build_path     (const gchar *separator,
-			 const gchar *first_element,
-			 ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-gchar *g_build_pathv    (const gchar  *separator,
-			 gchar       **args) G_GNUC_MALLOC;
-
-gchar *g_build_filename (const gchar *first_element,
-			 ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-gchar *g_build_filenamev (gchar      **args) G_GNUC_MALLOC;
-
-int    g_mkdir_with_parents (const gchar *pathname,
-			     int          mode);
-
-G_END_DECLS
-
-#endif /* __G_FILEUTILS_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/ghash.h b/protocols/Sametime/src/glib/include/glib/ghash.h
deleted file mode 100644
index 9128721bcf..0000000000
--- a/protocols/Sametime/src/glib/include/glib/ghash.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_HASH_H__
-#define __G_HASH_H__
-
-#include <glib/gtypes.h>
-#include <glib/glist.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GHashTable  GHashTable;
-
-typedef gboolean  (*GHRFunc)  (gpointer  key,
-                               gpointer  value,
-                               gpointer  user_data);
-
-typedef struct _GHashTableIter GHashTableIter;
-
-struct _GHashTableIter
-{
-  /*< private >*/
-  gpointer	dummy1;
-  gpointer	dummy2;
-  gpointer	dummy3;
-  int		dummy4;
-  gboolean	dummy5;
-  gpointer	dummy6;
-};
-
-/* Hash tables
- */
-GHashTable* g_hash_table_new		   (GHashFunc	    hash_func,
-					    GEqualFunc	    key_equal_func);
-GHashTable* g_hash_table_new_full      	   (GHashFunc	    hash_func,
-					    GEqualFunc	    key_equal_func,
-					    GDestroyNotify  key_destroy_func,
-					    GDestroyNotify  value_destroy_func);
-void	    g_hash_table_destroy	   (GHashTable	   *hash_table);
-void	    g_hash_table_insert		   (GHashTable	   *hash_table,
-					    gpointer	    key,
-					    gpointer	    value);
-void        g_hash_table_replace           (GHashTable     *hash_table,
-					    gpointer	    key,
-					    gpointer	    value);
-gboolean    g_hash_table_remove		   (GHashTable	   *hash_table,
-					    gconstpointer   key);
-void        g_hash_table_remove_all        (GHashTable     *hash_table);
-gboolean    g_hash_table_steal             (GHashTable     *hash_table,
-					    gconstpointer   key);
-void        g_hash_table_steal_all         (GHashTable     *hash_table);
-gpointer    g_hash_table_lookup		   (GHashTable	   *hash_table,
-					    gconstpointer   key);
-gboolean    g_hash_table_lookup_extended   (GHashTable	   *hash_table,
-					    gconstpointer   lookup_key,
-					    gpointer	   *orig_key,
-					    gpointer	   *value);
-void	    g_hash_table_foreach	   (GHashTable	   *hash_table,
-					    GHFunc	    func,
-					    gpointer	    user_data);
-gpointer    g_hash_table_find	           (GHashTable	   *hash_table,
-					    GHRFunc	    predicate,
-					    gpointer	    user_data);
-guint	    g_hash_table_foreach_remove	   (GHashTable	   *hash_table,
-					    GHRFunc	    func,
-					    gpointer	    user_data);
-guint	    g_hash_table_foreach_steal	   (GHashTable	   *hash_table,
-					    GHRFunc	    func,
-					    gpointer	    user_data);
-guint	    g_hash_table_size		   (GHashTable	   *hash_table);
-GList *     g_hash_table_get_keys          (GHashTable     *hash_table);
-GList *     g_hash_table_get_values        (GHashTable     *hash_table);
-
-void        g_hash_table_iter_init         (GHashTableIter *iter,
-					    GHashTable     *hash_table);
-gboolean    g_hash_table_iter_next         (GHashTableIter *iter,
-					    gpointer       *key,
-					    gpointer       *value);
-GHashTable* g_hash_table_iter_get_hash_table (GHashTableIter *iter);
-void        g_hash_table_iter_remove       (GHashTableIter *iter);
-void        g_hash_table_iter_steal        (GHashTableIter *iter);
-
-/* keeping hash tables alive */
-GHashTable* g_hash_table_ref   		   (GHashTable 	   *hash_table);
-void        g_hash_table_unref             (GHashTable     *hash_table);
-
-#ifndef G_DISABLE_DEPRECATED
-
-/**
- * g_hash_table_freeze:
- * @hash_table: a #GHashTable
- *
- * This function is deprecated and will be removed in the next major
- * release of GLib. It does nothing.
- **/
-#define g_hash_table_freeze(hash_table) ((void)0)
-
-/**
- * g_hash_table_thaw:
- * @hash_table: a #GHashTable
- *
- * This function is deprecated and will be removed in the next major
- * release of GLib. It does nothing.
- **/
-#define g_hash_table_thaw(hash_table) ((void)0)
-
-#endif /* G_DISABLE_DEPRECATED */
-
-/* Hash Functions
- */
-gboolean g_str_equal (gconstpointer  v1,
-                      gconstpointer  v2);
-guint    g_str_hash  (gconstpointer  v);
-
-gboolean g_int_equal (gconstpointer  v1,
-                      gconstpointer  v2);
-guint    g_int_hash  (gconstpointer  v);
-
-gboolean g_int64_equal (gconstpointer  v1,
-                        gconstpointer  v2);
-guint    g_int64_hash  (gconstpointer  v);
-
-gboolean g_double_equal (gconstpointer  v1,
-                         gconstpointer  v2);
-guint    g_double_hash  (gconstpointer  v);
-
-/* This "hash" function will just return the key's address as an
- * unsigned integer. Useful for hashing on plain addresses or
- * simple integer values.
- * Passing NULL into g_hash_table_new() as GHashFunc has the
- * same effect as passing g_direct_hash().
- */
-guint    g_direct_hash  (gconstpointer  v) G_GNUC_CONST;
-gboolean g_direct_equal (gconstpointer  v1,
-                         gconstpointer  v2) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __G_HASH_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/ghook.h b/protocols/Sametime/src/glib/include/glib/ghook.h
deleted file mode 100644
index 5577fc3e21..0000000000
--- a/protocols/Sametime/src/glib/include/glib/ghook.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_HOOK_H__
-#define __G_HOOK_H__
-
-#include <glib/gmem.h>
-
-G_BEGIN_DECLS
-
-
-/* --- typedefs --- */
-typedef struct _GHook		GHook;
-typedef struct _GHookList	GHookList;
-
-typedef gint		(*GHookCompareFunc)	(GHook		*new_hook,
-						 GHook		*sibling);
-typedef gboolean	(*GHookFindFunc)	(GHook		*hook,
-						 gpointer	 data);
-typedef void		(*GHookMarshaller)	(GHook		*hook,
-						 gpointer	 marshal_data);
-typedef gboolean	(*GHookCheckMarshaller)	(GHook		*hook,
-						 gpointer	 marshal_data);
-typedef void		(*GHookFunc)		(gpointer	 data);
-typedef gboolean	(*GHookCheckFunc)	(gpointer	 data);
-typedef void		(*GHookFinalizeFunc)	(GHookList      *hook_list,
-						 GHook          *hook);
-typedef enum
-{
-  G_HOOK_FLAG_ACTIVE	    = 1 << 0,
-  G_HOOK_FLAG_IN_CALL	    = 1 << 1,
-  G_HOOK_FLAG_MASK	    = 0x0f
-} GHookFlagMask;
-#define G_HOOK_FLAG_USER_SHIFT	(4)
-
-
-/* --- structures --- */
-struct _GHookList
-{
-  gulong	    seq_id;
-  guint		    hook_size : 16;
-  guint		    is_setup : 1;
-  GHook		   *hooks;
-  gpointer	    dummy3;
-  GHookFinalizeFunc finalize_hook;
-  gpointer	    dummy[2];
-};
-struct _GHook
-{
-  gpointer	 data;
-  GHook		*next;
-  GHook		*prev;
-  guint		 ref_count;
-  gulong	 hook_id;
-  guint		 flags;
-  gpointer	 func;
-  GDestroyNotify destroy;
-};
-
-
-/* --- macros --- */
-#define	G_HOOK(hook)			((GHook*) (hook))
-#define	G_HOOK_FLAGS(hook)		(G_HOOK (hook)->flags)
-#define	G_HOOK_ACTIVE(hook)		((G_HOOK_FLAGS (hook) & \
-					  G_HOOK_FLAG_ACTIVE) != 0)
-#define	G_HOOK_IN_CALL(hook)		((G_HOOK_FLAGS (hook) & \
-					  G_HOOK_FLAG_IN_CALL) != 0)
-#define G_HOOK_IS_VALID(hook)		(G_HOOK (hook)->hook_id != 0 && \
-					 (G_HOOK_FLAGS (hook) & \
-                                          G_HOOK_FLAG_ACTIVE))
-#define G_HOOK_IS_UNLINKED(hook)	(G_HOOK (hook)->next == NULL && \
-					 G_HOOK (hook)->prev == NULL && \
-					 G_HOOK (hook)->hook_id == 0 && \
-					 G_HOOK (hook)->ref_count == 0)
-
-
-/* --- prototypes --- */
-/* callback maintenance functions */
-void	 g_hook_list_init		(GHookList		*hook_list,
-					 guint			 hook_size);
-void	 g_hook_list_clear		(GHookList		*hook_list);
-GHook*	 g_hook_alloc			(GHookList		*hook_list);
-void	 g_hook_free			(GHookList		*hook_list,
-					 GHook			*hook);
-GHook *	 g_hook_ref			(GHookList		*hook_list,
-					 GHook			*hook);
-void	 g_hook_unref			(GHookList		*hook_list,
-					 GHook			*hook);
-gboolean g_hook_destroy			(GHookList		*hook_list,
-					 gulong			 hook_id);
-void	 g_hook_destroy_link		(GHookList		*hook_list,
-					 GHook			*hook);
-void	 g_hook_prepend			(GHookList		*hook_list,
-					 GHook			*hook);
-void	 g_hook_insert_before		(GHookList		*hook_list,
-					 GHook			*sibling,
-					 GHook			*hook);
-void	 g_hook_insert_sorted		(GHookList		*hook_list,
-					 GHook			*hook,
-					 GHookCompareFunc	 func);
-GHook*	 g_hook_get			(GHookList		*hook_list,
-					 gulong			 hook_id);
-GHook*	 g_hook_find			(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 GHookFindFunc		 func,
-					 gpointer		 data);
-GHook*	 g_hook_find_data		(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 gpointer		 data);
-GHook*	 g_hook_find_func		(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 gpointer		 func);
-GHook*	 g_hook_find_func_data		(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 gpointer		 func,
-					 gpointer		 data);
-/* return the first valid hook, and increment its reference count */
-GHook*	 g_hook_first_valid		(GHookList		*hook_list,
-					 gboolean		 may_be_in_call);
-/* return the next valid hook with incremented reference count, and
- * decrement the reference count of the original hook
- */
-GHook*	 g_hook_next_valid		(GHookList		*hook_list,
-					 GHook			*hook,
-					 gboolean		 may_be_in_call);
-/* GHookCompareFunc implementation to insert hooks sorted by their id */
-gint	 g_hook_compare_ids		(GHook			*new_hook,
-					 GHook			*sibling);
-/* convenience macros */
-#define	 g_hook_append( hook_list, hook )  \
-     g_hook_insert_before ((hook_list), NULL, (hook))
-/* invoke all valid hooks with the (*GHookFunc) signature.
- */
-void	 g_hook_list_invoke		(GHookList		*hook_list,
-					 gboolean		 may_recurse);
-/* invoke all valid hooks with the (*GHookCheckFunc) signature,
- * and destroy the hook if FALSE is returned.
- */
-void	 g_hook_list_invoke_check	(GHookList		*hook_list,
-					 gboolean		 may_recurse);
-/* invoke a marshaller on all valid hooks.
- */
-void	 g_hook_list_marshal		(GHookList		*hook_list,
-					 gboolean		 may_recurse,
-					 GHookMarshaller	 marshaller,
-					 gpointer		 marshal_data);
-void	 g_hook_list_marshal_check	(GHookList		*hook_list,
-					 gboolean		 may_recurse,
-					 GHookCheckMarshaller	 marshaller,
-					 gpointer		 marshal_data);
-
-G_END_DECLS
-
-#endif /* __G_HOOK_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/ghostutils.h b/protocols/Sametime/src/glib/include/glib/ghostutils.h
deleted file mode 100644
index 0349da364b..0000000000
--- a/protocols/Sametime/src/glib/include/glib/ghostutils.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_HOST_UTILS_H__
-#define __G_HOST_UTILS_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-gboolean  g_hostname_is_non_ascii     (const gchar *hostname);
-gboolean  g_hostname_is_ascii_encoded (const gchar *hostname);
-gboolean  g_hostname_is_ip_address    (const gchar *hostname);
-
-gchar    *g_hostname_to_ascii         (const gchar *hostname);
-gchar    *g_hostname_to_unicode       (const gchar *hostname);
-
-G_END_DECLS
-
-#endif /* __G_HOST_UTILS_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/giochannel.h b/protocols/Sametime/src/glib/include/glib/giochannel.h
deleted file mode 100644
index 2a40aa29ae..0000000000
--- a/protocols/Sametime/src/glib/include/glib/giochannel.h
+++ /dev/null
@@ -1,366 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_IOCHANNEL_H__
-#define __G_IOCHANNEL_H__
-
-#include <glib/gconvert.h>
-#include <glib/gmain.h>
-#include <glib/gstring.h>
-
-G_BEGIN_DECLS
-
-/* GIOChannel
- */
-
-typedef struct _GIOChannel	GIOChannel;
-typedef struct _GIOFuncs        GIOFuncs;
-
-typedef enum
-{
-  G_IO_ERROR_NONE,
-  G_IO_ERROR_AGAIN,
-  G_IO_ERROR_INVAL,
-  G_IO_ERROR_UNKNOWN
-} GIOError;
-
-#define G_IO_CHANNEL_ERROR g_io_channel_error_quark()
-
-typedef enum
-{
-  /* Derived from errno */
-  G_IO_CHANNEL_ERROR_FBIG,
-  G_IO_CHANNEL_ERROR_INVAL,
-  G_IO_CHANNEL_ERROR_IO,
-  G_IO_CHANNEL_ERROR_ISDIR,
-  G_IO_CHANNEL_ERROR_NOSPC,
-  G_IO_CHANNEL_ERROR_NXIO,
-  G_IO_CHANNEL_ERROR_OVERFLOW,
-  G_IO_CHANNEL_ERROR_PIPE,
-  /* Other */
-  G_IO_CHANNEL_ERROR_FAILED
-} GIOChannelError;
-
-typedef enum
-{
-  G_IO_STATUS_ERROR,
-  G_IO_STATUS_NORMAL,
-  G_IO_STATUS_EOF,
-  G_IO_STATUS_AGAIN
-} GIOStatus;
-
-typedef enum
-{
-  G_SEEK_CUR,
-  G_SEEK_SET,
-  G_SEEK_END
-} GSeekType;
-
-typedef enum
-{
-  G_IO_IN	GLIB_SYSDEF_POLLIN,
-  G_IO_OUT	GLIB_SYSDEF_POLLOUT,
-  G_IO_PRI	GLIB_SYSDEF_POLLPRI,
-  G_IO_ERR	GLIB_SYSDEF_POLLERR,
-  G_IO_HUP	GLIB_SYSDEF_POLLHUP,
-  G_IO_NVAL	GLIB_SYSDEF_POLLNVAL
-} GIOCondition;
-
-typedef enum
-{
-  G_IO_FLAG_APPEND = 1 << 0,
-  G_IO_FLAG_NONBLOCK = 1 << 1,
-  G_IO_FLAG_IS_READABLE = 1 << 2,	/* Read only flag */
-  G_IO_FLAG_IS_WRITEABLE = 1 << 3,	/* Read only flag */
-  G_IO_FLAG_IS_SEEKABLE = 1 << 4,	/* Read only flag */
-  G_IO_FLAG_MASK = (1 << 5) - 1,
-  G_IO_FLAG_GET_MASK = G_IO_FLAG_MASK,
-  G_IO_FLAG_SET_MASK = G_IO_FLAG_APPEND | G_IO_FLAG_NONBLOCK
-} GIOFlags;
-
-struct _GIOChannel
-{
-  /*< private >*/
-  gint ref_count;
-  GIOFuncs *funcs;
-
-  gchar *encoding;
-  GIConv read_cd;
-  GIConv write_cd;
-  gchar *line_term;		/* String which indicates the end of a line of text */
-  guint line_term_len;		/* So we can have null in the line term */
-
-  gsize buf_size;
-  GString *read_buf;		/* Raw data from the channel */
-  GString *encoded_read_buf;    /* Channel data converted to UTF-8 */
-  GString *write_buf;		/* Data ready to be written to the file */
-  gchar partial_write_buf[6];	/* UTF-8 partial characters, null terminated */
-
-  /* Group the flags together, immediately after partial_write_buf, to save memory */
-
-  guint use_buffer     : 1;	/* The encoding uses the buffers */
-  guint do_encode      : 1;	/* The encoding uses the GIConv coverters */
-  guint close_on_unref : 1;	/* Close the channel on final unref */
-  guint is_readable    : 1;	/* Cached GIOFlag */
-  guint is_writeable   : 1;	/* ditto */
-  guint is_seekable    : 1;	/* ditto */
-
-  gpointer reserved1;	
-  gpointer reserved2;	
-};
-
-typedef gboolean (*GIOFunc) (GIOChannel   *source,
-			     GIOCondition  condition,
-			     gpointer      data);
-struct _GIOFuncs
-{
-  GIOStatus (*io_read)           (GIOChannel   *channel, 
-			          gchar        *buf, 
-				  gsize         count,
-				  gsize        *bytes_read,
-				  GError      **err);
-  GIOStatus (*io_write)          (GIOChannel   *channel, 
-				  const gchar  *buf, 
-				  gsize         count,
-				  gsize        *bytes_written,
-				  GError      **err);
-  GIOStatus (*io_seek)           (GIOChannel   *channel, 
-				  gint64        offset, 
-				  GSeekType     type,
-				  GError      **err);
-  GIOStatus  (*io_close)         (GIOChannel   *channel,
-				  GError      **err);
-  GSource*   (*io_create_watch)  (GIOChannel   *channel,
-				  GIOCondition  condition);
-  void       (*io_free)          (GIOChannel   *channel);
-  GIOStatus  (*io_set_flags)     (GIOChannel   *channel,
-                                  GIOFlags      flags,
-				  GError      **err);
-  GIOFlags   (*io_get_flags)     (GIOChannel   *channel);
-};
-
-void        g_io_channel_init   (GIOChannel    *channel);
-GIOChannel *g_io_channel_ref    (GIOChannel    *channel);
-void        g_io_channel_unref  (GIOChannel    *channel);
-
-#ifndef G_DISABLE_DEPRECATED
-GIOError    g_io_channel_read   (GIOChannel    *channel, 
-			         gchar         *buf, 
-			         gsize          count,
-			         gsize         *bytes_read);
-GIOError  g_io_channel_write    (GIOChannel    *channel, 
-			         const gchar   *buf, 
-			         gsize          count,
-			         gsize         *bytes_written);
-GIOError  g_io_channel_seek     (GIOChannel    *channel,
-			         gint64         offset, 
-			         GSeekType      type);
-void      g_io_channel_close    (GIOChannel    *channel);
-#endif /* G_DISABLE_DEPRECATED */
-
-GIOStatus g_io_channel_shutdown (GIOChannel      *channel,
-				 gboolean         flush,
-				 GError         **err);
-guint     g_io_add_watch_full   (GIOChannel      *channel,
-				 gint             priority,
-				 GIOCondition     condition,
-				 GIOFunc          func,
-				 gpointer         user_data,
-				 GDestroyNotify   notify);
-GSource * g_io_create_watch     (GIOChannel      *channel,
-				 GIOCondition     condition);
-guint     g_io_add_watch        (GIOChannel      *channel,
-				 GIOCondition     condition,
-				 GIOFunc          func,
-				 gpointer         user_data);
-
-/* character encoding conversion involved functions.
- */
-
-void                  g_io_channel_set_buffer_size      (GIOChannel   *channel,
-							 gsize         size);
-gsize                 g_io_channel_get_buffer_size      (GIOChannel   *channel);
-GIOCondition          g_io_channel_get_buffer_condition (GIOChannel   *channel);
-GIOStatus             g_io_channel_set_flags            (GIOChannel   *channel,
-							 GIOFlags      flags,
-							 GError      **error);
-GIOFlags              g_io_channel_get_flags            (GIOChannel   *channel);
-void                  g_io_channel_set_line_term        (GIOChannel   *channel,
-							 const gchar  *line_term,
-							 gint          length);
-G_CONST_RETURN gchar* g_io_channel_get_line_term        (GIOChannel   *channel,
-							 gint         *length);
-void		      g_io_channel_set_buffered		(GIOChannel   *channel,
-							 gboolean      buffered);
-gboolean	      g_io_channel_get_buffered		(GIOChannel   *channel);
-GIOStatus             g_io_channel_set_encoding         (GIOChannel   *channel,
-							 const gchar  *encoding,
-							 GError      **error);
-G_CONST_RETURN gchar* g_io_channel_get_encoding         (GIOChannel   *channel);
-void                  g_io_channel_set_close_on_unref	(GIOChannel   *channel,
-							 gboolean      do_close);
-gboolean              g_io_channel_get_close_on_unref	(GIOChannel   *channel);
-
-
-GIOStatus   g_io_channel_flush            (GIOChannel   *channel,
-					   GError      **error);
-GIOStatus   g_io_channel_read_line        (GIOChannel   *channel,
-					   gchar       **str_return,
-					   gsize        *length,
-					   gsize        *terminator_pos,
-					   GError      **error);
-GIOStatus   g_io_channel_read_line_string (GIOChannel   *channel,
-					   GString      *buffer,
-					   gsize        *terminator_pos,
-					   GError      **error);
-GIOStatus   g_io_channel_read_to_end      (GIOChannel   *channel,
-					   gchar       **str_return,
-					   gsize        *length,
-					   GError      **error);
-GIOStatus   g_io_channel_read_chars       (GIOChannel   *channel,
-					   gchar        *buf,
-					   gsize         count,
-					   gsize        *bytes_read,
-					   GError      **error);
-GIOStatus   g_io_channel_read_unichar     (GIOChannel   *channel,
-					   gunichar     *thechar,
-					   GError      **error);
-GIOStatus   g_io_channel_write_chars      (GIOChannel   *channel,
-					   const gchar  *buf,
-					   gssize        count,
-					   gsize        *bytes_written,
-					   GError      **error);
-GIOStatus   g_io_channel_write_unichar    (GIOChannel   *channel,
-					   gunichar      thechar,
-					   GError      **error);
-GIOStatus   g_io_channel_seek_position    (GIOChannel   *channel,
-					   gint64        offset,
-					   GSeekType     type,
-					   GError      **error);
-#ifdef G_OS_WIN32
-#define g_io_channel_new_file g_io_channel_new_file_utf8
-#endif
-
-GIOChannel* g_io_channel_new_file         (const gchar  *filename,
-					   const gchar  *mode,
-					   GError      **error);
-
-/* Error handling */
-
-GQuark          g_io_channel_error_quark      (void);
-GIOChannelError g_io_channel_error_from_errno (gint en);
-
-/* On Unix, IO channels created with this function for any file
- * descriptor or socket.
- *
- * On Win32, this can be used either for files opened with the MSVCRT
- * (the Microsoft run-time C library) _open() or _pipe, including file
- * descriptors 0, 1 and 2 (corresponding to stdin, stdout and stderr),
- * or for Winsock SOCKETs. If the parameter is a legal file
- * descriptor, it is assumed to be such, otherwise it should be a
- * SOCKET. This relies on SOCKETs and file descriptors not
- * overlapping. If you want to be certain, call either
- * g_io_channel_win32_new_fd() or g_io_channel_win32_new_socket()
- * instead as appropriate.
- *
- * The term file descriptor as used in the context of Win32 refers to
- * the emulated Unix-like file descriptors MSVCRT provides. The native
- * corresponding concept is file HANDLE. There isn't as of yet a way to
- * get GIOChannels for Win32 file HANDLEs.
- */
-GIOChannel* g_io_channel_unix_new    (int         fd);
-gint        g_io_channel_unix_get_fd (GIOChannel *channel);
-
-
-/* Hook for GClosure / GSource integration. Don't touch */
-GLIB_VAR GSourceFuncs g_io_watch_funcs;
-
-#ifdef G_OS_WIN32
-
-/* You can use this "pseudo file descriptor" in a GPollFD to add
- * polling for Windows messages. GTK applications should not do that.
- */
-
-#define G_WIN32_MSG_HANDLE 19981206
-
-/* Use this to get a GPollFD from a GIOChannel, so that you can call
- * g_io_channel_win32_poll(). After calling this you should only use
- * g_io_channel_read() to read from the GIOChannel, i.e. never read()
- * from the underlying file descriptor. For SOCKETs, it is possible to call
- * recv().
- */
-void        g_io_channel_win32_make_pollfd (GIOChannel   *channel,
-					    GIOCondition  condition,
-					    GPollFD      *fd);
-
-/* This can be used to wait a until at least one of the channels is readable.
- * On Unix you would do a select() on the file descriptors of the channels.
- */
-gint        g_io_channel_win32_poll   (GPollFD    *fds,
-				       gint        n_fds,
-				       gint        timeout_);
-
-/* Create an IO channel for Windows messages for window handle hwnd. */
-#if GLIB_SIZEOF_VOID_P == 8
-/* We use gsize here so that it is still an integer type and not a
- * pointer, like the guint in the traditional prototype. We can't use
- * intptr_t as that is not portable enough.
- */
-GIOChannel *g_io_channel_win32_new_messages (gsize hwnd);
-#else
-GIOChannel *g_io_channel_win32_new_messages (guint hwnd);
-#endif
-
-/* Create an IO channel for C runtime (emulated Unix-like) file
- * descriptors. After calling g_io_add_watch() on a IO channel
- * returned by this function, you shouldn't call read() on the file
- * descriptor. This is because adding polling for a file descriptor is
- * implemented on Win32 by starting a thread that sits blocked in a
- * read() from the file descriptor most of the time. All reads from
- * the file descriptor should be done by this internal GLib
- * thread. Your code should call only g_io_channel_read_chars().
- */
-GIOChannel* g_io_channel_win32_new_fd (gint         fd);
-
-/* Get the C runtime file descriptor of a channel. */
-gint        g_io_channel_win32_get_fd (GIOChannel *channel);
-
-/* Create an IO channel for a winsock socket. The parameter should be
- * a SOCKET. Contrary to IO channels for file descriptors (on *Win32),
- * you can use normal recv() or recvfrom() on sockets even if GLib
- * is polling them.
- */
-GIOChannel *g_io_channel_win32_new_socket (gint socket);
-
-#endif
-
-G_END_DECLS
-
-#endif /* __G_IOCHANNEL_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gkeyfile.h b/protocols/Sametime/src/glib/include/glib/gkeyfile.h
deleted file mode 100644
index e16dc61272..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gkeyfile.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/* gkeyfile.h - desktop entry file parser
- *
- *  Copyright 2004 Red Hat, Inc.
- *
- *  Ray Strode <halfline@hawaii.rr.com>
- *
- * GLib is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_KEY_FILE_H__
-#define __G_KEY_FILE_H__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-typedef enum
-{
-  G_KEY_FILE_ERROR_UNKNOWN_ENCODING,
-  G_KEY_FILE_ERROR_PARSE,
-  G_KEY_FILE_ERROR_NOT_FOUND,
-  G_KEY_FILE_ERROR_KEY_NOT_FOUND,
-  G_KEY_FILE_ERROR_GROUP_NOT_FOUND,
-  G_KEY_FILE_ERROR_INVALID_VALUE
-} GKeyFileError;
-
-#define G_KEY_FILE_ERROR g_key_file_error_quark()
-
-GQuark g_key_file_error_quark (void);
-
-typedef struct _GKeyFile GKeyFile;
-
-typedef enum
-{
-  G_KEY_FILE_NONE              = 0,
-  G_KEY_FILE_KEEP_COMMENTS     = 1 << 0,
-  G_KEY_FILE_KEEP_TRANSLATIONS = 1 << 1
-} GKeyFileFlags;
-
-GKeyFile *g_key_file_new                    (void);
-void      g_key_file_free                   (GKeyFile             *key_file);
-void      g_key_file_set_list_separator     (GKeyFile             *key_file,
-					     gchar                 separator);
-gboolean  g_key_file_load_from_file         (GKeyFile             *key_file,
-					     const gchar          *file,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-gboolean  g_key_file_load_from_data         (GKeyFile             *key_file,
-					     const gchar          *data,
-					     gsize                 length,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-gboolean g_key_file_load_from_dirs          (GKeyFile             *key_file,
-					     const gchar	  *file,
-					     const gchar	 **search_dirs,
-					     gchar		 **full_path,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-gboolean g_key_file_load_from_data_dirs     (GKeyFile             *key_file,
-					     const gchar          *file,
-					     gchar               **full_path,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-gchar    *g_key_file_to_data                (GKeyFile             *key_file,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-gchar    *g_key_file_get_start_group        (GKeyFile             *key_file) G_GNUC_MALLOC;
-gchar   **g_key_file_get_groups             (GKeyFile             *key_file,
-					     gsize                *length) G_GNUC_MALLOC;
-gchar   **g_key_file_get_keys               (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-gboolean  g_key_file_has_group              (GKeyFile             *key_file,
-					     const gchar          *group_name);
-gboolean  g_key_file_has_key                (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-gchar    *g_key_file_get_value              (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_value              (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *value);
-gchar    *g_key_file_get_string             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_string             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *string);
-gchar    *g_key_file_get_locale_string      (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *locale,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_locale_string      (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *locale,
-					     const gchar          *string);
-gboolean  g_key_file_get_boolean            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-void      g_key_file_set_boolean            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gboolean              value);
-gint      g_key_file_get_integer            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-void      g_key_file_set_integer            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gint                  value);
-gint64    g_key_file_get_int64              (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-void      g_key_file_set_int64              (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gint64                value);
-guint64   g_key_file_get_uint64             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-void      g_key_file_set_uint64             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     guint64               value);
-gdouble   g_key_file_get_double             (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             GError              **error);
-void      g_key_file_set_double             (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             gdouble               value);
-gchar   **g_key_file_get_string_list        (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_string_list        (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar * const   list[],
-					     gsize                 length);
-gchar   **g_key_file_get_locale_string_list (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *locale,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_locale_string_list (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *locale,
-					     const gchar * const   list[],
-					     gsize                 length);
-gboolean *g_key_file_get_boolean_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_boolean_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gboolean              list[],
-					     gsize                 length);
-gint     *g_key_file_get_integer_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_double_list        (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             gdouble               list[],
-                                             gsize                 length);
-gdouble  *g_key_file_get_double_list        (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             gsize                *length,
-                                             GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_integer_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gint                  list[],
-					     gsize                 length);
-gboolean  g_key_file_set_comment            (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             const gchar          *comment,
-                                             GError              **error);
-gchar    *g_key_file_get_comment            (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             GError              **error) G_GNUC_MALLOC;
-
-gboolean  g_key_file_remove_comment         (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-					     GError              **error);
-gboolean  g_key_file_remove_key             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-gboolean  g_key_file_remove_group           (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     GError              **error);
-
-/* Defines for handling freedesktop.org Desktop files */
-#define G_KEY_FILE_DESKTOP_GROUP                "Desktop Entry"
-
-#define G_KEY_FILE_DESKTOP_KEY_TYPE             "Type"
-#define G_KEY_FILE_DESKTOP_KEY_VERSION          "Version"
-#define G_KEY_FILE_DESKTOP_KEY_NAME             "Name"
-#define G_KEY_FILE_DESKTOP_KEY_GENERIC_NAME     "GenericName"
-#define G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY       "NoDisplay"
-#define G_KEY_FILE_DESKTOP_KEY_COMMENT          "Comment"
-#define G_KEY_FILE_DESKTOP_KEY_ICON             "Icon"
-#define G_KEY_FILE_DESKTOP_KEY_HIDDEN           "Hidden"
-#define G_KEY_FILE_DESKTOP_KEY_ONLY_SHOW_IN     "OnlyShowIn"
-#define G_KEY_FILE_DESKTOP_KEY_NOT_SHOW_IN      "NotShowIn"
-#define G_KEY_FILE_DESKTOP_KEY_TRY_EXEC         "TryExec"
-#define G_KEY_FILE_DESKTOP_KEY_EXEC             "Exec"
-#define G_KEY_FILE_DESKTOP_KEY_PATH             "Path"
-#define G_KEY_FILE_DESKTOP_KEY_TERMINAL         "Terminal"
-#define G_KEY_FILE_DESKTOP_KEY_MIME_TYPE        "MimeType"
-#define G_KEY_FILE_DESKTOP_KEY_CATEGORIES       "Categories"
-#define G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY   "StartupNotify"
-#define G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS "StartupWMClass"
-#define G_KEY_FILE_DESKTOP_KEY_URL              "URL"
-
-#define G_KEY_FILE_DESKTOP_TYPE_APPLICATION     "Application"
-#define G_KEY_FILE_DESKTOP_TYPE_LINK            "Link"
-#define G_KEY_FILE_DESKTOP_TYPE_DIRECTORY       "Directory"
-
-G_END_DECLS
-
-#endif /* __G_KEY_FILE_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/glist.h b/protocols/Sametime/src/glib/include/glib/glist.h
deleted file mode 100644
index e74ed96f15..0000000000
--- a/protocols/Sametime/src/glib/include/glib/glist.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_LIST_H__
-#define __G_LIST_H__
-
-#include <glib/gmem.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GList GList;
-
-struct _GList
-{
-  gpointer data;
-  GList *next;
-  GList *prev;
-};
-
-/* Doubly linked lists
- */
-GList*   g_list_alloc                   (void) G_GNUC_WARN_UNUSED_RESULT;
-void     g_list_free                    (GList            *list);
-void     g_list_free_1                  (GList            *list);
-#define  g_list_free1                   g_list_free_1
-GList*   g_list_append                  (GList            *list,
-					 gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_prepend                 (GList            *list,
-					 gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_insert                  (GList            *list,
-					 gpointer          data,
-					 gint              position) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_insert_sorted           (GList            *list,
-					 gpointer          data,
-					 GCompareFunc      func) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_insert_sorted_with_data (GList            *list,
-					 gpointer          data,
-					 GCompareDataFunc  func,
-					 gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_insert_before           (GList            *list,
-					 GList            *sibling,
-					 gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_concat                  (GList            *list1,
-					 GList            *list2) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_remove                  (GList            *list,
-					 gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_remove_all              (GList            *list,
-					 gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_remove_link             (GList            *list,
-					 GList            *llink) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_delete_link             (GList            *list,
-					 GList            *link_) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_reverse                 (GList            *list) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_copy                    (GList            *list) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_nth                     (GList            *list,
-					 guint             n);
-GList*   g_list_nth_prev                (GList            *list,
-					 guint             n);
-GList*   g_list_find                    (GList            *list,
-					 gconstpointer     data);
-GList*   g_list_find_custom             (GList            *list,
-					 gconstpointer     data,
-					 GCompareFunc      func);
-gint     g_list_position                (GList            *list,
-					 GList            *llink);
-gint     g_list_index                   (GList            *list,
-					 gconstpointer     data);
-GList*   g_list_last                    (GList            *list);
-GList*   g_list_first                   (GList            *list);
-guint    g_list_length                  (GList            *list);
-void     g_list_foreach                 (GList            *list,
-					 GFunc             func,
-					 gpointer          user_data);
-GList*   g_list_sort                    (GList            *list,
-					 GCompareFunc      compare_func) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_sort_with_data          (GList            *list,
-					 GCompareDataFunc  compare_func,
-					 gpointer          user_data)  G_GNUC_WARN_UNUSED_RESULT;
-gpointer g_list_nth_data                (GList            *list,
-					 guint             n);
-
-
-#define g_list_previous(list)	        ((list) ? (((GList *)(list))->prev) : NULL)
-#define g_list_next(list)	        ((list) ? (((GList *)(list))->next) : NULL)
-
-#ifndef G_DISABLE_DEPRECATED
-void     g_list_push_allocator          (gpointer          allocator);
-void     g_list_pop_allocator           (void);
-#endif
-
-G_END_DECLS
-
-#endif /* __G_LIST_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gmacros.h b/protocols/Sametime/src/glib/include/glib/gmacros.h
deleted file mode 100644
index 9f9c25dcb1..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gmacros.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-/* This file must not include any other glib header file and must thus
- * not refer to variables from glibconfig.h
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_MACROS_H__
-#define __G_MACROS_H__
-
-/* We include stddef.h to get the system's definition of NULL
- */
-#include <stddef.h>
-
-/* Here we provide G_GNUC_EXTENSION as an alias for __extension__,
- * where this is valid. This allows for warningless compilation of
- * "long long" types even in the presence of '-ansi -pedantic'. 
- */
-#if     __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
-#  define G_GNUC_EXTENSION __extension__
-#else
-#  define G_GNUC_EXTENSION
-#endif
-
-/* Provide macros to feature the GCC function attribute.
- */
-#if    __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-#define G_GNUC_PURE                            \
-  __attribute__((__pure__))
-#define G_GNUC_MALLOC    			\
-  __attribute__((__malloc__))
-#else
-#define G_GNUC_PURE
-#define G_GNUC_MALLOC
-#endif
-
-#if     __GNUC__ >= 4
-#define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
-#else
-#define G_GNUC_NULL_TERMINATED
-#endif
-
-#if     (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
-#define G_GNUC_ALLOC_SIZE(x) __attribute__((__alloc_size__(x)))
-#define G_GNUC_ALLOC_SIZE2(x,y) __attribute__((__alloc_size__(x,y)))
-#else
-#define G_GNUC_ALLOC_SIZE(x)
-#define G_GNUC_ALLOC_SIZE2(x,y)
-#endif
-
-#if     __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-#define G_GNUC_PRINTF( format_idx, arg_idx )    \
-  __attribute__((__format__ (__printf__, format_idx, arg_idx)))
-#define G_GNUC_SCANF( format_idx, arg_idx )     \
-  __attribute__((__format__ (__scanf__, format_idx, arg_idx)))
-#define G_GNUC_FORMAT( arg_idx )                \
-  __attribute__((__format_arg__ (arg_idx)))
-#define G_GNUC_NORETURN                         \
-  __attribute__((__noreturn__))
-#define G_GNUC_CONST                            \
-  __attribute__((__const__))
-#define G_GNUC_UNUSED                           \
-  __attribute__((__unused__))
-#define G_GNUC_NO_INSTRUMENT			\
-  __attribute__((__no_instrument_function__))
-#else   /* !__GNUC__ */
-#define G_GNUC_PRINTF( format_idx, arg_idx )
-#define G_GNUC_SCANF( format_idx, arg_idx )
-#define G_GNUC_FORMAT( arg_idx )
-#define G_GNUC_NORETURN
-#define G_GNUC_CONST
-#define G_GNUC_UNUSED
-#define G_GNUC_NO_INSTRUMENT
-#endif  /* !__GNUC__ */
-
-#if    __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
-#define G_GNUC_DEPRECATED                            \
-  __attribute__((__deprecated__))
-#else
-#define G_GNUC_DEPRECATED
-#endif /* __GNUC__ */
-
-#if    __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-#define G_GNUC_DEPRECATED_FOR(f)                        \
-  __attribute__((deprecated("Use " #f " instead")))
-#else
-#define G_GNUC_DEPRECATED_FOR(f)        G_GNUC_DEPRECATED
-#endif /* __GNUC__ */
-
-#if     __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
-#  define G_GNUC_MAY_ALIAS __attribute__((may_alias))
-#else
-#  define G_GNUC_MAY_ALIAS
-#endif
-
-#if    __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-#define G_GNUC_WARN_UNUSED_RESULT 		\
-  __attribute__((warn_unused_result))
-#else
-#define G_GNUC_WARN_UNUSED_RESULT
-#endif /* __GNUC__ */
-
-#ifndef G_DISABLE_DEPRECATED
-/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
- * macros, so we can refer to them as strings unconditionally.
- * usage not-recommended since gcc-3.0
- */
-#if defined (__GNUC__) && (__GNUC__ < 3)
-#define G_GNUC_FUNCTION         __FUNCTION__
-#define G_GNUC_PRETTY_FUNCTION  __PRETTY_FUNCTION__
-#else   /* !__GNUC__ */
-#define G_GNUC_FUNCTION         ""
-#define G_GNUC_PRETTY_FUNCTION  ""
-#endif  /* !__GNUC__ */
-#endif  /* !G_DISABLE_DEPRECATED */
-
-#define G_STRINGIFY(macro_or_string)	G_STRINGIFY_ARG (macro_or_string)
-#define	G_STRINGIFY_ARG(contents)	#contents
-
-#define G_PASTE_ARGS(identifier1,identifier2) identifier1 ## identifier2
-#define G_PASTE(identifier1,identifier2)      G_PASTE_ARGS (identifier1, identifier2)
-#define G_STATIC_ASSERT(expr) typedef struct { char Compile_Time_Assertion[(expr) ? 1 : -1]; } G_PASTE (_GStaticAssert_, __LINE__)
-
-/* Provide a string identifying the current code position */
-#if defined(__GNUC__) && (__GNUC__ < 3) && !defined(__cplusplus)
-#  define G_STRLOC	__FILE__ ":" G_STRINGIFY (__LINE__) ":" __PRETTY_FUNCTION__ "()"
-#else
-#  define G_STRLOC	__FILE__ ":" G_STRINGIFY (__LINE__)
-#endif
-
-/* Provide a string identifying the current function, non-concatenatable */
-#if defined (__GNUC__)
-#  define G_STRFUNC     ((const char*) (__PRETTY_FUNCTION__))
-#elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 19901L
-#  define G_STRFUNC     ((const char*) (__func__))
-#else
-#  define G_STRFUNC     ((const char*) ("???"))
-#endif
-
-/* Guard C code in headers, while including them from C++ */
-#ifdef  __cplusplus
-# define G_BEGIN_DECLS  extern "C" {
-# define G_END_DECLS    }
-#else
-# define G_BEGIN_DECLS
-# define G_END_DECLS
-#endif
-
-/* Provide definitions for some commonly used macros.
- *  Some of them are only provided if they haven't already
- *  been defined. It is assumed that if they are already
- *  defined then the current definition is correct.
- */
-#ifndef NULL
-#  ifdef __cplusplus
-#    define NULL        (0L)
-#  else /* !__cplusplus */
-#    define NULL        ((void*) 0)
-#  endif /* !__cplusplus */
-#endif
-
-#ifndef	FALSE
-#define	FALSE	(0)
-#endif
-
-#ifndef	TRUE
-#define	TRUE	(!FALSE)
-#endif
-
-#undef	MAX
-#define MAX(a, b)  (((a) > (b)) ? (a) : (b))
-
-#undef	MIN
-#define MIN(a, b)  (((a) < (b)) ? (a) : (b))
-
-#undef	ABS
-#define ABS(a)	   (((a) < 0) ? -(a) : (a))
-
-#undef	CLAMP
-#define CLAMP(x, low, high)  (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
-
-/* Count the number of elements in an array. The array must be defined
- * as such; using this with a dynamically allocated array will give
- * incorrect results.
- */
-#define G_N_ELEMENTS(arr)		(sizeof (arr) / sizeof ((arr)[0]))
-
-/* Macros by analogy to GINT_TO_POINTER, GPOINTER_TO_INT
- */
-#define GPOINTER_TO_SIZE(p)	((gsize) (p))
-#define GSIZE_TO_POINTER(s)	((gpointer) (gsize) (s))
-
-/* Provide convenience macros for handling structure
- * fields through their offsets.
- */
-
-#if defined(__GNUC__)  && __GNUC__ >= 4
-#  define G_STRUCT_OFFSET(struct_type, member) \
-      ((glong) offsetof (struct_type, member))
-#else
-#  define G_STRUCT_OFFSET(struct_type, member)	\
-      ((glong) ((guint8*) &((struct_type*) 0)->member))
-#endif
-
-#define G_STRUCT_MEMBER_P(struct_p, struct_offset)   \
-    ((gpointer) ((guint8*) (struct_p) + (glong) (struct_offset)))
-#define G_STRUCT_MEMBER(member_type, struct_p, struct_offset)   \
-    (*(member_type*) G_STRUCT_MEMBER_P ((struct_p), (struct_offset)))
-
-/* Provide simple macro statement wrappers:
- *   G_STMT_START { statements; } G_STMT_END;
- * This can be used as a single statement, like:
- *   if (x) G_STMT_START { ... } G_STMT_END; else ...
- * This intentionally does not use compiler extensions like GCC's '({...})' to
- * avoid portability issue or side effects when compiled with different compilers.
- */
-#if !(defined (G_STMT_START) && defined (G_STMT_END))
-#  define G_STMT_START  do
-#  define G_STMT_END    while (0)
-#endif
-
-/* Allow the app programmer to select whether or not return values
- * (usually char*) are const or not.  Don't try using this feature for
- * functions with C++ linkage.
- */
-#ifdef G_DISABLE_CONST_RETURNS
-#define G_CONST_RETURN
-#else
-#define G_CONST_RETURN const
-#endif
-
-/*
- * The G_LIKELY and G_UNLIKELY macros let the programmer give hints to 
- * the compiler about the expected result of an expression. Some compilers
- * can use this information for optimizations.
- *
- * The _G_BOOLEAN_EXPR macro is intended to trigger a gcc warning when
- * putting assignments in g_return_if_fail ().  
- */
-#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
-#define _G_BOOLEAN_EXPR(expr)                   \
- __extension__ ({                               \
-   int _g_boolean_var_;                         \
-   if (expr)                                    \
-      _g_boolean_var_ = 1;                      \
-   else                                         \
-      _g_boolean_var_ = 0;                      \
-   _g_boolean_var_;                             \
-})
-#define G_LIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR(expr), 1))
-#define G_UNLIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR(expr), 0))
-#else
-#define G_LIKELY(expr) (expr)
-#define G_UNLIKELY(expr) (expr)
-#endif
-
-#endif /* __G_MACROS_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gmain.h b/protocols/Sametime/src/glib/include/glib/gmain.h
deleted file mode 100644
index 24c6171fe6..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gmain.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/* gmain.h - the GLib Main loop
- * Copyright (C) 1998-2000 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_MAIN_H__
-#define __G_MAIN_H__
-
-#include <glib/gpoll.h>
-#include <glib/gslist.h>
-#include <glib/gthread.h>
-
-G_BEGIN_DECLS
-
-/**
- * GMainContext:
- *
- * The <structname>GMainContext</structname> struct is an opaque data
- * type representing a set of sources to be handled in a main loop.
- */
-typedef struct _GMainContext            GMainContext;
-
-/**
- * GMainLoop:
- *
- * The <structname>GMainLoop</structname> struct is an opaque data type
- * representing the main event loop of a GLib or GTK+ application.
- */
-typedef struct _GMainLoop               GMainLoop;
-
-/**
- * GSource:
- *
- * The <structname>GSource</structname> struct is an opaque data type
- * representing an event source.
- */
-typedef struct _GSource                 GSource;
-
-/**
- * GSourceCallbackFuncs:
- * @ref: Called when a reference is added to the callback object
- * @unref: Called when a reference to the callback object is dropped
- * @get: Called to extract the callback function and data from the
- *     callback object.
-
- * The <structname>GSourceCallbackFuncs</structname> struct contains
- * functions for managing callback objects.
- */
-typedef struct _GSourceCallbackFuncs    GSourceCallbackFuncs;
-
-/**
- * GSourceFuncs:
- * @prepare: Called before all the file descriptors are polled. If the
- *     source can determine that it is ready here (without waiting for the
- *     results of the poll() call) it should return %TRUE. It can also return
- *     a @timeout_ value which should be the maximum timeout (in milliseconds)
- *     which should be passed to the poll() call. The actual timeout used will
- *     be -1 if all sources returned -1, or it will be the minimum of all the
- *     @timeout_ values returned which were >= 0.
- * @check: Called after all the file descriptors are polled. The source
- *     should return %TRUE if it is ready to be dispatched. Note that some
- *     time may have passed since the previous prepare function was called,
- *     so the source should be checked again here.
- * @dispatch: Called to dispatch the event source, after it has returned
- *     %TRUE in either its @prepare or its @check function. The @dispatch
- *     function is passed in a callback function and data. The callback
- *     function may be %NULL if the source was never connected to a callback
- *     using g_source_set_callback(). The @dispatch function should call the
- *     callback function with @user_data and whatever additional parameters
- *     are needed for this type of event source.
- * @finalize: Called when the source is finalized.
- * @closure_callback:
- * @closure_marshal:
- *
- * The <structname>GSourceFuncs</structname> struct contains a table of
- * functions used to handle event sources in a generic manner.
- *
- * For idle sources, the prepare and check functions always return %TRUE
- * to indicate that the source is always ready to be processed. The prepare
- * function also returns a timeout value of 0 to ensure that the poll() call
- * doesn't block (since that would be time wasted which could have been spent
- * running the idle function).
- *
- * For timeout sources, the prepare and check functions both return %TRUE
- * if the timeout interval has expired. The prepare function also returns
- * a timeout value to ensure that the poll() call doesn't block too long
- * and miss the next timeout.
- *
- * For file descriptor sources, the prepare function typically returns %FALSE,
- * since it must wait until poll() has been called before it knows whether
- * any events need to be processed. It sets the returned timeout to -1 to
- * indicate that it doesn't mind how long the poll() call blocks. In the
- * check function, it tests the results of the poll() call to see if the
- * required condition has been met, and returns %TRUE if so.
- */
-typedef struct _GSourceFuncs            GSourceFuncs;
-
-/**
- * GPid:
- *
- * A type which is used to hold a process identification.
- *
- * On UNIX, processes are identified by a process id (an integer),
- * while Windows uses process handles (which are pointers).
- */
-
-typedef gboolean (*GSourceFunc)       (gpointer data);
-
-/**
- * GChildWatchFunc:
- * @pid: the process id of the child process
- * @status: Status information about the child process,
- *     see waitpid(2) for more information about this field
- * @data: user data passed to g_child_watch_add()
- *
- * The type of functions to be called when a child exists.
- */
-typedef void     (*GChildWatchFunc)   (GPid     pid,
-                                       gint     status,
-                                       gpointer data);
-struct _GSource
-{
-  /*< private >*/
-  gpointer callback_data;
-  GSourceCallbackFuncs *callback_funcs;
-
-  GSourceFuncs *source_funcs;
-  guint ref_count;
-
-  GMainContext *context;
-
-  gint priority;
-  guint flags;
-  guint source_id;
-
-  GSList *poll_fds;
-  
-  GSource *prev;
-  GSource *next;
-
-  char    *name;
-  gpointer reserved2;
-};
-
-struct _GSourceCallbackFuncs
-{
-  void (*ref)   (gpointer     cb_data);
-  void (*unref) (gpointer     cb_data);
-  void (*get)   (gpointer     cb_data,
-                 GSource     *source, 
-                 GSourceFunc *func,
-                 gpointer    *data);
-};
-
-typedef void (*GSourceDummyMarshal) (void);
-
-struct _GSourceFuncs
-{
-  gboolean (*prepare)  (GSource    *source,
-                        gint       *timeout_);
-  gboolean (*check)    (GSource    *source);
-  gboolean (*dispatch) (GSource    *source,
-                        GSourceFunc callback,
-                        gpointer    user_data);
-  void     (*finalize) (GSource    *source); /* Can be NULL */
-
-  /* For use by g_source_set_closure */
-  GSourceFunc     closure_callback;        
-  GSourceDummyMarshal closure_marshal; /* Really is of type GClosureMarshal */
-};
-
-/* Standard priorities */
-
-/**
- * G_PRIORITY_HIGH:
- *
- * Use this for high priority event sources.
- *
- * It is not used within GLib or GTK+.
- */
-#define G_PRIORITY_HIGH            -100
-
-/**
- * G_PRIORITY_DEFAULT:
- *
- * Use this for default priority event sources.
- *
- * In GLib this priority is used when adding timeout functions
- * with g_timeout_add(). In GDK this priority is used for events
- * from the X server.
- */
-#define G_PRIORITY_DEFAULT          0
-
-/**
- * G_PRIORITY_HIGH_IDLE:
- *
- * Use this for high priority idle functions.
- *
- * GTK+ uses #G_PRIORITY_HIGH_IDLE + 10 for resizing operations,
- * and #G_PRIORITY_HIGH_IDLE + 20 for redrawing operations. (This is
- * done to ensure that any pending resizes are processed before any
- * pending redraws, so that widgets are not redrawn twice unnecessarily.)
- */
-#define G_PRIORITY_HIGH_IDLE        100
-
-/**
- * G_PRIORITY_DEFAULT_IDLE:
- *
- * Use this for default priority idle functions.
- *
- * In GLib this priority is used when adding idle functions with
- * g_idle_add().
- */
-#define G_PRIORITY_DEFAULT_IDLE     200
-
-/**
- * G_PRIORITY_LOW:
- *
- * Use this for very low priority background tasks.
- *
- * It is not used within GLib or GTK+.
- */
-#define G_PRIORITY_LOW              300
-
-/* GMainContext: */
-
-GMainContext *g_main_context_new       (void);
-GMainContext *g_main_context_ref       (GMainContext *context);
-void          g_main_context_unref     (GMainContext *context);
-GMainContext *g_main_context_default   (void);
-
-gboolean      g_main_context_iteration (GMainContext *context,
-                                        gboolean      may_block);
-gboolean      g_main_context_pending   (GMainContext *context);
-
-/* For implementation of legacy interfaces
- */
-GSource      *g_main_context_find_source_by_id              (GMainContext *context,
-                                                             guint         source_id);
-GSource      *g_main_context_find_source_by_user_data       (GMainContext *context,
-                                                             gpointer      user_data);
-GSource      *g_main_context_find_source_by_funcs_user_data (GMainContext *context,
-                                                             GSourceFuncs *funcs,
-                                                             gpointer      user_data);
-
-/* Low level functions for implementing custom main loops.
- */
-void     g_main_context_wakeup  (GMainContext *context);
-gboolean g_main_context_acquire (GMainContext *context);
-void     g_main_context_release (GMainContext *context);
-gboolean g_main_context_is_owner (GMainContext *context);
-gboolean g_main_context_wait    (GMainContext *context,
-                                 GCond        *cond,
-                                 GMutex       *mutex);
-
-gboolean g_main_context_prepare  (GMainContext *context,
-                                  gint         *priority);
-gint     g_main_context_query    (GMainContext *context,
-                                  gint          max_priority,
-                                  gint         *timeout_,
-                                  GPollFD      *fds,
-                                  gint          n_fds);
-gint     g_main_context_check    (GMainContext *context,
-                                  gint          max_priority,
-                                  GPollFD      *fds,
-                                  gint          n_fds);
-void     g_main_context_dispatch (GMainContext *context);
-
-void     g_main_context_set_poll_func (GMainContext *context,
-                                       GPollFunc     func);
-GPollFunc g_main_context_get_poll_func (GMainContext *context);
-
-/* Low level functions for use by source implementations
- */
-void     g_main_context_add_poll    (GMainContext *context,
-                                     GPollFD      *fd,
-                                     gint          priority);
-void     g_main_context_remove_poll (GMainContext *context,
-                                     GPollFD      *fd);
-
-gint     g_main_depth               (void);
-GSource *g_main_current_source      (void);
-
-/* GMainContexts for other threads
- */
-void          g_main_context_push_thread_default (GMainContext *context);
-void          g_main_context_pop_thread_default  (GMainContext *context);
-GMainContext *g_main_context_get_thread_default  (void);
-
-/* GMainLoop: */
-
-GMainLoop *g_main_loop_new        (GMainContext *context,
-                                   gboolean      is_running);
-void       g_main_loop_run        (GMainLoop    *loop);
-void       g_main_loop_quit       (GMainLoop    *loop);
-GMainLoop *g_main_loop_ref        (GMainLoop    *loop);
-void       g_main_loop_unref      (GMainLoop    *loop);
-gboolean   g_main_loop_is_running (GMainLoop    *loop);
-GMainContext *g_main_loop_get_context (GMainLoop    *loop);
-
-/* GSource: */
-
-GSource *g_source_new             (GSourceFuncs   *source_funcs,
-                                   guint           struct_size);
-GSource *g_source_ref             (GSource        *source);
-void     g_source_unref           (GSource        *source);
-
-guint    g_source_attach          (GSource        *source,
-                                   GMainContext   *context);
-void     g_source_destroy         (GSource        *source);
-
-void     g_source_set_priority    (GSource        *source,
-                                   gint            priority);
-gint     g_source_get_priority    (GSource        *source);
-void     g_source_set_can_recurse (GSource        *source,
-                                   gboolean        can_recurse);
-gboolean g_source_get_can_recurse (GSource        *source);
-guint    g_source_get_id          (GSource        *source);
-
-GMainContext *g_source_get_context (GSource       *source);
-
-void     g_source_set_callback    (GSource        *source,
-                                   GSourceFunc     func,
-                                   gpointer        data,
-                                   GDestroyNotify  notify);
-
-void     g_source_set_funcs       (GSource        *source,
-                                   GSourceFuncs   *funcs);
-gboolean g_source_is_destroyed    (GSource        *source);
-
-void                 g_source_set_name       (GSource        *source,
-                                              const char     *name);
-G_CONST_RETURN char* g_source_get_name       (GSource        *source);
-void                 g_source_set_name_by_id (guint           tag,
-                                              const char     *name);
-
-
-/* Used to implement g_source_connect_closure and internally*/
-void g_source_set_callback_indirect (GSource              *source,
-                                     gpointer              callback_data,
-                                     GSourceCallbackFuncs *callback_funcs);
-
-void     g_source_add_poll         (GSource        *source,
-                                    GPollFD        *fd);
-void     g_source_remove_poll      (GSource        *source,
-                                    GPollFD        *fd);
-
-void     g_source_get_current_time (GSource        *source,
-                                    GTimeVal       *timeval);
-
- /* void g_source_connect_closure (GSource        *source,
-                                  GClosure       *closure);
- */
-
-/* Specific source types
- */
-GSource *g_idle_source_new        (void);
-GSource *g_child_watch_source_new (GPid pid);
-GSource *g_timeout_source_new     (guint interval);
-GSource *g_timeout_source_new_seconds (guint interval);
-
-/* Miscellaneous functions
- */
-void g_get_current_time                 (GTimeVal       *result);
-
-/* ============== Compat main loop stuff ================== */
-
-#ifndef G_DISABLE_DEPRECATED
-
-/**
- * g_main_new:
- * @is_running: set to %TRUE to indicate that the loop is running. This
- *     is not very important since calling g_main_run() will set this
- *     to %TRUE anyway.
- *
- * Creates a new #GMainLoop for th default main context.
- *
- * Returns: a new #GMainLoop
- *
- * Deprecated: 2.2: Use g_main_loop_new() instead
- */
-#define         g_main_new(is_running)  g_main_loop_new (NULL, is_running)
-
-/**
- * g_main_run:
- * @loop: a #GMainLoop
- *
- * Runs a main loop until it stops running.
- *
- * Deprecated: 2.2: Use g_main_loop_run() instead
- */
-#define         g_main_run(loop)        g_main_loop_run(loop)
-
-/**
- * g_main_quit:
- * @loop: a #GMainLoop
- *
- * Stops the #GMainLoop.
- * If g_main_run() was called to run the #GMainLoop, it will now return.
- *
- * Deprecated: 2.2: Use g_main_loop_quit() instead
- */
-#define g_main_quit(loop)       g_main_loop_quit(loop)
-
-/**
- * g_main_destroy:
- * @loop: a #GMainLoop
- *
- * Frees the memory allocated for the #GMainLoop.
- *
- * Deprecated: 2.2: Use g_main_loop_unref() instead
- */
-#define g_main_destroy(loop)    g_main_loop_unref(loop)
-
-/**
- * g_main_is_running:
- * @loop: a #GMainLoop
- *
- * Checks if the main loop is running.
- *
- * Returns: %TRUE if the main loop is running
- *
- * Deprecated: 2.2: Use g_main_loop_is_running() instead
- */
-#define g_main_is_running(loop) g_main_loop_is_running(loop)
-
-/**
- * g_main_iteration:
- * @may_block: set to %TRUE if it should block (i.e. wait) until an event
- *     source becomes ready. It will return after an event source has been
- *     processed. If set to %FALSE it will return immediately if no event
- *     source is ready to be processed.
- *
- * Runs a single iteration for the default #GMainContext.
- *
- * Returns: %TRUE if more events are pending.
- *
- * Deprecated: 2.2: Use g_main_context_iteration() instead.
- */
-#define g_main_iteration(may_block) g_main_context_iteration (NULL, may_block)
-
-/**
- * g_main_pending:
- *
- * Checks if any events are pending for the default #GMainContext
- * (i.e. ready to be processed).
- *
- * Returns: %TRUE if any events are pending.
- *
- * Deprected: 2.2: Use g_main_context_pending() instead.
- */
-#define g_main_pending()            g_main_context_pending (NULL)
-
-/**
- * g_main_set_poll_func:
- * @func: the function to call to poll all file descriptors
- *
- * Sets the function to use for the handle polling of file descriptors
- * for the default main context.
- *
- * Deprecated: 2.2: Use g_main_context_set_poll_func() again
- */
-#define g_main_set_poll_func(func)  g_main_context_set_poll_func (NULL, func)
-
-#endif /* G_DISABLE_DEPRECATED */
-
-/* Source manipulation by ID */
-gboolean g_source_remove                     (guint          tag);
-gboolean g_source_remove_by_user_data        (gpointer       user_data);
-gboolean g_source_remove_by_funcs_user_data  (GSourceFuncs  *funcs,
-                                              gpointer       user_data);
-
-/* Idles, child watchers and timeouts */
-guint    g_timeout_add_full         (gint            priority,
-                                     guint           interval,
-                                     GSourceFunc     function,
-                                     gpointer        data,
-                                     GDestroyNotify  notify);
-guint    g_timeout_add              (guint           interval,
-                                     GSourceFunc     function,
-                                     gpointer        data);
-guint    g_timeout_add_seconds_full (gint            priority,
-                                     guint           interval,
-                                     GSourceFunc     function,
-                                     gpointer        data,
-                                     GDestroyNotify  notify);
-guint    g_timeout_add_seconds      (guint           interval,
-                                     GSourceFunc     function,
-                                     gpointer        data);
-guint    g_child_watch_add_full     (gint            priority,
-                                     GPid            pid,
-                                     GChildWatchFunc function,
-                                     gpointer        data,
-                                     GDestroyNotify  notify);
-guint    g_child_watch_add          (GPid            pid,
-                                     GChildWatchFunc function,
-                                     gpointer        data);
-guint    g_idle_add                 (GSourceFunc     function,
-                                     gpointer        data);
-guint    g_idle_add_full            (gint            priority,
-                                     GSourceFunc     function,
-                                     gpointer        data,
-                                     GDestroyNotify  notify);
-gboolean g_idle_remove_by_data      (gpointer        data);
-
-/* Hook for GClosure / GSource integration. Don't touch */
-GLIB_VAR GSourceFuncs g_timeout_funcs;
-GLIB_VAR GSourceFuncs g_child_watch_funcs;
-GLIB_VAR GSourceFuncs g_idle_funcs;
-
-G_END_DECLS
-
-#endif /* __G_MAIN_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gmappedfile.h b/protocols/Sametime/src/glib/include/glib/gmappedfile.h
deleted file mode 100644
index dbb3f89e6a..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gmappedfile.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * gmappedfile.h: Simplified wrapper around the mmap function
- *
- * Copyright 2005 Matthias Clasen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_MAPPED_FILE_H__
-#define __G_MAPPED_FILE_H__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GMappedFile GMappedFile;
-
-GMappedFile *g_mapped_file_new          (const gchar  *filename,
-				         gboolean      writable,
-				         GError      **error) G_GNUC_MALLOC;
-gsize        g_mapped_file_get_length   (GMappedFile  *file);
-gchar       *g_mapped_file_get_contents (GMappedFile  *file);
-GMappedFile *g_mapped_file_ref          (GMappedFile  *file);
-void         g_mapped_file_unref        (GMappedFile  *file);
-
-#ifndef G_DISABLE_DEPRECATED
-void         g_mapped_file_free         (GMappedFile  *file);
-#endif
-
-G_END_DECLS
-
-#endif /* __G_MAPPED_FILE_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gmarkup.h b/protocols/Sametime/src/glib/include/glib/gmarkup.h
deleted file mode 100644
index 7bfc08641c..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gmarkup.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* gmarkup.h - Simple XML-like string parser/writer
- *
- *  Copyright 2000 Red Hat, Inc.
- *
- * GLib is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_MARKUP_H__
-#define __G_MARKUP_H__
-
-#include <stdarg.h>
-
-#include <glib/gerror.h>
-#include <glib/gslist.h>
-
-G_BEGIN_DECLS
-
-typedef enum
-{
-  G_MARKUP_ERROR_BAD_UTF8,
-  G_MARKUP_ERROR_EMPTY,
-  G_MARKUP_ERROR_PARSE,
-  /* The following are primarily intended for specific GMarkupParser
-   * implementations to set.
-   */
-  G_MARKUP_ERROR_UNKNOWN_ELEMENT,
-  G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
-  G_MARKUP_ERROR_INVALID_CONTENT,
-  G_MARKUP_ERROR_MISSING_ATTRIBUTE
-} GMarkupError;
-
-#define G_MARKUP_ERROR g_markup_error_quark ()
-
-GQuark g_markup_error_quark (void);
-
-typedef enum
-{
-  G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG = 1 << 0,
-  G_MARKUP_TREAT_CDATA_AS_TEXT              = 1 << 1,
-  G_MARKUP_PREFIX_ERROR_POSITION            = 1 << 2
-} GMarkupParseFlags;
-
-typedef struct _GMarkupParseContext GMarkupParseContext;
-typedef struct _GMarkupParser GMarkupParser;
-
-struct _GMarkupParser
-{
-  /* Called for open tags <foo bar="baz"> */
-  void (*start_element)  (GMarkupParseContext *context,
-                          const gchar         *element_name,
-                          const gchar        **attribute_names,
-                          const gchar        **attribute_values,
-                          gpointer             user_data,
-                          GError             **error);
-
-  /* Called for close tags </foo> */
-  void (*end_element)    (GMarkupParseContext *context,
-                          const gchar         *element_name,
-                          gpointer             user_data,
-                          GError             **error);
-
-  /* Called for character data */
-  /* text is not nul-terminated */
-  void (*text)           (GMarkupParseContext *context,
-                          const gchar         *text,
-                          gsize                text_len,  
-                          gpointer             user_data,
-                          GError             **error);
-
-  /* Called for strings that should be re-saved verbatim in this same
-   * position, but are not otherwise interpretable.  At the moment
-   * this includes comments and processing instructions.
-   */
-  /* text is not nul-terminated. */
-  void (*passthrough)    (GMarkupParseContext *context,
-                          const gchar         *passthrough_text,
-                          gsize                text_len,  
-                          gpointer             user_data,
-                          GError             **error);
-
-  /* Called on error, including one set by other
-   * methods in the vtable. The GError should not be freed.
-   */
-  void (*error)          (GMarkupParseContext *context,
-                          GError              *error,
-                          gpointer             user_data);
-};
-
-GMarkupParseContext *g_markup_parse_context_new   (const GMarkupParser *parser,
-                                                   GMarkupParseFlags    flags,
-                                                   gpointer             user_data,
-                                                   GDestroyNotify       user_data_dnotify);
-void                 g_markup_parse_context_free  (GMarkupParseContext *context);
-gboolean             g_markup_parse_context_parse (GMarkupParseContext *context,
-                                                   const gchar         *text,
-                                                   gssize               text_len,  
-                                                   GError             **error);
-void                 g_markup_parse_context_push  (GMarkupParseContext *context,
-                                                   const GMarkupParser *parser,
-                                                   gpointer             user_data);
-gpointer             g_markup_parse_context_pop   (GMarkupParseContext *context);
-                                                   
-gboolean             g_markup_parse_context_end_parse (GMarkupParseContext *context,
-                                                       GError             **error);
-G_CONST_RETURN gchar *g_markup_parse_context_get_element (GMarkupParseContext *context);
-G_CONST_RETURN GSList *g_markup_parse_context_get_element_stack (GMarkupParseContext *context);
-
-/* For user-constructed error messages, has no precise semantics */
-void                 g_markup_parse_context_get_position (GMarkupParseContext *context,
-                                                          gint                *line_number,
-                                                          gint                *char_number);
-gpointer             g_markup_parse_context_get_user_data (GMarkupParseContext *context);
-
-/* useful when saving */
-gchar* g_markup_escape_text (const gchar *text,
-                             gssize       length);  
-
-gchar *g_markup_printf_escaped (const char *format,
-				...) G_GNUC_PRINTF (1, 2);
-gchar *g_markup_vprintf_escaped (const char *format,
-				 va_list     args);
-
-typedef enum
-{
-  G_MARKUP_COLLECT_INVALID,
-  G_MARKUP_COLLECT_STRING,
-  G_MARKUP_COLLECT_STRDUP,
-  G_MARKUP_COLLECT_BOOLEAN,
-  G_MARKUP_COLLECT_TRISTATE,
-
-  G_MARKUP_COLLECT_OPTIONAL = (1 << 16)
-} GMarkupCollectType;
-
-
-/* useful from start_element */
-gboolean   g_markup_collect_attributes (const gchar         *element_name,
-                                        const gchar        **attribute_names,
-                                        const gchar        **attribute_values,
-                                        GError             **error,
-                                        GMarkupCollectType   first_type,
-                                        const gchar         *first_attr,
-                                        ...);
-
-G_END_DECLS
-
-#endif /* __G_MARKUP_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gmem.h b/protocols/Sametime/src/glib/include/glib/gmem.h
deleted file mode 100644
index 01d953e6c5..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gmem.h
+++ /dev/null
@@ -1,309 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_MEM_H__
-#define __G_MEM_H__
-
-#include <glib/gslice.h>
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GMemVTable:
- * @malloc: function to use for allocating memory.
- * @realloc: function to use for reallocating memory.
- * @free: function to use to free memory.
- * @calloc: function to use for allocating zero-filled memory.
- * @try_malloc: function to use for allocating memory without a default error handler.
- * @try_realloc: function to use for reallocating memory without a default error handler.
- * 
- * A set of functions used to perform memory allocation. The same #GMemVTable must
- * be used for all allocations in the same program; a call to g_mem_set_vtable(),
- * if it exists, should be prior to any use of GLib.
- */
-typedef struct _GMemVTable GMemVTable;
-
-
-#if GLIB_SIZEOF_VOID_P > GLIB_SIZEOF_LONG
-/**
- * G_MEM_ALIGN:
- * 
- * Indicates the number of bytes to which memory will be aligned on the
- * current platform.
- */
-#  define G_MEM_ALIGN	GLIB_SIZEOF_VOID_P
-#else	/* GLIB_SIZEOF_VOID_P <= GLIB_SIZEOF_LONG */
-#  define G_MEM_ALIGN	GLIB_SIZEOF_LONG
-#endif	/* GLIB_SIZEOF_VOID_P <= GLIB_SIZEOF_LONG */
-
-
-/* Memory allocation functions
- */
-
-void	 g_free	          (gpointer	 mem);
-
-gpointer g_malloc         (gsize	 n_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-gpointer g_malloc0        (gsize	 n_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-gpointer g_realloc        (gpointer	 mem,
-			   gsize	 n_bytes) G_GNUC_WARN_UNUSED_RESULT;
-gpointer g_try_malloc     (gsize	 n_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-gpointer g_try_malloc0    (gsize	 n_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-gpointer g_try_realloc    (gpointer	 mem,
-			   gsize	 n_bytes) G_GNUC_WARN_UNUSED_RESULT;
-
-gpointer g_malloc_n       (gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE2(1,2);
-gpointer g_malloc0_n      (gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE2(1,2);
-gpointer g_realloc_n      (gpointer	 mem,
-			   gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_WARN_UNUSED_RESULT;
-gpointer g_try_malloc_n   (gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE2(1,2);
-gpointer g_try_malloc0_n  (gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE2(1,2);
-gpointer g_try_realloc_n  (gpointer	 mem,
-			   gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_WARN_UNUSED_RESULT;
-
-
-/* Optimise: avoid the call to the (slower) _n function if we can
- * determine at compile-time that no overflow happens.
- */
-#if defined (__GNUC__) && (__GNUC__ >= 2) && defined (__OPTIMIZE__)
-#  define _G_NEW(struct_type, n_structs, func) \
-	(struct_type *) (__extension__ ({			\
-	  gsize __n = (gsize) (n_structs);			\
-	  gsize __s = sizeof (struct_type);			\
-	  gpointer __p;						\
-	  if (__s == 1)						\
-	    __p = g_##func (__n);				\
-	  else if (__builtin_constant_p (__n) &&		\
-	           (__s == 0 || __n <= G_MAXSIZE / __s))	\
-	    __p = g_##func (__n * __s);				\
-	  else							\
-	    __p = g_##func##_n (__n, __s);			\
-	  __p;							\
-	}))
-#  define _G_RENEW(struct_type, mem, n_structs, func) \
-	(struct_type *) (__extension__ ({			\
-	  gsize __n = (gsize) (n_structs);			\
-	  gsize __s = sizeof (struct_type);			\
-	  gpointer __p = (gpointer) (mem);			\
-	  if (__s == 1)						\
-	    __p = g_##func (__p, __n);				\
-	  else if (__builtin_constant_p (__n) &&		\
-	           (__s == 0 || __n <= G_MAXSIZE / __s))	\
-	    __p = g_##func (__p, __n * __s);			\
-	  else							\
-	    __p = g_##func##_n (__p, __n, __s);			\
-	  __p;							\
-	}))
-
-#else
-
-/* Unoptimised version: always call the _n() function. */
-
-#define _G_NEW(struct_type, n_structs, func) \
-        ((struct_type *) g_##func##_n ((n_structs), sizeof (struct_type)))
-#define _G_RENEW(struct_type, mem, n_structs, func) \
-        ((struct_type *) g_##func##_n (mem, (n_structs), sizeof (struct_type)))
-
-#endif
-
-/**
- * g_new:
- * @struct_type: the type of the elements to allocate
- * @n_structs: the number of elements to allocate
- * 
- * Allocates @n_structs elements of type @struct_type.
- * The returned pointer is cast to a pointer to the given type.
- * If @n_structs is 0 it returns %NULL.
- * Care is taken to avoid overflow when calculating the size of the allocated block.
- * 
- * Since the returned pointer is already casted to the right type,
- * it is normally unnecessary to cast it explicitly, and doing
- * so might hide memory allocation errors.
- * 
- * Returns: a pointer to the allocated memory, cast to a pointer to @struct_type
- */
-#define g_new(struct_type, n_structs)			_G_NEW (struct_type, n_structs, malloc)
-/**
- * g_new0:
- * @struct_type: the type of the elements to allocate.
- * @n_structs: the number of elements to allocate.
- * 
- * Allocates @n_structs elements of type @struct_type, initialized to 0's.
- * The returned pointer is cast to a pointer to the given type.
- * If @n_structs is 0 it returns %NULL.
- * Care is taken to avoid overflow when calculating the size of the allocated block.
- * 
- * Since the returned pointer is already casted to the right type,
- * it is normally unnecessary to cast it explicitly, and doing
- * so might hide memory allocation errors.
- * 
- * Returns: a pointer to the allocated memory, cast to a pointer to @struct_type.
- */
-#define g_new0(struct_type, n_structs)			_G_NEW (struct_type, n_structs, malloc0)
-/**
- * g_renew:
- * @struct_type: the type of the elements to allocate
- * @mem: the currently allocated memory
- * @n_structs: the number of elements to allocate
- * 
- * Reallocates the memory pointed to by @mem, so that it now has space for
- * @n_structs elements of type @struct_type. It returns the new address of
- * the memory, which may have been moved.
- * Care is taken to avoid overflow when calculating the size of the allocated block.
- * 
- * Returns: a pointer to the new allocated memory, cast to a pointer to @struct_type
- */
-#define g_renew(struct_type, mem, n_structs)		_G_RENEW (struct_type, mem, n_structs, realloc)
-/**
- * g_try_new:
- * @struct_type: the type of the elements to allocate
- * @n_structs: the number of elements to allocate
- * 
- * Attempts to allocate @n_structs elements of type @struct_type, and returns
- * %NULL on failure. Contrast with g_new(), which aborts the program on failure.
- * The returned pointer is cast to a pointer to the given type.
- * The function returns %NULL when @n_structs is 0 of if an overflow occurs.
- * 
- * Since: 2.8
- * Returns: a pointer to the allocated memory, cast to a pointer to @struct_type
- */
-#define g_try_new(struct_type, n_structs)		_G_NEW (struct_type, n_structs, try_malloc)
-/**
- * g_try_new0:
- * @struct_type: the type of the elements to allocate
- * @n_structs: the number of elements to allocate
- * 
- * Attempts to allocate @n_structs elements of type @struct_type, initialized
- * to 0's, and returns %NULL on failure. Contrast with g_new0(), which aborts
- * the program on failure.
- * The returned pointer is cast to a pointer to the given type.
- * The function returns %NULL when @n_structs is 0 of if an overflow occurs.
- * 
- * Since: 2.8
- * Returns: a pointer to the allocated memory, cast to a pointer to @struct_type
- */
-#define g_try_new0(struct_type, n_structs)		_G_NEW (struct_type, n_structs, try_malloc0)
-/**
- * g_try_renew:
- * @struct_type: the type of the elements to allocate
- * @mem: the currently allocated memory
- * @n_structs: the number of elements to allocate
- * 
- * Attempts to reallocate the memory pointed to by @mem, so that it now has
- * space for @n_structs elements of type @struct_type, and returns %NULL on
- * failure. Contrast with g_renew(), which aborts the program on failure.
- * It returns the new address of the memory, which may have been moved.
- * The function returns %NULL if an overflow occurs.
- * 
- * Since: 2.8
- * Returns: a pointer to the new allocated memory, cast to a pointer to @struct_type
- */
-#define g_try_renew(struct_type, mem, n_structs)	_G_RENEW (struct_type, mem, n_structs, try_realloc)
-
-
-/* Memory allocation virtualization for debugging purposes
- * g_mem_set_vtable() has to be the very first GLib function called
- * if being used
- */
-struct _GMemVTable {
-  gpointer (*malloc)      (gsize    n_bytes);
-  gpointer (*realloc)     (gpointer mem,
-			   gsize    n_bytes);
-  void     (*free)        (gpointer mem);
-  /* optional; set to NULL if not used ! */
-  gpointer (*calloc)      (gsize    n_blocks,
-			   gsize    n_block_bytes);
-  gpointer (*try_malloc)  (gsize    n_bytes);
-  gpointer (*try_realloc) (gpointer mem,
-			   gsize    n_bytes);
-};
-void	 g_mem_set_vtable (GMemVTable	*vtable);
-gboolean g_mem_is_system_malloc (void);
-
-GLIB_VAR gboolean g_mem_gc_friendly;
-
-/* Memory profiler and checker, has to be enabled via g_mem_set_vtable()
- */
-GLIB_VAR GMemVTable	*glib_mem_profiler_table;
-void	g_mem_profile	(void);
-
-
-/* deprecated memchunks and allocators */
-#if !defined (G_DISABLE_DEPRECATED) || defined (GTK_COMPILATION) || defined (GDK_COMPILATION)
-typedef struct _GAllocator GAllocator;
-typedef struct _GMemChunk  GMemChunk;
-#define g_mem_chunk_create(type, pre_alloc, alloc_type)	( \
-  g_mem_chunk_new (#type " mem chunks (" #pre_alloc ")", \
-		   sizeof (type), \
-		   sizeof (type) * (pre_alloc), \
-		   (alloc_type)) \
-)
-#define g_chunk_new(type, chunk)	( \
-  (type *) g_mem_chunk_alloc (chunk) \
-)
-#define g_chunk_new0(type, chunk)	( \
-  (type *) g_mem_chunk_alloc0 (chunk) \
-)
-#define g_chunk_free(mem, mem_chunk)	G_STMT_START { \
-  g_mem_chunk_free ((mem_chunk), (mem)); \
-} G_STMT_END
-#define G_ALLOC_ONLY	  1
-#define G_ALLOC_AND_FREE  2
-GMemChunk* g_mem_chunk_new     (const gchar *name,
-				gint         atom_size,
-				gsize        area_size,
-				gint         type);
-void       g_mem_chunk_destroy (GMemChunk   *mem_chunk);
-gpointer   g_mem_chunk_alloc   (GMemChunk   *mem_chunk);
-gpointer   g_mem_chunk_alloc0  (GMemChunk   *mem_chunk);
-void       g_mem_chunk_free    (GMemChunk   *mem_chunk,
-				gpointer     mem);
-void       g_mem_chunk_clean   (GMemChunk   *mem_chunk);
-void       g_mem_chunk_reset   (GMemChunk   *mem_chunk);
-void       g_mem_chunk_print   (GMemChunk   *mem_chunk);
-void       g_mem_chunk_info    (void);
-void	   g_blow_chunks       (void);
-GAllocator*g_allocator_new     (const gchar  *name,
-				guint         n_preallocs);
-void       g_allocator_free    (GAllocator   *allocator);
-#define	G_ALLOCATOR_LIST       (1)
-#define	G_ALLOCATOR_SLIST      (2)
-#define	G_ALLOCATOR_NODE       (3)
-#endif /* G_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __G_MEM_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gmessages.h b/protocols/Sametime/src/glib/include/glib/gmessages.h
deleted file mode 100644
index 9acaec6375..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gmessages.h
+++ /dev/null
@@ -1,343 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_MESSAGES_H__
-#define __G_MESSAGES_H__
-
-#include <stdarg.h>
-#include <glib/gtypes.h>
-#include <glib/gmacros.h>
-
-/* Suppress warnings when GCC is in -pedantic mode and not -std=c99
- */
-#if (__GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96))
-#pragma GCC system_header
-#endif
-
-G_BEGIN_DECLS
-
-/* calculate a string size, guaranteed to fit format + args.
- */
-gsize	g_printf_string_upper_bound (const gchar* format,
-				     va_list	  args);
-
-/* Log level shift offset for user defined
- * log levels (0-7 are used by GLib).
- */
-#define G_LOG_LEVEL_USER_SHIFT  (8)
-
-/* Glib log levels and flags.
- */
-typedef enum
-{
-  /* log flags */
-  G_LOG_FLAG_RECURSION          = 1 << 0,
-  G_LOG_FLAG_FATAL              = 1 << 1,
-
-  /* GLib log levels */
-  G_LOG_LEVEL_ERROR             = 1 << 2,       /* always fatal */
-  G_LOG_LEVEL_CRITICAL          = 1 << 3,
-  G_LOG_LEVEL_WARNING           = 1 << 4,
-  G_LOG_LEVEL_MESSAGE           = 1 << 5,
-  G_LOG_LEVEL_INFO              = 1 << 6,
-  G_LOG_LEVEL_DEBUG             = 1 << 7,
-
-  G_LOG_LEVEL_MASK              = ~(G_LOG_FLAG_RECURSION | G_LOG_FLAG_FATAL)
-} GLogLevelFlags;
-
-/* GLib log levels that are considered fatal by default */
-#define G_LOG_FATAL_MASK        (G_LOG_FLAG_RECURSION | G_LOG_LEVEL_ERROR)
-
-typedef void            (*GLogFunc)             (const gchar   *log_domain,
-                                                 GLogLevelFlags log_level,
-                                                 const gchar   *message,
-                                                 gpointer       user_data);
-
-/* Logging mechanism
- */
-guint           g_log_set_handler       (const gchar    *log_domain,
-                                         GLogLevelFlags  log_levels,
-                                         GLogFunc        log_func,
-                                         gpointer        user_data);
-void            g_log_remove_handler    (const gchar    *log_domain,
-                                         guint           handler_id);
-void            g_log_default_handler   (const gchar    *log_domain,
-                                         GLogLevelFlags  log_level,
-                                         const gchar    *message,
-                                         gpointer        unused_data);
-GLogFunc        g_log_set_default_handler (GLogFunc      log_func,
-					   gpointer      user_data);
-void            g_log                   (const gchar    *log_domain,
-                                         GLogLevelFlags  log_level,
-                                         const gchar    *format,
-                                         ...) G_GNUC_PRINTF (3, 4);
-void            g_logv                  (const gchar    *log_domain,
-                                         GLogLevelFlags  log_level,
-                                         const gchar    *format,
-                                         va_list         args);
-GLogLevelFlags  g_log_set_fatal_mask    (const gchar    *log_domain,
-                                         GLogLevelFlags  fatal_mask);
-GLogLevelFlags  g_log_set_always_fatal  (GLogLevelFlags  fatal_mask);
-
-/* internal */
-G_GNUC_INTERNAL void	_g_log_fallback_handler	(const gchar   *log_domain,
-						 GLogLevelFlags log_level,
-						 const gchar   *message,
-						 gpointer       unused_data);
-
-/* Internal functions, used to implement the following macros */
-void g_return_if_fail_warning (const char *log_domain,
-			       const char *pretty_function,
-			       const char *expression);
-void g_warn_message           (const char     *domain,
-                               const char     *file,
-                               int             line,
-                               const char     *func,
-                               const char     *warnexpr);
-#ifndef G_DISABLE_DEPRECATED
-void g_assert_warning         (const char *log_domain,
-			       const char *file,
-			       const int   line,
-		               const char *pretty_function,
-		               const char *expression) G_GNUC_NORETURN;
-#endif /* !G_DISABLE_DEPRECATED */
-
-
-#ifndef G_LOG_DOMAIN
-#define G_LOG_DOMAIN    ((gchar*) 0)
-#endif  /* G_LOG_DOMAIN */
-#ifdef G_HAVE_ISO_VARARGS
-/* for(;;) ; so that GCC knows that control doesn't go past g_error().
- * Put space before ending semicolon to avoid C++ build warnings.
- */
-#define g_error(...)  G_STMT_START {                 \
-                        g_log (G_LOG_DOMAIN,         \
-                               G_LOG_LEVEL_ERROR,    \
-                               __VA_ARGS__);         \
-                        for (;;) ;                   \
-                      } G_STMT_END
-                        
-#define g_message(...)  g_log (G_LOG_DOMAIN,         \
-                               G_LOG_LEVEL_MESSAGE,  \
-                               __VA_ARGS__)
-#define g_critical(...) g_log (G_LOG_DOMAIN,         \
-                               G_LOG_LEVEL_CRITICAL, \
-                               __VA_ARGS__)
-#define g_warning(...)  g_log (G_LOG_DOMAIN,         \
-                               G_LOG_LEVEL_WARNING,  \
-                               __VA_ARGS__)
-#define g_debug(...)    g_log (G_LOG_DOMAIN,         \
-                               G_LOG_LEVEL_DEBUG,    \
-                               __VA_ARGS__)
-#elif defined(G_HAVE_GNUC_VARARGS)
-#define g_error(format...)    G_STMT_START {                 \
-                                g_log (G_LOG_DOMAIN,         \
-                                       G_LOG_LEVEL_ERROR,    \
-                                       format);              \
-                                for (;;) ;                   \
-                              } G_STMT_END
-                              
-#define g_message(format...)    g_log (G_LOG_DOMAIN,         \
-                                       G_LOG_LEVEL_MESSAGE,  \
-                                       format)
-#define g_critical(format...)   g_log (G_LOG_DOMAIN,         \
-                                       G_LOG_LEVEL_CRITICAL, \
-                                       format)
-#define g_warning(format...)    g_log (G_LOG_DOMAIN,         \
-                                       G_LOG_LEVEL_WARNING,  \
-                                       format)
-#define g_debug(format...)      g_log (G_LOG_DOMAIN,         \
-                                       G_LOG_LEVEL_DEBUG,    \
-                                       format)
-#else   /* no varargs macros */
-static void
-g_error (const gchar *format,
-         ...)
-{
-  va_list args;
-  va_start (args, format);
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, format, args);
-  va_end (args);
-
-  for(;;) ;
-}
-static void
-g_message (const gchar *format,
-           ...)
-{
-  va_list args;
-  va_start (args, format);
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, format, args);
-  va_end (args);
-}
-static void
-g_critical (const gchar *format,
-            ...)
-{
-  va_list args;
-  va_start (args, format);
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, format, args);
-  va_end (args);
-}
-static void
-g_warning (const gchar *format,
-           ...)
-{
-  va_list args;
-  va_start (args, format);
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, format, args);
-  va_end (args);
-}
-static void
-g_debug (const gchar *format,
-         ...)
-{
-  va_list args;
-  va_start (args, format);
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format, args);
-  va_end (args);
-}
-#endif  /* !__GNUC__ */
-
-typedef void    (*GPrintFunc)           (const gchar    *string);
-void            g_print                 (const gchar    *format,
-                                         ...) G_GNUC_PRINTF (1, 2);
-GPrintFunc      g_set_print_handler     (GPrintFunc      func);
-void            g_printerr              (const gchar    *format,
-                                         ...) G_GNUC_PRINTF (1, 2);
-GPrintFunc      g_set_printerr_handler  (GPrintFunc      func);
-
-
-/* Provide macros for graceful error handling.
- * The "return" macros will return from the current function.
- * Two different definitions are given for the macros in
- * order to support gcc's __PRETTY_FUNCTION__ capability.
- */
-
-#define g_warn_if_reached()     do { g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, NULL); } while (0)
-#define g_warn_if_fail(expr)    do { if G_LIKELY (expr) ; else \
-                                       g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, #expr); } while (0)
-
-#ifdef G_DISABLE_CHECKS
-
-#define g_return_if_fail(expr)			G_STMT_START{ (void)0; }G_STMT_END
-#define g_return_val_if_fail(expr,val)		G_STMT_START{ (void)0; }G_STMT_END
-#define g_return_if_reached()			G_STMT_START{ return; }G_STMT_END
-#define g_return_val_if_reached(val)		G_STMT_START{ return (val); }G_STMT_END
-
-#else /* !G_DISABLE_CHECKS */
-
-#ifdef __GNUC__
-
-#define g_return_if_fail(expr)		G_STMT_START{			\
-     if G_LIKELY(expr) { } else       					\
-       {								\
-	 g_return_if_fail_warning (G_LOG_DOMAIN,			\
-		                   __PRETTY_FUNCTION__,		        \
-		                   #expr);				\
-	 return;							\
-       };				}G_STMT_END
-
-#define g_return_val_if_fail(expr,val)	G_STMT_START{			\
-     if G_LIKELY(expr) { } else						\
-       {								\
-	 g_return_if_fail_warning (G_LOG_DOMAIN,			\
-		                   __PRETTY_FUNCTION__,		        \
-		                   #expr);				\
-	 return (val);							\
-       };				}G_STMT_END
-
-#define g_return_if_reached()		G_STMT_START{			\
-     g_log (G_LOG_DOMAIN,						\
-	    G_LOG_LEVEL_CRITICAL,					\
-	    "file %s: line %d (%s): should not be reached",		\
-	    __FILE__,							\
-	    __LINE__,							\
-	    __PRETTY_FUNCTION__);					\
-     return;				}G_STMT_END
-
-#define g_return_val_if_reached(val)	G_STMT_START{			\
-     g_log (G_LOG_DOMAIN,						\
-	    G_LOG_LEVEL_CRITICAL,					\
-	    "file %s: line %d (%s): should not be reached",		\
-	    __FILE__,							\
-	    __LINE__,							\
-	    __PRETTY_FUNCTION__);					\
-     return (val);			}G_STMT_END
-
-#else /* !__GNUC__ */
-
-#define g_return_if_fail(expr)		G_STMT_START{		\
-     if (expr) { } else						\
-       {							\
-	 g_log (G_LOG_DOMAIN,					\
-		G_LOG_LEVEL_CRITICAL,				\
-		"file %s: line %d: assertion `%s' failed",	\
-		__FILE__,					\
-		__LINE__,					\
-		#expr);						\
-	 return;						\
-       };				}G_STMT_END
-
-#define g_return_val_if_fail(expr, val)	G_STMT_START{		\
-     if (expr) { } else						\
-       {							\
-	 g_log (G_LOG_DOMAIN,					\
-		G_LOG_LEVEL_CRITICAL,				\
-		"file %s: line %d: assertion `%s' failed",	\
-		__FILE__,					\
-		__LINE__,					\
-		#expr);						\
-	 return (val);						\
-       };				}G_STMT_END
-
-#define g_return_if_reached()		G_STMT_START{		\
-     g_log (G_LOG_DOMAIN,					\
-	    G_LOG_LEVEL_CRITICAL,				\
-	    "file %s: line %d: should not be reached",		\
-	    __FILE__,						\
-	    __LINE__);						\
-     return;				}G_STMT_END
-
-#define g_return_val_if_reached(val)	G_STMT_START{		\
-     g_log (G_LOG_DOMAIN,					\
-	    G_LOG_LEVEL_CRITICAL,				\
-	    "file %s: line %d: should not be reached",		\
-	    __FILE__,						\
-	    __LINE__);						\
-     return (val);			}G_STMT_END
-
-#endif /* !__GNUC__ */
-
-#endif /* !G_DISABLE_CHECKS */
-
-G_END_DECLS
-
-#endif /* __G_MESSAGES_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gnode.h b/protocols/Sametime/src/glib/include/glib/gnode.h
deleted file mode 100644
index 205d47c763..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gnode.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_NODE_H__
-#define __G_NODE_H__
-
-#include <glib/gmem.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GNode		GNode;
-
-/* Tree traverse flags */
-typedef enum
-{
-  G_TRAVERSE_LEAVES     = 1 << 0,
-  G_TRAVERSE_NON_LEAVES = 1 << 1,
-  G_TRAVERSE_ALL        = G_TRAVERSE_LEAVES | G_TRAVERSE_NON_LEAVES,
-  G_TRAVERSE_MASK       = 0x03,
-  G_TRAVERSE_LEAFS      = G_TRAVERSE_LEAVES,
-  G_TRAVERSE_NON_LEAFS  = G_TRAVERSE_NON_LEAVES
-} GTraverseFlags;
-
-/* Tree traverse orders */
-typedef enum
-{
-  G_IN_ORDER,
-  G_PRE_ORDER,
-  G_POST_ORDER,
-  G_LEVEL_ORDER
-} GTraverseType;
-
-typedef gboolean	(*GNodeTraverseFunc)	(GNode	       *node,
-						 gpointer	data);
-typedef void		(*GNodeForeachFunc)	(GNode	       *node,
-						 gpointer	data);
-
-/**
- * GCopyFunc:
- * @src: A pointer to the data which should be copied
- * @data: Additional data
- *
- * A function of this signature is used to copy the node data 
- * when doing a deep-copy of a tree.
- *
- * Returns: A pointer to the copy
- *
- * Since: 2.4
- */
-typedef gpointer	(*GCopyFunc)            (gconstpointer  src,
-                                                 gpointer       data);
-
-/* N-way tree implementation
- */
-struct _GNode
-{
-  gpointer data;
-  GNode	  *next;
-  GNode	  *prev;
-  GNode	  *parent;
-  GNode	  *children;
-};
-
-/**
- * G_NODE_IS_ROOT:
- * @node: a #GNode
- *
- * Returns %TRUE if a #GNode is the root of a tree.
- *
- * Returns: %TRUE if the #GNode is the root of a tree 
- *     (i.e. it has no parent or siblings)
- */
-#define	 G_NODE_IS_ROOT(node)	(((GNode*) (node))->parent == NULL && \
-				 ((GNode*) (node))->prev == NULL && \
-				 ((GNode*) (node))->next == NULL)
-
-/**
- * G_NODE_IS_LEAF:
- * @node: a #GNode
- *
- * Returns %TRUE if a #GNode is a leaf node.
- *
- * Returns: %TRUE if the #GNode is a leaf node 
- *     (i.e. it has no children)
- */
-#define	 G_NODE_IS_LEAF(node)	(((GNode*) (node))->children == NULL)
-
-GNode*	 g_node_new		(gpointer	   data);
-void	 g_node_destroy		(GNode		  *root);
-void	 g_node_unlink		(GNode		  *node);
-GNode*   g_node_copy_deep       (GNode            *node,
-				 GCopyFunc         copy_func,
-				 gpointer          data);
-GNode*   g_node_copy            (GNode            *node);
-GNode*	 g_node_insert		(GNode		  *parent,
-				 gint		   position,
-				 GNode		  *node);
-GNode*	 g_node_insert_before	(GNode		  *parent,
-				 GNode		  *sibling,
-				 GNode		  *node);
-GNode*   g_node_insert_after    (GNode            *parent,
-				 GNode            *sibling,
-				 GNode            *node); 
-GNode*	 g_node_prepend		(GNode		  *parent,
-				 GNode		  *node);
-guint	 g_node_n_nodes		(GNode		  *root,
-				 GTraverseFlags	   flags);
-GNode*	 g_node_get_root	(GNode		  *node);
-gboolean g_node_is_ancestor	(GNode		  *node,
-				 GNode		  *descendant);
-guint	 g_node_depth		(GNode		  *node);
-GNode*	 g_node_find		(GNode		  *root,
-				 GTraverseType	   order,
-				 GTraverseFlags	   flags,
-				 gpointer	   data);
-
-/* convenience macros */
-/**
- * g_node_append:
- * @parent: the #GNode to place the new #GNode under
- * @node: the #GNode to insert
- *
- * Inserts a #GNode as the last child of the given parent.
- *
- * Returns: the inserted #GNode
- */
-#define g_node_append(parent, node)				\
-     g_node_insert_before ((parent), NULL, (node))
-
-/**
- * g_node_insert_data:
- * @parent: the #GNode to place the new #GNode under
- * @position: the position to place the new #GNode at. If position is -1, 
- *     the new #GNode is inserted as the last child of @parent
- * @data: the data for the new #GNode
- *
- * Inserts a new #GNode at the given position.
- *
- * Returns: the new #GNode
- */
-#define	g_node_insert_data(parent, position, data)		\
-     g_node_insert ((parent), (position), g_node_new (data))
-
-/**
- * g_node_insert_data_before:
- * @parent: the #GNode to place the new #GNode under
- * @sibling: the sibling #GNode to place the new #GNode before
- * @data: the data for the new #GNode
- *
- * Inserts a new #GNode before the given sibling.
- *
- * Returns: the new #GNode
- */
-#define	g_node_insert_data_before(parent, sibling, data)	\
-     g_node_insert_before ((parent), (sibling), g_node_new (data))
-
-/**
- * g_node_prepend_data:
- * @parent: the #GNode to place the new #GNode under
- * @data: the data for the new #GNode
- *
- * Inserts a new #GNode as the first child of the given parent.
- *
- * Returns: the new #GNode
- */
-#define	g_node_prepend_data(parent, data)			\
-     g_node_prepend ((parent), g_node_new (data))
-
-/**
- * g_node_append_data:
- * @parent: the #GNode to place the new #GNode under
- * @data: the data for the new #GNode
- *
- * Inserts a new #GNode as the last child of the given parent.
- *
- * Returns: the new #GNode
- */
-#define	g_node_append_data(parent, data)			\
-     g_node_insert_before ((parent), NULL, g_node_new (data))
-
-/* traversal function, assumes that `node' is root
- * (only traverses `node' and its subtree).
- * this function is just a high level interface to
- * low level traversal functions, optimized for speed.
- */
-void	 g_node_traverse	(GNode		  *root,
-				 GTraverseType	   order,
-				 GTraverseFlags	   flags,
-				 gint		   max_depth,
-				 GNodeTraverseFunc func,
-				 gpointer	   data);
-
-/* return the maximum tree height starting with `node', this is an expensive
- * operation, since we need to visit all nodes. this could be shortened by
- * adding `guint height' to struct _GNode, but then again, this is not very
- * often needed, and would make g_node_insert() more time consuming.
- */
-guint	 g_node_max_height	 (GNode *root);
-
-void	 g_node_children_foreach (GNode		  *node,
-				  GTraverseFlags   flags,
-				  GNodeForeachFunc func,
-				  gpointer	   data);
-void	 g_node_reverse_children (GNode		  *node);
-guint	 g_node_n_children	 (GNode		  *node);
-GNode*	 g_node_nth_child	 (GNode		  *node,
-				  guint		   n);
-GNode*	 g_node_last_child	 (GNode		  *node);
-GNode*	 g_node_find_child	 (GNode		  *node,
-				  GTraverseFlags   flags,
-				  gpointer	   data);
-gint	 g_node_child_position	 (GNode		  *node,
-				  GNode		  *child);
-gint	 g_node_child_index	 (GNode		  *node,
-				  gpointer	   data);
-
-GNode*	 g_node_first_sibling	 (GNode		  *node);
-GNode*	 g_node_last_sibling	 (GNode		  *node);
-
-/**
- * g_node_prev_sibling:
- * @node: a #GNode
- *
- * Gets the previous sibling of a #GNode.
- *
- * Returns: the previous sibling of @node, or %NULL if @node is the first
- *     node or %NULL
- */
-#define	 g_node_prev_sibling(node)	((node) ? \
-					 ((GNode*) (node))->prev : NULL)
-
-/**
- * g_node_next_sibling:
- * @node: a #GNode
- *
- * Gets the next sibling of a #GNode.
- *
- * Returns: the next sibling of @node, or %NULL if @node is the last node
- *     or %NULL
- */
-#define	 g_node_next_sibling(node)	((node) ? \
-					 ((GNode*) (node))->next : NULL)
-
-/**
- * g_node_first_child:
- * @node: a #GNode
- *
- * Gets the first child of a #GNode.
- *
- * Returns: the first child of @node, or %NULL if @node is %NULL 
- *     or has no children
- */
-#define	 g_node_first_child(node)	((node) ? \
-					 ((GNode*) (node))->children : NULL)
-
-#ifndef G_DISABLE_DEPRECATED
-void     g_node_push_allocator  (gpointer          dummy);
-void     g_node_pop_allocator   (void);
-#endif
-
-G_END_DECLS
-
-#endif /* __G_NODE_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/goption.h b/protocols/Sametime/src/glib/include/glib/goption.h
deleted file mode 100644
index 557d8f7130..0000000000
--- a/protocols/Sametime/src/glib/include/glib/goption.h
+++ /dev/null
@@ -1,370 +0,0 @@
-/* goption.h - Option parser
- *
- *  Copyright (C) 2004  Anders Carlsson <andersca@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_OPTION_H__
-#define __G_OPTION_H__
-
-#include <glib/gerror.h>
-#include <glib/gquark.h>
-
-G_BEGIN_DECLS
-
-/**
- * GOptionContext:
- * 
- * A <structname>GOptionContext</structname> struct defines which options
- * are accepted by the commandline option parser. The struct has only private 
- * fields and should not be directly accessed.
- */
-typedef struct _GOptionContext GOptionContext;
-
-/**
- * GOptionGroup:
- *
- * A <structname>GOptionGroup</structname> struct defines the options in a single
- * group. The struct has only private fields and should not be directly accessed.
- *
- * All options in a group share the same translation function. Libraries which
- * need to parse commandline options are expected to provide a function for
- * getting a <structname>GOptionGroup</structname> holding their options, which
- * the application can then add to its #GOptionContext.
- */
-typedef struct _GOptionGroup   GOptionGroup;
-typedef struct _GOptionEntry   GOptionEntry;
-
-/**
- * GOptionFlags:
- * @G_OPTION_FLAG_HIDDEN: The option doesn't appear in <option>--help</option>
- *  output.
- * @G_OPTION_FLAG_IN_MAIN: The option appears in the main section of the
- *  <option>--help</option> output, even if it is defined in a group.
- * @G_OPTION_FLAG_REVERSE: For options of the %G_OPTION_ARG_NONE kind, this flag
- *  indicates that the sense of the option is reversed.
- * @G_OPTION_FLAG_NO_ARG: For options of the %G_OPTION_ARG_CALLBACK kind,
- *  this flag indicates that the callback does not take any argument
- *  (like a %G_OPTION_ARG_NONE option). Since 2.8
- * @G_OPTION_FLAG_FILENAME: For options of the %G_OPTION_ARG_CALLBACK
- *  kind, this flag indicates that the argument should be passed to the
- *  callback in the GLib filename encoding rather than UTF-8. Since 2.8
- * @G_OPTION_FLAG_OPTIONAL_ARG: For options of the %G_OPTION_ARG_CALLBACK 
- *  kind, this flag indicates that the argument supply is optional. If no argument
- *  is given then data of %GOptionParseFunc will be set to NULL. Since 2.8
- * @G_OPTION_FLAG_NOALIAS: This flag turns off the automatic conflict resolution
- *  which prefixes long option names with <literal>groupname-</literal> if 
- *  there is a conflict. This option should only be used in situations where
- *  aliasing is necessary to model some legacy commandline interface. It is
- *  not safe to use this option, unless all option groups are under your 
- *  direct control. Since 2.8.
- * 
- * Flags which modify individual options.
- */
-typedef enum
-{
-  G_OPTION_FLAG_HIDDEN		= 1 << 0,
-  G_OPTION_FLAG_IN_MAIN		= 1 << 1,
-  G_OPTION_FLAG_REVERSE		= 1 << 2,
-  G_OPTION_FLAG_NO_ARG		= 1 << 3,
-  G_OPTION_FLAG_FILENAME	= 1 << 4,
-  G_OPTION_FLAG_OPTIONAL_ARG    = 1 << 5,
-  G_OPTION_FLAG_NOALIAS	        = 1 << 6
-} GOptionFlags;
-
-/**
- * GOptionArg:
- * @G_OPTION_ARG_NONE: No extra argument. This is useful for simple flags.
- * @G_OPTION_ARG_STRING: The option takes a string argument.
- * @G_OPTION_ARG_INT: The option takes an integer argument.
- * @G_OPTION_ARG_CALLBACK: The option provides a callback to parse the
- *  extra argument.
- * @G_OPTION_ARG_FILENAME: The option takes a filename as argument.
- * @G_OPTION_ARG_STRING_ARRAY: The option takes a string argument, multiple
- *  uses of the option are collected into an array of strings.
- * @G_OPTION_ARG_FILENAME_ARRAY: The option takes a filename as argument, 
- *  multiple uses of the option are collected into an array of strings.
- * @G_OPTION_ARG_DOUBLE: The option takes a double argument. The argument
- *  can be formatted either for the user's locale or for the "C" locale. Since 2.12
- * @G_OPTION_ARG_INT64: The option takes a 64-bit integer. Like %G_OPTION_ARG_INT
- *  but for larger numbers. The number can be in decimal base, or in hexadecimal
- *  (when prefixed with <literal>0x</literal>, for example, <literal>0xffffffff</literal>).
- *  Since 2.12
- * 
- * The #GOptionArg enum values determine which type of extra argument the
- * options expect to find. If an option expects an extra argument, it
- * can be specified in several ways; with a short option:
- * <option>-x arg</option>, with a long option: <option>--name arg</option>
- * or combined in a single argument: <option>--name=arg</option>.
- */
-typedef enum
-{
-  G_OPTION_ARG_NONE,
-  G_OPTION_ARG_STRING,
-  G_OPTION_ARG_INT,
-  G_OPTION_ARG_CALLBACK,
-  G_OPTION_ARG_FILENAME,
-  G_OPTION_ARG_STRING_ARRAY,
-  G_OPTION_ARG_FILENAME_ARRAY,
-  G_OPTION_ARG_DOUBLE,
-  G_OPTION_ARG_INT64
-} GOptionArg;
-
-/**
- * GOptionArgFunc:
- * @option_name: The name of the option being parsed. This will be either a 
- *  single dash followed by a single letter (for a short name) or two dashes
- *  followed by a long option name.
- * @value: The value to be parsed.
- * @data: User data added to the #GOptionGroup containing the option when it
- *  was created with g_option_group_new()
- * @error: A return location for errors. The error code %G_OPTION_ERROR_FAILED
- *  is intended to be used for errors in #GOptionArgFunc callbacks.
- * 
- * The type of function to be passed as callback for %G_OPTION_ARG_CALLBACK
- * options.
- * 
- * Returns: %TRUE if the option was successfully parsed, %FALSE if an error 
- *  occurred, in which case @error should be set with g_set_error()
- */
-typedef gboolean (*GOptionArgFunc) (const gchar    *option_name,
-				    const gchar    *value,
-				    gpointer        data,
-				    GError        **error);
-
-/**
- * GOptionParseFunc:
- * @context: The active #GOptionContext
- * @group: The group to which the function belongs
- * @data: User data added to the #GOptionGroup containing the option when it
- *  was created with g_option_group_new()
- * @error: A return location for error details
- * 
- * The type of function that can be called before and after parsing. 
- * 
- * Returns: %TRUE if the function completed successfully, %FALSE if an error 
- *  occurred, in which case @error should be set with g_set_error()
- */
-typedef gboolean (*GOptionParseFunc) (GOptionContext *context,
-				      GOptionGroup   *group,
-				      gpointer	      data,
-				      GError        **error);
-
-/**
- * GOptionErrorFunc:
- * @context: The active #GOptionContext
- * @group: The group to which the function belongs
- * @data: User data added to the #GOptionGroup containing the option when it
- *  was created with g_option_group_new()
- * @error: The #GError containing details about the parse error
- * 
- * The type of function to be used as callback when a parse error occurs.
- */
-typedef void (*GOptionErrorFunc) (GOptionContext *context,
-				  GOptionGroup   *group,
-				  gpointer        data,
-				  GError        **error);
-
-/**
- * G_OPTION_ERROR:
- * 
- * Error domain for option parsing. Errors in this domain will
- * be from the #GOptionError enumeration. See #GError for information on 
- * error domains.
- */
-#define G_OPTION_ERROR (g_option_error_quark ())
-
-/**
- * GOptionError:
- * @G_OPTION_ERROR_UNKNOWN_OPTION: An option was not known to the parser.
- *  This error will only be reported, if the parser hasn't been instructed
- *  to ignore unknown options, see g_option_context_set_ignore_unknown_options().
- * @G_OPTION_ERROR_BAD_VALUE: A value couldn't be parsed.
- * @G_OPTION_ERROR_FAILED: A #GOptionArgFunc callback failed.
- * 
- * Error codes returned by option parsing.
- */
-typedef enum
-{
-  G_OPTION_ERROR_UNKNOWN_OPTION,
-  G_OPTION_ERROR_BAD_VALUE,
-  G_OPTION_ERROR_FAILED
-} GOptionError;
-
-GQuark g_option_error_quark (void);
-
-/**
- * GOptionEntry:
- * @long_name: The long name of an option can be used to specify it
- *  in a commandline as --<replaceable>long_name</replaceable>. Every
- *  option must have a long name. To resolve conflicts if multiple
- *  option groups contain the same long name, it is also possible to
- *  specify the option as 
- *  --<replaceable>groupname</replaceable>-<replaceable>long_name</replaceable>.
- * @short_name: If an option has a short name, it can be specified
- *  -<replaceable>short_name</replaceable> in a commandline. @short_name must be 
- *  a printable ASCII character different from '-', or zero if the option has no
- *  short name.
- * @flags: Flags from #GOptionFlags.
- * @arg: The type of the option, as a #GOptionArg.
- * @arg_data: If the @arg type is %G_OPTION_ARG_CALLBACK, then @arg_data must 
- *  point to a #GOptionArgFunc callback function, which will be called to handle 
- *  the extra argument. Otherwise, @arg_data is a pointer to a location to store 
- *  the value, the required type of the location depends on the @arg type:
- *  <variablelist>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_NONE</term>
- *  <listitem><para>%gboolean</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_STRING</term>
- *  <listitem><para>%gchar*</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_INT</term>
- *  <listitem><para>%gint</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_FILENAME</term>
- *  <listitem><para>%gchar*</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_STRING_ARRAY</term>
- *  <listitem><para>%gchar**</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_FILENAME_ARRAY</term>
- *  <listitem><para>%gchar**</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_DOUBLE</term>
- *  <listitem><para>%gdouble</para></listitem>
- *  </varlistentry>
- *  </variablelist>
- *  If @arg type is %G_OPTION_ARG_STRING or %G_OPTION_ARG_FILENAME the location
- *  will contain a newly allocated string if the option was given. That string
- *  needs to be freed by the callee using g_free(). Likewise if @arg type is
- *  %G_OPTION_ARG_STRING_ARRAY or %G_OPTION_ARG_FILENAME_ARRAY, the data should
- *  be freed using g_strfreev().
- * @description: the description for the option in <option>--help</option>
- *  output. The @description is translated using the @translate_func of the
- *  group, see g_option_group_set_translation_domain().
- * @arg_description: The placeholder to use for the extra argument parsed
- *  by the option in <option>--help</option>
- *  output. The @arg_description is translated using the @translate_func of the
- *  group, see g_option_group_set_translation_domain().
- * 
- * A <structname>GOptionEntry</structname> defines a single option.
- * To have an effect, they must be added to a #GOptionGroup with
- * g_option_context_add_main_entries() or g_option_group_add_entries().
- */
-struct _GOptionEntry
-{
-  const gchar *long_name;
-  gchar        short_name;
-  gint         flags;
-
-  GOptionArg   arg;
-  gpointer     arg_data;
-  
-  const gchar *description;
-  const gchar *arg_description;
-};
-
-/**
- * G_OPTION_REMAINING:
- * 
- * If a long option in the main group has this name, it is not treated as a 
- * regular option. Instead it collects all non-option arguments which would
- * otherwise be left in <literal>argv</literal>. The option must be of type
- * %G_OPTION_ARG_CALLBACK, %G_OPTION_ARG_STRING_ARRAY
- * or %G_OPTION_ARG_FILENAME_ARRAY.
- * 
- * 
- * Using #G_OPTION_REMAINING instead of simply scanning <literal>argv</literal>
- * for leftover arguments has the advantage that GOption takes care of 
- * necessary encoding conversions for strings or filenames.
- * 
- * Since: 2.6
- */
-#define G_OPTION_REMAINING ""
-
-GOptionContext *g_option_context_new              (const gchar         *parameter_string);
-void            g_option_context_set_summary      (GOptionContext      *context,
-                                                   const gchar         *summary);
-G_CONST_RETURN gchar *g_option_context_get_summary (GOptionContext     *context);
-void            g_option_context_set_description  (GOptionContext      *context,
-                                                   const gchar         *description);
-G_CONST_RETURN gchar *g_option_context_get_description (GOptionContext     *context);
-void            g_option_context_free             (GOptionContext      *context);
-void		g_option_context_set_help_enabled (GOptionContext      *context,
-						   gboolean		help_enabled);
-gboolean	g_option_context_get_help_enabled (GOptionContext      *context);
-void		g_option_context_set_ignore_unknown_options (GOptionContext *context,
-							     gboolean	     ignore_unknown);
-gboolean        g_option_context_get_ignore_unknown_options (GOptionContext *context);
-
-void            g_option_context_add_main_entries (GOptionContext      *context,
-						   const GOptionEntry  *entries,
-						   const gchar         *translation_domain);
-gboolean        g_option_context_parse            (GOptionContext      *context,
-						   gint                *argc,
-						   gchar             ***argv,
-						   GError             **error);
-void            g_option_context_set_translate_func (GOptionContext     *context,
-						     GTranslateFunc      func,
-						     gpointer            data,
-						     GDestroyNotify      destroy_notify);
-void            g_option_context_set_translation_domain (GOptionContext  *context,
-							 const gchar     *domain);
-
-void            g_option_context_add_group      (GOptionContext *context,
-						 GOptionGroup   *group);
-void          g_option_context_set_main_group (GOptionContext *context,
-					       GOptionGroup   *group);
-GOptionGroup *g_option_context_get_main_group (GOptionContext *context);
-gchar        *g_option_context_get_help       (GOptionContext *context,
-                                               gboolean        main_help,
-                                               GOptionGroup   *group);
-
-GOptionGroup *g_option_group_new                    (const gchar        *name,
-						     const gchar        *description,
-						     const gchar        *help_description,
-						     gpointer            user_data,
-						     GDestroyNotify      destroy);
-void	      g_option_group_set_parse_hooks	    (GOptionGroup       *group,
-						     GOptionParseFunc    pre_parse_func,
-						     GOptionParseFunc	 post_parse_func);
-void	      g_option_group_set_error_hook	    (GOptionGroup       *group,
-						     GOptionErrorFunc	 error_func);
-void          g_option_group_free                   (GOptionGroup       *group);
-void          g_option_group_add_entries            (GOptionGroup       *group,
-						     const GOptionEntry *entries);
-void          g_option_group_set_translate_func     (GOptionGroup       *group,
-						     GTranslateFunc      func,
-						     gpointer            data,
-						     GDestroyNotify      destroy_notify);
-void          g_option_group_set_translation_domain (GOptionGroup       *group,
-						     const gchar        *domain);
-
-G_END_DECLS
-
-#endif /* __G_OPTION_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gpattern.h b/protocols/Sametime/src/glib/include/glib/gpattern.h
deleted file mode 100644
index b653d713f0..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gpattern.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997, 1999  Peter Mattis, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_PATTERN_H__
-#define __G_PATTERN_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-
-typedef struct _GPatternSpec    GPatternSpec;
-
-GPatternSpec* g_pattern_spec_new       (const gchar  *pattern);
-void          g_pattern_spec_free      (GPatternSpec *pspec);
-gboolean      g_pattern_spec_equal     (GPatternSpec *pspec1,
-					GPatternSpec *pspec2);
-gboolean      g_pattern_match          (GPatternSpec *pspec,
-					guint         string_length,
-					const gchar  *string,
-					const gchar  *string_reversed);
-gboolean      g_pattern_match_string   (GPatternSpec *pspec,
-					const gchar  *string);
-gboolean      g_pattern_match_simple   (const gchar  *pattern,
-					const gchar  *string);
-
-G_END_DECLS
-
-#endif /* __G_PATTERN_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gpoll.h b/protocols/Sametime/src/glib/include/glib/gpoll.h
deleted file mode 100644
index cc79381a69..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gpoll.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* gpoll.h - poll(2) support
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (__G_MAIN_H__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_POLL_H__
-#define __G_POLL_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* Any definitions using GPollFD or GPollFunc are primarily
- * for Unix and not guaranteed to be the compatible on all
- * operating systems on which GLib runs. Right now, the
- * GLib does use these functions on Win32 as well, but interprets
- * them in a fairly different way than on Unix. If you use
- * these definitions, you are should be prepared to recode
- * for different operating systems.
- *
- * Note that on systems with a working poll(2), that function is used
- * in place of g_poll(). Thus g_poll() must have the same signature as
- * poll(), meaning GPollFD must have the same layout as struct pollfd.
- *
- *
- * On Win32, the fd in a GPollFD should be Win32 HANDLE (*not* a file
- * descriptor as provided by the C runtime) that can be used by
- * MsgWaitForMultipleObjects. This does *not* include file handles
- * from CreateFile, SOCKETs, nor pipe handles. (But you can use
- * WSAEventSelect to signal events when a SOCKET is readable).
- *
- * On Win32, fd can also be the special value G_WIN32_MSG_HANDLE to
- * indicate polling for messages.
- *
- * But note that G_WIN32_MSG_HANDLE GPollFDs should not be used by GDK
- * (GTK) programs, as GDK itself wants to read messages and convert them
- * to GDK events.
- *
- * So, unless you really know what you are doing, it's best not to try
- * to use the main loop polling stuff for your own needs on
- * Windows.
- */
-typedef struct _GPollFD GPollFD;
-
-/**
- * GPollFunc:
- * @ufds: an array of #GPollFD elements
- * @nfsd: the number of elements in @ufds
- * @timeout_: the maximum time to wait for an event of the file descriptors.
- *     A negative value indicates an infinite timeout.
- *
- * Specifies the type of function passed to g_main_context_set_poll_func().
- * The semantics of the function should match those of the poll() system call.
- *
- * Returns: the number of #GPollFD elements which have events or errors
- *     reported, or -1 if an error occurred.
- */
-typedef gint    (*GPollFunc)    (GPollFD *ufds,
-                                 guint    nfsd,
-                                 gint     timeout_);
-
-/**
- * GPollFD:
- * @fd: the file descriptor to poll (or a <type>HANDLE</type> on Win32)
- * @events: a bitwise combination from #GIOCondition, specifying which
- *     events should be polled for. Typically for reading from a file
- *     descriptor you would use %G_IO_IN | %G_IO_HUP | %G_IO_ERR, and
- *     for writing you would use %G_IO_OUT | %G_IO_ERR.
- * @revents: a bitwise combination of flags from #GIOCondition, returned
- *     from the poll() function to indicate which events occurred.
- */
-struct _GPollFD
-{
-#if defined (G_OS_WIN32) && GLIB_SIZEOF_VOID_P == 8
-  gint64	fd;
-#else
-  gint		fd;
-#endif
-  gushort 	events;
-  gushort 	revents;
-};
-
-#ifdef G_OS_WIN32
-#if GLIB_SIZEOF_VOID_P == 8
-#define G_POLLFD_FORMAT "%#I64x"
-#else
-#define G_POLLFD_FORMAT "%#x"
-#endif
-#else
-#define G_POLLFD_FORMAT "%d"
-#endif
-
-gint g_poll (GPollFD *fds,
-	     guint    nfds,
-	     gint     timeout);
-
-G_END_DECLS
-
-#endif /* __G_POLL_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gprimes.h b/protocols/Sametime/src/glib/include/glib/gprimes.h
deleted file mode 100644
index af5728602b..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gprimes.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_PRIMES_H__
-#define __G_PRIMES_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* Prime numbers.
- */
-
-/* This function returns prime numbers spaced by approximately 1.5-2.0
- * and is for use in resizing data structures which prefer
- * prime-valued sizes.	The closest spaced prime function returns the
- * next largest prime, or the highest it knows about which is about
- * MAXINT/4.
- */
-guint	   g_spaced_primes_closest (guint num) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __G_PRIMES_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gqsort.h b/protocols/Sametime/src/glib/include/glib/gqsort.h
deleted file mode 100644
index 3a47a584ee..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gqsort.h
+++ /dev/null
@@ -1,46 +0,0 @@
- /* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_QSORT_H__
-#define __G_QSORT_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-void g_qsort_with_data (gconstpointer    pbase,
-			gint             total_elems,
-			gsize            size,
-			GCompareDataFunc compare_func,
-			gpointer         user_data);
-
-G_END_DECLS
-
-#endif /* __G_QSORT_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gquark.h b/protocols/Sametime/src/glib/include/glib/gquark.h
deleted file mode 100644
index a0cbe2fd72..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gquark.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_QUARK_H__
-#define __G_QUARK_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef guint32 GQuark;
-
-/* Quarks (string<->id association)
- */
-GQuark                g_quark_try_string         (const gchar *string);
-GQuark                g_quark_from_static_string (const gchar *string);
-GQuark                g_quark_from_string        (const gchar *string);
-G_CONST_RETURN gchar* g_quark_to_string          (GQuark       quark) G_GNUC_CONST;
-
-G_CONST_RETURN gchar* g_intern_string            (const gchar *string);
-G_CONST_RETURN gchar* g_intern_static_string     (const gchar *string);
-
-G_END_DECLS
-
-#endif /* __G_QUARK_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gqueue.h b/protocols/Sametime/src/glib/include/glib/gqueue.h
deleted file mode 100644
index e78488fb65..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gqueue.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_QUEUE_H__
-#define __G_QUEUE_H__
-
-#include <glib/glist.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GQueue		GQueue;
-
-struct _GQueue
-{
-  GList *head;
-  GList *tail;
-  guint  length;
-};
-
-#define G_QUEUE_INIT { NULL, NULL, 0 }
-
-/* Queues
- */
-GQueue*  g_queue_new            (void);
-void     g_queue_free           (GQueue           *queue);
-void     g_queue_init           (GQueue           *queue);
-void     g_queue_clear          (GQueue           *queue);
-gboolean g_queue_is_empty       (GQueue           *queue);
-guint    g_queue_get_length     (GQueue           *queue);
-void     g_queue_reverse        (GQueue           *queue);
-GQueue * g_queue_copy           (GQueue           *queue);
-void     g_queue_foreach        (GQueue           *queue,
-				 GFunc             func,
-				 gpointer          user_data);
-GList *  g_queue_find           (GQueue           *queue,
-				 gconstpointer     data);
-GList *  g_queue_find_custom    (GQueue           *queue,
-				 gconstpointer     data,
-				 GCompareFunc      func);
-void     g_queue_sort           (GQueue           *queue,
-				 GCompareDataFunc  compare_func,
-				 gpointer          user_data);
-
-void     g_queue_push_head      (GQueue           *queue,
-				 gpointer          data);
-void     g_queue_push_tail      (GQueue           *queue,
-				 gpointer          data);
-void     g_queue_push_nth       (GQueue           *queue,
-				 gpointer          data,
-				 gint              n);
-gpointer g_queue_pop_head       (GQueue           *queue);
-gpointer g_queue_pop_tail       (GQueue           *queue);
-gpointer g_queue_pop_nth        (GQueue           *queue,
-				 guint             n);
-gpointer g_queue_peek_head      (GQueue           *queue);
-gpointer g_queue_peek_tail      (GQueue           *queue);
-gpointer g_queue_peek_nth       (GQueue           *queue,
-				 guint             n);
-gint     g_queue_index          (GQueue           *queue,
-				 gconstpointer     data);
-void     g_queue_remove         (GQueue           *queue,
-				 gconstpointer     data);
-void     g_queue_remove_all     (GQueue           *queue,
-				 gconstpointer     data);
-void     g_queue_insert_before  (GQueue           *queue,
-				 GList            *sibling,
-				 gpointer          data);
-void     g_queue_insert_after   (GQueue           *queue,
-				 GList            *sibling,
-				 gpointer          data);
-void     g_queue_insert_sorted  (GQueue           *queue,
-				 gpointer          data,
-				 GCompareDataFunc  func,
-				 gpointer          user_data);
-
-void     g_queue_push_head_link (GQueue           *queue,
-				 GList            *link_);
-void     g_queue_push_tail_link (GQueue           *queue,
-				 GList            *link_);
-void     g_queue_push_nth_link  (GQueue           *queue,
-				 gint              n,
-				 GList            *link_);
-GList*   g_queue_pop_head_link  (GQueue           *queue);
-GList*   g_queue_pop_tail_link  (GQueue           *queue);
-GList*   g_queue_pop_nth_link   (GQueue           *queue,
-				 guint             n);
-GList*   g_queue_peek_head_link (GQueue           *queue);
-GList*   g_queue_peek_tail_link (GQueue           *queue);
-GList*   g_queue_peek_nth_link  (GQueue           *queue,
-				 guint             n);
-gint     g_queue_link_index     (GQueue           *queue,
-				 GList            *link_);
-void     g_queue_unlink         (GQueue           *queue,
-				 GList            *link_);
-void     g_queue_delete_link    (GQueue           *queue,
-				 GList            *link_);
-
-G_END_DECLS
-
-#endif /* __G_QUEUE_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/grand.h b/protocols/Sametime/src/glib/include/glib/grand.h
deleted file mode 100644
index 07907dfc17..0000000000
--- a/protocols/Sametime/src/glib/include/glib/grand.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_RAND_H__
-#define __G_RAND_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GRand           GRand;
-
-/* GRand - a good and fast random number generator: Mersenne Twister
- * see http://www.math.keio.ac.jp/~matumoto/emt.html for more info.
- * The range functions return a value in the intervall [begin, end).
- * int          -> [0..2^32-1]
- * int_range    -> [begin..end-1]
- * double       -> [0..1)
- * double_range -> [begin..end)
- */
-
-GRand*  g_rand_new_with_seed  (guint32  seed);
-GRand*  g_rand_new_with_seed_array (const guint32 *seed,
-				    guint seed_length);
-GRand*  g_rand_new            (void);
-void    g_rand_free           (GRand   *rand_);
-GRand*  g_rand_copy           (GRand   *rand_);
-void    g_rand_set_seed       (GRand   *rand_,
-			       guint32  seed);
-void	g_rand_set_seed_array (GRand   *rand_,
-			       const guint32 *seed,
-			       guint    seed_length);
-
-#define g_rand_boolean(rand_) ((g_rand_int (rand_) & (1 << 15)) != 0)
-
-guint32 g_rand_int            (GRand   *rand_);
-gint32  g_rand_int_range      (GRand   *rand_,
-			       gint32   begin,
-			       gint32   end);
-gdouble g_rand_double         (GRand   *rand_);
-gdouble g_rand_double_range   (GRand   *rand_,
-			       gdouble  begin,
-			       gdouble  end);
-void    g_random_set_seed     (guint32  seed);
-
-#define g_random_boolean() ((g_random_int () & (1 << 15)) != 0)
-
-guint32 g_random_int          (void);
-gint32  g_random_int_range    (gint32   begin,
-			       gint32   end);
-gdouble g_random_double       (void);
-gdouble g_random_double_range (gdouble  begin,
-			       gdouble  end);
-
-
-G_END_DECLS
-
-#endif /* __G_RAND_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gregex.h b/protocols/Sametime/src/glib/include/glib/gregex.h
deleted file mode 100644
index ce1b44a972..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gregex.h
+++ /dev/null
@@ -1,471 +0,0 @@
-/* GRegex -- regular expression API wrapper around PCRE.
- *
- * Copyright (C) 1999, 2000 Scott Wimer
- * Copyright (C) 2004, Matthias Clasen <mclasen@redhat.com>
- * Copyright (C) 2005 - 2007, Marco Barisione <marco@barisione.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_REGEX_H__
-#define __G_REGEX_H__
-
-#include <glib/gerror.h>
-#include <glib/gstring.h>
-
-G_BEGIN_DECLS
-
-/**
- * GRegexError:
- * @G_REGEX_ERROR_COMPILE: Compilation of the regular expression failed.
- * @G_REGEX_ERROR_OPTIMIZE: Optimization of the regular expression failed.
- * @G_REGEX_ERROR_REPLACE: Replacement failed due to an ill-formed replacement
- *     string.
- * @G_REGEX_ERROR_MATCH: The match process failed.
- * @G_REGEX_ERROR_INTERNAL: Internal error of the regular expression engine.
- *     Since 2.16
- * @G_REGEX_ERROR_STRAY_BACKSLASH: "\\" at end of pattern. Since 2.16
- * @G_REGEX_ERROR_MISSING_CONTROL_CHAR: "\\c" at end of pattern. Since 2.16
- * @G_REGEX_ERROR_UNRECOGNIZED_ESCAPE: Unrecognized character follows "\\".
- *     Since 2.16
- * @G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER: Numbers out of order in "{}"
- *     quantifier. Since 2.16
- * @G_REGEX_ERROR_QUANTIFIER_TOO_BIG: Number too big in "{}" quantifier.
- *     Since 2.16
- * @G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS: Missing terminating "]" for
- *     character class. Since 2.16
- * @G_REGEX_ERROR_INVALID_ESCAPE_IN_CHARACTER_CLASS: Invalid escape sequence
- *     in character class. Since 2.16
- * @G_REGEX_ERROR_RANGE_OUT_OF_ORDER: Range out of order in character class.
- *     Since 2.16
- * @G_REGEX_ERROR_NOTHING_TO_REPEAT: Nothing to repeat. Since 2.16
- * @G_REGEX_ERROR_UNRECOGNIZED_CHARACTER: Unrecognized character after "(?",
- *     "(?&lt;" or "(?P". Since 2.16
- * @G_REGEX_ERROR_POSIX_NAMED_CLASS_OUTSIDE_CLASS: POSIX named classes are
- *     supported only within a class. Since 2.16
- * @G_REGEX_ERROR_UNMATCHED_PARENTHESIS: Missing terminating ")" or ")"
- *     without opening "(". Since 2.16
- * @G_REGEX_ERROR_INEXISTENT_SUBPATTERN_REFERENCE: Reference to non-existent
- *     subpattern. Since 2.16
- * @G_REGEX_ERROR_UNTERMINATED_COMMENT: Missing terminating ")" after comment.
- *     Since 2.16
- * @G_REGEX_ERROR_EXPRESSION_TOO_LARGE: Regular expression too large.
- *     Since 2.16
- * @G_REGEX_ERROR_MEMORY_ERROR: Failed to get memory. Since 2.16
- * @G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND: Lookbehind assertion is not
- *     fixed length. Since 2.16
- * @G_REGEX_ERROR_MALFORMED_CONDITION: Malformed number or name after "(?(".
- *     Since 2.16
- * @G_REGEX_ERROR_TOO_MANY_CONDITIONAL_BRANCHES: Conditional group contains
- *     more than two branches. Since 2.16
- * @G_REGEX_ERROR_ASSERTION_EXPECTED: Assertion expected after "(?(".
- *     Since 2.16
- * @G_REGEX_ERROR_UNKNOWN_POSIX_CLASS_NAME: Unknown POSIX class name.
- *     Since 2.16
- * @G_REGEX_ERROR_POSIX_COLLATING_ELEMENTS_NOT_SUPPORTED: POSIX collating
- *     elements are not supported. Since 2.16
- * @G_REGEX_ERROR_HEX_CODE_TOO_LARGE: Character value in "\\x{...}" sequence
- *     is too large. Since 2.16
- * @G_REGEX_ERROR_INVALID_CONDITION: Invalid condition "(?(0)". Since 2.16
- * @G_REGEX_ERROR_SINGLE_BYTE_MATCH_IN_LOOKBEHIND: \\C not allowed in
- *     lookbehind assertion. Since 2.16
- * @G_REGEX_ERROR_INFINITE_LOOP: Recursive call could loop indefinitely.
- *     Since 2.16
- * @G_REGEX_ERROR_MISSING_SUBPATTERN_NAME_TERMINATOR: Missing terminator
- *     in subpattern name. Since 2.16
- * @G_REGEX_ERROR_DUPLICATE_SUBPATTERN_NAME: Two named subpatterns have
- *     the same name. Since 2.16
- * @G_REGEX_ERROR_MALFORMED_PROPERTY: Malformed "\\P" or "\\p" sequence.
- *     Since 2.16
- * @G_REGEX_ERROR_UNKNOWN_PROPERTY: Unknown property name after "\\P" or
- *     "\\p". Since 2.16
- * @G_REGEX_ERROR_SUBPATTERN_NAME_TOO_LONG: Subpattern name is too long
- *     (maximum 32 characters). Since 2.16
- * @G_REGEX_ERROR_TOO_MANY_SUBPATTERNS: Too many named subpatterns (maximum
- *     10,000). Since 2.16
- * @G_REGEX_ERROR_INVALID_OCTAL_VALUE: Octal value is greater than "\\377".
- *     Since 2.16
- * @G_REGEX_ERROR_TOO_MANY_BRANCHES_IN_DEFINE: "DEFINE" group contains more
- *     than one branch. Since 2.16
- * @G_REGEX_ERROR_DEFINE_REPETION: Repeating a "DEFINE" group is not allowed.
- *     Since 2.16
- * @G_REGEX_ERROR_INCONSISTENT_NEWLINE_OPTIONS: Inconsistent newline options.
- *     Since 2.16
- * @G_REGEX_ERROR_MISSING_BACK_REFERENCE: "\\g" is not followed by a braced
- *     name or an optionally braced non-zero number. Since 2.16
- *
- * Error codes returned by regular expressions functions.
- *
- * Since: 2.14
- */
-typedef enum
-{
-  G_REGEX_ERROR_COMPILE,
-  G_REGEX_ERROR_OPTIMIZE,
-  G_REGEX_ERROR_REPLACE,
-  G_REGEX_ERROR_MATCH,
-  G_REGEX_ERROR_INTERNAL,
-
-  /* These are the error codes from PCRE + 100 */
-  G_REGEX_ERROR_STRAY_BACKSLASH = 101,
-  G_REGEX_ERROR_MISSING_CONTROL_CHAR = 102,
-  G_REGEX_ERROR_UNRECOGNIZED_ESCAPE = 103,
-  G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER = 104,
-  G_REGEX_ERROR_QUANTIFIER_TOO_BIG = 105,
-  G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS = 106,
-  G_REGEX_ERROR_INVALID_ESCAPE_IN_CHARACTER_CLASS = 107,
-  G_REGEX_ERROR_RANGE_OUT_OF_ORDER = 108,
-  G_REGEX_ERROR_NOTHING_TO_REPEAT = 109,
-  G_REGEX_ERROR_UNRECOGNIZED_CHARACTER = 112,
-  G_REGEX_ERROR_POSIX_NAMED_CLASS_OUTSIDE_CLASS = 113,
-  G_REGEX_ERROR_UNMATCHED_PARENTHESIS = 114,
-  G_REGEX_ERROR_INEXISTENT_SUBPATTERN_REFERENCE = 115,
-  G_REGEX_ERROR_UNTERMINATED_COMMENT = 118,
-  G_REGEX_ERROR_EXPRESSION_TOO_LARGE = 120,
-  G_REGEX_ERROR_MEMORY_ERROR = 121,
-  G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND = 125,
-  G_REGEX_ERROR_MALFORMED_CONDITION = 126,
-  G_REGEX_ERROR_TOO_MANY_CONDITIONAL_BRANCHES = 127,
-  G_REGEX_ERROR_ASSERTION_EXPECTED = 128,
-  G_REGEX_ERROR_UNKNOWN_POSIX_CLASS_NAME = 130,
-  G_REGEX_ERROR_POSIX_COLLATING_ELEMENTS_NOT_SUPPORTED = 131,
-  G_REGEX_ERROR_HEX_CODE_TOO_LARGE = 134,
-  G_REGEX_ERROR_INVALID_CONDITION = 135,
-  G_REGEX_ERROR_SINGLE_BYTE_MATCH_IN_LOOKBEHIND = 136,
-  G_REGEX_ERROR_INFINITE_LOOP = 140,
-  G_REGEX_ERROR_MISSING_SUBPATTERN_NAME_TERMINATOR = 142,
-  G_REGEX_ERROR_DUPLICATE_SUBPATTERN_NAME = 143,
-  G_REGEX_ERROR_MALFORMED_PROPERTY = 146,
-  G_REGEX_ERROR_UNKNOWN_PROPERTY = 147,
-  G_REGEX_ERROR_SUBPATTERN_NAME_TOO_LONG = 148,
-  G_REGEX_ERROR_TOO_MANY_SUBPATTERNS = 149,
-  G_REGEX_ERROR_INVALID_OCTAL_VALUE = 151,
-  G_REGEX_ERROR_TOO_MANY_BRANCHES_IN_DEFINE = 154,
-  G_REGEX_ERROR_DEFINE_REPETION = 155,
-  G_REGEX_ERROR_INCONSISTENT_NEWLINE_OPTIONS = 156,
-  G_REGEX_ERROR_MISSING_BACK_REFERENCE = 157
-} GRegexError;
-
-/**
- * G_REGEX_ERROR:
- *
- * Error domain for regular expressions. Errors in this domain will be
- * from the #GRegexError enumeration. See #GError for information on
- * error domains.
- *
- * Since: 2.14
- */
-#define G_REGEX_ERROR g_regex_error_quark ()
-
-GQuark g_regex_error_quark (void);
-
-/**
- * GRegexCompileFlags:
- * @G_REGEX_CASELESS: Letters in the pattern match both upper- and
- *     lowercase letters. This option can be changed within a pattern
- *     by a "(?i)" option setting.
- * @G_REGEX_MULTILINE: By default, GRegex treats the strings as consisting
- *     of a single line of characters (even if it actually contains
- *     newlines). The "start of line" metacharacter ("^") matches only
- *     at the start of the string, while the "end of line" metacharacter
- *     ("$") matches only at the end of the string, or before a terminating
- *     newline (unless #G_REGEX_DOLLAR_ENDONLY is set). When
- *     #G_REGEX_MULTILINE is set, the "start of line" and "end of line"
- *     constructs match immediately following or immediately before any
- *     newline in the string, respectively, as well as at the very start
- *     and end. This can be changed within a pattern by a "(?m)" option
- *     setting.
- * @G_REGEX_DOTALL: A dot metacharater (".") in the pattern matches all
- *     characters, including newlines. Without it, newlines are excluded.
- *     This option can be changed within a pattern by a ("?s") option setting.
- * @G_REGEX_EXTENDED: Whitespace data characters in the pattern are
- *     totally ignored except when escaped or inside a character class.
- *     Whitespace does not include the VT character (code 11). In addition,
- *     characters between an unescaped "#" outside a character class and
- *     the next newline character, inclusive, are also ignored. This can
- *     be changed within a pattern by a "(?x)" option setting.
- * @G_REGEX_ANCHORED: The pattern is forced to be "anchored", that is,
- *     it is constrained to match only at the first matching point in the
- *     string that is being searched. This effect can also be achieved by
- *     appropriate constructs in the pattern itself such as the "^"
- *     metacharater.
- * @G_REGEX_DOLLAR_ENDONLY: A dollar metacharacter ("$") in the pattern
- *     matches only at the end of the string. Without this option, a
- *     dollar also matches immediately before the final character if
- *     it is a newline (but not before any other newlines). This option
- *     is ignored if #G_REGEX_MULTILINE is set.
- * @G_REGEX_UNGREEDY: Inverts the "greediness" of the quantifiers so that
- *     they are not greedy by default, but become greedy if followed by "?".
- *     It can also be set by a "(?U)" option setting within the pattern.
- * @G_REGEX_RAW: Usually strings must be valid UTF-8 strings, using this
- *     flag they are considered as a raw sequence of bytes.
- *     @G_REGEX_NO_AUTO_CAPTURE: Disables the use of numbered capturing
- *     parentheses in the pattern. Any opening parenthesis that is not
- *     followed by "?" behaves as if it were followed by "?:" but named
- *     parentheses can still be used for capturing (and they acquire numbers
- *     in the usual way).
- * @G_REGEX_OPTIMIZE: Optimize the regular expression. If the pattern will
- *     be used many times, then it may be worth the effort to optimize it
- *     to improve the speed of matches.
- * @G_REGEX_DUPNAMES: Names used to identify capturing subpatterns need not
- *     be unique. This can be helpful for certain types of pattern when it
- *     is known that only one instance of the named subpattern can ever be
- *     matched.
- * @G_REGEX_NEWLINE_CR: Usually any newline character is recognized, if this
- *     option is set, the only recognized newline character is '\r'.
- * @G_REGEX_NEWLINE_LF: Usually any newline character is recognized, if this
- *     option is set, the only recognized newline character is '\n'.
- * @G_REGEX_NEWLINE_CRLF: Usually any newline character is recognized, if this
- *     option is set, the only recognized newline character sequence is '\r\n'.
- *
- * Flags specifying compile-time options.
- *
- * Since: 2.14
- */
-/* Remember to update G_REGEX_COMPILE_MASK in gregex.c after
- * adding a new flag. */
-typedef enum
-{
-  G_REGEX_CASELESS          = 1 << 0,
-  G_REGEX_MULTILINE         = 1 << 1,
-  G_REGEX_DOTALL            = 1 << 2,
-  G_REGEX_EXTENDED          = 1 << 3,
-  G_REGEX_ANCHORED          = 1 << 4,
-  G_REGEX_DOLLAR_ENDONLY    = 1 << 5,
-  G_REGEX_UNGREEDY          = 1 << 9,
-  G_REGEX_RAW               = 1 << 11,
-  G_REGEX_NO_AUTO_CAPTURE   = 1 << 12,
-  G_REGEX_OPTIMIZE          = 1 << 13,
-  G_REGEX_DUPNAMES          = 1 << 19,
-  G_REGEX_NEWLINE_CR        = 1 << 20,
-  G_REGEX_NEWLINE_LF        = 1 << 21,
-  G_REGEX_NEWLINE_CRLF      = G_REGEX_NEWLINE_CR | G_REGEX_NEWLINE_LF
-} GRegexCompileFlags;
-
-/**
- * GRegexMatchFlags:
- * @G_REGEX_MATCH_ANCHORED: The pattern is forced to be "anchored", that is,
- *     it is constrained to match only at the first matching point in the
- *     string that is being searched. This effect can also be achieved by
- *     appropriate constructs in the pattern itself such as the "^"
- *     metacharater.
- * @G_REGEX_MATCH_NOTBOL: Specifies that first character of the string is
- *     not the beginning of a line, so the circumflex metacharacter should
- *     not match before it. Setting this without #G_REGEX_MULTILINE (at
- *     compile time) causes circumflex never to match. This option affects
- *     only the behaviour of the circumflex metacharacter, it does not
- *     affect "\A".
- * @G_REGEX_MATCH_NOTEOL: Specifies that the end of the subject string is
- *     not the end of a line, so the dollar metacharacter should not match
- *     it nor (except in multiline mode) a newline immediately before it.
- *     Setting this without #G_REGEX_MULTILINE (at compile time) causes
- *     dollar never to match. This option affects only the behaviour of
- *     the dollar metacharacter, it does not affect "\Z" or "\z".
- * @G_REGEX_MATCH_NOTEMPTY: An empty string is not considered to be a valid
- *     match if this option is set. If there are alternatives in the pattern,
- *     they are tried. If all the alternatives match the empty string, the
- *     entire match fails. For example, if the pattern "a?b?" is applied to
- *     a string not beginning with "a" or "b", it matches the empty string
- *     at the start of the string. With this flag set, this match is not
- *     valid, so GRegex searches further into the string for occurrences
- *     of "a" or "b".
- * @G_REGEX_MATCH_PARTIAL: Turns on the partial matching feature, for more
- *     documentation on partial matching see g_match_info_is_partial_match().
- * @G_REGEX_MATCH_NEWLINE_CR: Overrides the newline definition set when
- *     creating a new #GRegex, setting the '\r' character as line terminator.
- * @G_REGEX_MATCH_NEWLINE_LF: Overrides the newline definition set when
- *     creating a new #GRegex, setting the '\n' character as line terminator.
- * @G_REGEX_MATCH_NEWLINE_CRLF: Overrides the newline definition set when
- *     creating a new #GRegex, setting the '\r\n' characters as line terminator.
- * @G_REGEX_MATCH_NEWLINE_ANY: Overrides the newline definition set when
- *     creating a new #GRegex, any newline character or character sequence
- *     is recognized.
- *
- * Flags specifying match-time options.
- *
- * Since: 2.14
- */
-/* Remember to update G_REGEX_MATCH_MASK in gregex.c after
- * adding a new flag. */
-typedef enum
-{
-  G_REGEX_MATCH_ANCHORED      = 1 << 4,
-  G_REGEX_MATCH_NOTBOL        = 1 << 7,
-  G_REGEX_MATCH_NOTEOL        = 1 << 8,
-  G_REGEX_MATCH_NOTEMPTY      = 1 << 10,
-  G_REGEX_MATCH_PARTIAL       = 1 << 15,
-  G_REGEX_MATCH_NEWLINE_CR    = 1 << 20,
-  G_REGEX_MATCH_NEWLINE_LF    = 1 << 21,
-  G_REGEX_MATCH_NEWLINE_CRLF  = G_REGEX_MATCH_NEWLINE_CR | G_REGEX_MATCH_NEWLINE_LF,
-  G_REGEX_MATCH_NEWLINE_ANY   = 1 << 22
-} GRegexMatchFlags;
-
-/**
- * GRegex:
- *
- * A GRegex is the "compiled" form of a regular expression pattern. This
- * structure is opaque and its fields cannot be accessed directly.
- *
- * Since: 2.14
- */
-typedef struct _GRegex		GRegex;
-
-
-typedef struct _GMatchInfo	GMatchInfo;
-
-/**
- * GRegexEvalCallback:
- * @match_info: the #GMatchInfo generated by the match.
- *     Use g_match_info_get_regex() and g_match_info_get_string() if you
- *     need the #GRegex or the matched string.
- * @result: a #GString containing the new string
- * @user_data: user data passed to g_regex_replace_eval()
- *
- * Specifies the type of the function passed to g_regex_replace_eval().
- * It is called for each occurance of the pattern in the string passed
- * to g_regex_replace_eval(), and it should append the replacement to
- * @result.
- *
- * Returns: %FALSE to continue the replacement process, %TRUE to stop it
- *
- * Since: 2.14
- */
-typedef gboolean (*GRegexEvalCallback)		(const GMatchInfo *match_info,
-						 GString          *result,
-						 gpointer          user_data);
-
-
-GRegex		 *g_regex_new			(const gchar         *pattern,
-						 GRegexCompileFlags   compile_options,
-						 GRegexMatchFlags     match_options,
-						 GError             **error);
-GRegex           *g_regex_ref			(GRegex              *regex);
-void		  g_regex_unref			(GRegex              *regex);
-const gchar	 *g_regex_get_pattern		(const GRegex        *regex);
-gint		  g_regex_get_max_backref	(const GRegex        *regex);
-gint		  g_regex_get_capture_count	(const GRegex        *regex);
-gint		  g_regex_get_string_number	(const GRegex        *regex, 
-						 const gchar         *name);
-gchar		 *g_regex_escape_string		(const gchar         *string,
-						 gint                 length);
-
-GRegexCompileFlags g_regex_get_compile_flags    (const GRegex        *regex);
-GRegexMatchFlags   g_regex_get_match_flags      (const GRegex        *regex);
-
-/* Matching. */
-gboolean	  g_regex_match_simple		(const gchar         *pattern,
-						 const gchar         *string,
-						 GRegexCompileFlags   compile_options,
-						 GRegexMatchFlags     match_options);
-gboolean	  g_regex_match			(const GRegex        *regex,
-						 const gchar         *string,
-						 GRegexMatchFlags     match_options,
-						 GMatchInfo         **match_info);
-gboolean	  g_regex_match_full		(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 GRegexMatchFlags     match_options,
-						 GMatchInfo         **match_info,
-						 GError             **error);
-gboolean	  g_regex_match_all		(const GRegex        *regex,
-						 const gchar         *string,
-						 GRegexMatchFlags     match_options,
-						 GMatchInfo         **match_info);
-gboolean	  g_regex_match_all_full	(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 GRegexMatchFlags     match_options,
-						 GMatchInfo         **match_info,
-						 GError             **error);
-
-/* String splitting. */
-gchar		**g_regex_split_simple		(const gchar         *pattern,
-						 const gchar         *string,
-						 GRegexCompileFlags   compile_options,
-						 GRegexMatchFlags     match_options);
-gchar		**g_regex_split			(const GRegex        *regex,
-						 const gchar         *string,
-						 GRegexMatchFlags     match_options);
-gchar		**g_regex_split_full		(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 GRegexMatchFlags     match_options,
-						 gint                 max_tokens,
-						 GError             **error);
-
-/* String replacement. */
-gchar		 *g_regex_replace		(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 const gchar         *replacement,
-						 GRegexMatchFlags     match_options,
-						 GError             **error);
-gchar		 *g_regex_replace_literal	(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 const gchar         *replacement,
-						 GRegexMatchFlags     match_options,
-						 GError             **error);
-gchar		 *g_regex_replace_eval		(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 GRegexMatchFlags     match_options,
-						 GRegexEvalCallback   eval,
-						 gpointer             user_data,
-						 GError             **error);
-gboolean	  g_regex_check_replacement	(const gchar         *replacement,
-						 gboolean            *has_references,
-						 GError             **error);
-
-/* Match info */
-GRegex		 *g_match_info_get_regex	(const GMatchInfo    *match_info);
-const gchar      *g_match_info_get_string       (const GMatchInfo    *match_info);
-
-void		  g_match_info_free		(GMatchInfo          *match_info);
-gboolean	  g_match_info_next		(GMatchInfo          *match_info,
-						 GError             **error);
-gboolean	  g_match_info_matches		(const GMatchInfo    *match_info);
-gint		  g_match_info_get_match_count	(const GMatchInfo    *match_info);
-gboolean	  g_match_info_is_partial_match	(const GMatchInfo    *match_info);
-gchar		 *g_match_info_expand_references(const GMatchInfo    *match_info,
-						 const gchar         *string_to_expand,
-						 GError             **error);
-gchar		 *g_match_info_fetch		(const GMatchInfo    *match_info,
-						 gint                 match_num);
-gboolean	  g_match_info_fetch_pos	(const GMatchInfo    *match_info,
-						 gint                 match_num,
-						 gint                *start_pos,
-						 gint                *end_pos);
-gchar		 *g_match_info_fetch_named	(const GMatchInfo    *match_info,
-						 const gchar         *name);
-gboolean	  g_match_info_fetch_named_pos	(const GMatchInfo    *match_info,
-						 const gchar         *name,
-						 gint                *start_pos,
-						 gint                *end_pos);
-gchar		**g_match_info_fetch_all	(const GMatchInfo    *match_info);
-
-G_END_DECLS
-
-#endif  /*  __G_REGEX_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/grel.h b/protocols/Sametime/src/glib/include/glib/grel.h
deleted file mode 100644
index 5cb8d09d4b..0000000000
--- a/protocols/Sametime/src/glib/include/glib/grel.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_REL_H__
-#define __G_REL_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GRelation       GRelation;
-typedef struct _GTuples         GTuples;
-
-struct _GTuples
-{
-  guint len;
-};
-
-/* GRelation
- *
- * Indexed Relations.  Imagine a really simple table in a
- * database.  Relations are not ordered.  This data type is meant for
- * maintaining a N-way mapping.
- *
- * g_relation_new() creates a relation with FIELDS fields
- *
- * g_relation_destroy() frees all resources
- * g_tuples_destroy() frees the result of g_relation_select()
- *
- * g_relation_index() indexes relation FIELD with the provided
- *   equality and hash functions.  this must be done before any
- *   calls to insert are made.
- *
- * g_relation_insert() inserts a new tuple.  you are expected to
- *   provide the right number of fields.
- *
- * g_relation_delete() deletes all relations with KEY in FIELD
- * g_relation_select() returns ...
- * g_relation_count() counts ...
- */
-
-#ifndef G_DISABLE_DEPRECATED
-
-GRelation* g_relation_new     (gint         fields);
-void       g_relation_destroy (GRelation   *relation);
-void       g_relation_index   (GRelation   *relation,
-                               gint         field,
-                               GHashFunc    hash_func,
-                               GEqualFunc   key_equal_func);
-void       g_relation_insert  (GRelation   *relation,
-                               ...);
-gint       g_relation_delete  (GRelation   *relation,
-                               gconstpointer  key,
-                               gint         field);
-GTuples*   g_relation_select  (GRelation   *relation,
-                               gconstpointer  key,
-                               gint         field);
-gint       g_relation_count   (GRelation   *relation,
-                               gconstpointer  key,
-                               gint         field);
-gboolean   g_relation_exists  (GRelation   *relation,
-                               ...);
-void       g_relation_print   (GRelation   *relation);
-
-void       g_tuples_destroy   (GTuples     *tuples);
-gpointer   g_tuples_index     (GTuples     *tuples,
-                               gint         index_,
-                               gint         field);
-
-#endif
-
-G_END_DECLS
-
-#endif /* __G_REL_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gscanner.h b/protocols/Sametime/src/glib/include/glib/gscanner.h
deleted file mode 100644
index 3b7ad6fab0..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gscanner.h
+++ /dev/null
@@ -1,278 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_SCANNER_H__
-#define __G_SCANNER_H__
-
-#include <glib/gdataset.h>
-#include <glib/ghash.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GScanner	GScanner;
-typedef struct _GScannerConfig	GScannerConfig;
-typedef union  _GTokenValue     GTokenValue;
-
-typedef void		(*GScannerMsgFunc)	(GScanner      *scanner,
-						 gchar	       *message,
-						 gboolean	error);
-
-/* GScanner: Flexible lexical scanner for general purpose.
- */
-
-/* Character sets */
-#define G_CSET_A_2_Z	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-#define G_CSET_a_2_z	"abcdefghijklmnopqrstuvwxyz"
-#define G_CSET_DIGITS	"0123456789"
-#define G_CSET_LATINC	"\300\301\302\303\304\305\306"\
-			"\307\310\311\312\313\314\315\316\317\320"\
-			"\321\322\323\324\325\326"\
-			"\330\331\332\333\334\335\336"
-#define G_CSET_LATINS	"\337\340\341\342\343\344\345\346"\
-			"\347\350\351\352\353\354\355\356\357\360"\
-			"\361\362\363\364\365\366"\
-			"\370\371\372\373\374\375\376\377"
-
-/* Error types */
-typedef enum
-{
-  G_ERR_UNKNOWN,
-  G_ERR_UNEXP_EOF,
-  G_ERR_UNEXP_EOF_IN_STRING,
-  G_ERR_UNEXP_EOF_IN_COMMENT,
-  G_ERR_NON_DIGIT_IN_CONST,
-  G_ERR_DIGIT_RADIX,
-  G_ERR_FLOAT_RADIX,
-  G_ERR_FLOAT_MALFORMED
-} GErrorType;
-
-/* Token types */
-typedef enum
-{
-  G_TOKEN_EOF			=   0,
-  
-  G_TOKEN_LEFT_PAREN		= '(',
-  G_TOKEN_RIGHT_PAREN		= ')',
-  G_TOKEN_LEFT_CURLY		= '{',
-  G_TOKEN_RIGHT_CURLY		= '}',
-  G_TOKEN_LEFT_BRACE		= '[',
-  G_TOKEN_RIGHT_BRACE		= ']',
-  G_TOKEN_EQUAL_SIGN		= '=',
-  G_TOKEN_COMMA			= ',',
-  
-  G_TOKEN_NONE			= 256,
-  
-  G_TOKEN_ERROR,
-  
-  G_TOKEN_CHAR,
-  G_TOKEN_BINARY,
-  G_TOKEN_OCTAL,
-  G_TOKEN_INT,
-  G_TOKEN_HEX,
-  G_TOKEN_FLOAT,
-  G_TOKEN_STRING,
-  
-  G_TOKEN_SYMBOL,
-  G_TOKEN_IDENTIFIER,
-  G_TOKEN_IDENTIFIER_NULL,
-  
-  G_TOKEN_COMMENT_SINGLE,
-  G_TOKEN_COMMENT_MULTI,
-  G_TOKEN_LAST
-} GTokenType;
-
-union	_GTokenValue
-{
-  gpointer	v_symbol;
-  gchar		*v_identifier;
-  gulong	v_binary;
-  gulong	v_octal;
-  gulong	v_int;
-  guint64       v_int64;
-  gdouble	v_float;
-  gulong	v_hex;
-  gchar		*v_string;
-  gchar		*v_comment;
-  guchar	v_char;
-  guint		v_error;
-};
-
-struct	_GScannerConfig
-{
-  /* Character sets
-   */
-  gchar		*cset_skip_characters;		/* default: " \t\n" */
-  gchar		*cset_identifier_first;
-  gchar		*cset_identifier_nth;
-  gchar		*cpair_comment_single;		/* default: "#\n" */
-  
-  /* Should symbol lookup work case sensitive?
-   */
-  guint		case_sensitive : 1;
-  
-  /* Boolean values to be adjusted "on the fly"
-   * to configure scanning behaviour.
-   */
-  guint		skip_comment_multi : 1;		/* C like comment */
-  guint		skip_comment_single : 1;	/* single line comment */
-  guint		scan_comment_multi : 1;		/* scan multi line comments? */
-  guint		scan_identifier : 1;
-  guint		scan_identifier_1char : 1;
-  guint		scan_identifier_NULL : 1;
-  guint		scan_symbols : 1;
-  guint		scan_binary : 1;
-  guint		scan_octal : 1;
-  guint		scan_float : 1;
-  guint		scan_hex : 1;			/* `0x0ff0' */
-  guint		scan_hex_dollar : 1;		/* `$0ff0' */
-  guint		scan_string_sq : 1;		/* string: 'anything' */
-  guint		scan_string_dq : 1;		/* string: "\\-escapes!\n" */
-  guint		numbers_2_int : 1;		/* bin, octal, hex => int */
-  guint		int_2_float : 1;		/* int => G_TOKEN_FLOAT? */
-  guint		identifier_2_string : 1;
-  guint		char_2_token : 1;		/* return G_TOKEN_CHAR? */
-  guint		symbol_2_token : 1;
-  guint		scope_0_fallback : 1;		/* try scope 0 on lookups? */
-  guint		store_int64 : 1; 		/* use value.v_int64 rather than v_int */
-  guint		padding_dummy;
-};
-
-struct	_GScanner
-{
-  /* unused fields */
-  gpointer		user_data;
-  guint			max_parse_errors;
-  
-  /* g_scanner_error() increments this field */
-  guint			parse_errors;
-  
-  /* name of input stream, featured by the default message handler */
-  const gchar		*input_name;
-  
-  /* quarked data */
-  GData			*qdata;
-  
-  /* link into the scanner configuration */
-  GScannerConfig	*config;
-  
-  /* fields filled in after g_scanner_get_next_token() */
-  GTokenType		token;
-  GTokenValue		value;
-  guint			line;
-  guint			position;
-  
-  /* fields filled in after g_scanner_peek_next_token() */
-  GTokenType		next_token;
-  GTokenValue		next_value;
-  guint			next_line;
-  guint			next_position;
-  
-  /* to be considered private */
-  GHashTable		*symbol_table;
-  gint			input_fd;
-  const gchar		*text;
-  const gchar		*text_end;
-  gchar			*buffer;
-  guint			scope_id;
-  
-  /* handler function for _warn and _error */
-  GScannerMsgFunc	msg_handler;
-};
-
-GScanner*	g_scanner_new			(const GScannerConfig *config_templ);
-void		g_scanner_destroy		(GScanner	*scanner);
-void		g_scanner_input_file		(GScanner	*scanner,
-						 gint		input_fd);
-void		g_scanner_sync_file_offset	(GScanner	*scanner);
-void		g_scanner_input_text		(GScanner	*scanner,
-						 const	gchar	*text,
-						 guint		text_len);
-GTokenType	g_scanner_get_next_token	(GScanner	*scanner);
-GTokenType	g_scanner_peek_next_token	(GScanner	*scanner);
-GTokenType	g_scanner_cur_token		(GScanner	*scanner);
-GTokenValue	g_scanner_cur_value		(GScanner	*scanner);
-guint		g_scanner_cur_line		(GScanner	*scanner);
-guint		g_scanner_cur_position		(GScanner	*scanner);
-gboolean	g_scanner_eof			(GScanner	*scanner);
-guint		g_scanner_set_scope		(GScanner	*scanner,
-						 guint		 scope_id);
-void		g_scanner_scope_add_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 const gchar	*symbol,
-						 gpointer	value);
-void		g_scanner_scope_remove_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 const gchar	*symbol);
-gpointer	g_scanner_scope_lookup_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 const gchar	*symbol);
-void		g_scanner_scope_foreach_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 GHFunc		 func,
-						 gpointer	 user_data);
-gpointer	g_scanner_lookup_symbol		(GScanner	*scanner,
-						 const gchar	*symbol);
-void		g_scanner_unexp_token		(GScanner	*scanner,
-						 GTokenType	expected_token,
-						 const gchar	*identifier_spec,
-						 const gchar	*symbol_spec,
-						 const gchar	*symbol_name,
-						 const gchar	*message,
-						 gint		 is_error);
-void		g_scanner_error			(GScanner	*scanner,
-						 const gchar	*format,
-						 ...) G_GNUC_PRINTF (2,3);
-void		g_scanner_warn			(GScanner	*scanner,
-						 const gchar	*format,
-						 ...) G_GNUC_PRINTF (2,3);
-
-#ifndef G_DISABLE_DEPRECATED
-
-/* keep downward source compatibility */
-#define		g_scanner_add_symbol( scanner, symbol, value )	G_STMT_START { \
-  g_scanner_scope_add_symbol ((scanner), 0, (symbol), (value)); \
-} G_STMT_END
-#define		g_scanner_remove_symbol( scanner, symbol )	G_STMT_START { \
-  g_scanner_scope_remove_symbol ((scanner), 0, (symbol)); \
-} G_STMT_END
-#define		g_scanner_foreach_symbol( scanner, func, data )	G_STMT_START { \
-  g_scanner_scope_foreach_symbol ((scanner), 0, (func), (data)); \
-} G_STMT_END
-
-/* The following two functions are deprecated and will be removed in
- * the next major release. They do no good. */
-#define g_scanner_freeze_symbol_table(scanner) ((void)0)
-#define g_scanner_thaw_symbol_table(scanner) ((void)0)
-
-#endif /* G_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __G_SCANNER_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gsequence.h b/protocols/Sametime/src/glib/include/glib/gsequence.h
deleted file mode 100644
index fa79066e06..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gsequence.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
- * Soeren Sandmann (sandmann@daimi.au.dk)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_SEQUENCE_H__
-#define __G_SEQUENCE_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GSequence      GSequence;
-typedef struct _GSequenceNode  GSequenceIter;
-
-typedef gint (* GSequenceIterCompareFunc) (GSequenceIter *a,
-                                           GSequenceIter *b,
-                                           gpointer       data);
-
-
-/* GSequence */
-GSequence *    g_sequence_new                (GDestroyNotify            data_destroy);
-void           g_sequence_free               (GSequence                *seq);
-gint           g_sequence_get_length         (GSequence                *seq);
-void           g_sequence_foreach            (GSequence                *seq,
-                                              GFunc                     func,
-                                              gpointer                  user_data);
-void           g_sequence_foreach_range      (GSequenceIter            *begin,
-                                              GSequenceIter            *end,
-                                              GFunc                     func,
-                                              gpointer                  user_data);
-void           g_sequence_sort               (GSequence                *seq,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-void           g_sequence_sort_iter          (GSequence                *seq,
-                                              GSequenceIterCompareFunc  cmp_func,
-                                              gpointer                  cmp_data);
-
-
-/* Getting iters */
-GSequenceIter *g_sequence_get_begin_iter     (GSequence                *seq);
-GSequenceIter *g_sequence_get_end_iter       (GSequence                *seq);
-GSequenceIter *g_sequence_get_iter_at_pos    (GSequence                *seq,
-                                              gint                      pos);
-GSequenceIter *g_sequence_append             (GSequence                *seq,
-                                              gpointer                  data);
-GSequenceIter *g_sequence_prepend            (GSequence                *seq,
-                                              gpointer                  data);
-GSequenceIter *g_sequence_insert_before      (GSequenceIter            *iter,
-                                              gpointer                  data);
-void           g_sequence_move               (GSequenceIter            *src,
-                                              GSequenceIter            *dest);
-void           g_sequence_swap               (GSequenceIter            *a,
-                                              GSequenceIter            *b);
-GSequenceIter *g_sequence_insert_sorted      (GSequence                *seq,
-                                              gpointer                  data,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-GSequenceIter *g_sequence_insert_sorted_iter (GSequence                *seq,
-                                              gpointer                  data,
-                                              GSequenceIterCompareFunc  iter_cmp,
-                                              gpointer                  cmp_data);
-void           g_sequence_sort_changed       (GSequenceIter            *iter,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-void           g_sequence_sort_changed_iter  (GSequenceIter            *iter,
-                                              GSequenceIterCompareFunc  iter_cmp,
-                                              gpointer                  cmp_data);
-void           g_sequence_remove             (GSequenceIter            *iter);
-void           g_sequence_remove_range       (GSequenceIter            *begin,
-                                              GSequenceIter            *end);
-void           g_sequence_move_range         (GSequenceIter            *dest,
-                                              GSequenceIter            *begin,
-                                              GSequenceIter            *end);
-GSequenceIter *g_sequence_search             (GSequence                *seq,
-                                              gpointer                  data,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-GSequenceIter *g_sequence_search_iter        (GSequence                *seq,
-                                              gpointer                  data,
-                                              GSequenceIterCompareFunc  iter_cmp,
-                                              gpointer                  cmp_data);
-
-
-/* Dereferencing */
-gpointer       g_sequence_get                (GSequenceIter            *iter);
-void           g_sequence_set                (GSequenceIter            *iter,
-                                              gpointer                  data);
-
-/* Operations on GSequenceIter * */
-gboolean       g_sequence_iter_is_begin      (GSequenceIter            *iter);
-gboolean       g_sequence_iter_is_end        (GSequenceIter            *iter);
-GSequenceIter *g_sequence_iter_next          (GSequenceIter            *iter);
-GSequenceIter *g_sequence_iter_prev          (GSequenceIter            *iter);
-gint           g_sequence_iter_get_position  (GSequenceIter            *iter);
-GSequenceIter *g_sequence_iter_move          (GSequenceIter            *iter,
-                                              gint                      delta);
-GSequence *    g_sequence_iter_get_sequence  (GSequenceIter            *iter);
-
-
-/* Search */
-gint           g_sequence_iter_compare       (GSequenceIter            *a,
-                                              GSequenceIter            *b);
-GSequenceIter *g_sequence_range_get_midpoint (GSequenceIter            *begin,
-                                              GSequenceIter            *end);
-
-G_END_DECLS
-
-#endif /* __G_SEQUENCE_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gshell.h b/protocols/Sametime/src/glib/include/glib/gshell.h
deleted file mode 100644
index 130f1008c8..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gshell.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* gshell.h - Shell-related utilities
- *
- *  Copyright 2000 Red Hat, Inc.
- *
- * GLib is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not, write
- * to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_SHELL_H__
-#define __G_SHELL_H__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-#define G_SHELL_ERROR g_shell_error_quark ()
-
-typedef enum
-{
-  /* mismatched or otherwise mangled quoting */
-  G_SHELL_ERROR_BAD_QUOTING,
-  /* string to be parsed was empty */
-  G_SHELL_ERROR_EMPTY_STRING,
-  G_SHELL_ERROR_FAILED
-} GShellError;
-
-GQuark g_shell_error_quark (void);
-
-gchar*   g_shell_quote      (const gchar   *unquoted_string);
-gchar*   g_shell_unquote    (const gchar   *quoted_string,
-                             GError       **error);
-gboolean g_shell_parse_argv (const gchar   *command_line,
-                             gint          *argcp,
-                             gchar       ***argvp,
-                             GError       **error);
-
-G_END_DECLS
-
-#endif /* __G_SHELL_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gslice.h b/protocols/Sametime/src/glib/include/glib/gslice.h
deleted file mode 100644
index 962199e099..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gslice.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* GLIB sliced memory - fast threaded memory chunk allocator
- * Copyright (C) 2005 Tim Janik
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_SLICE_H__
-#define __G_SLICE_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* slices - fast allocation/release of small memory blocks
- */
-gpointer g_slice_alloc          	(gsize	       block_size) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-gpointer g_slice_alloc0         	(gsize         block_size) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-gpointer g_slice_copy                   (gsize         block_size,
-                                         gconstpointer mem_block) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-void     g_slice_free1          	(gsize         block_size,
-					 gpointer      mem_block);
-void     g_slice_free_chain_with_offset (gsize         block_size,
-					 gpointer      mem_chain,
-					 gsize         next_offset);
-#define  g_slice_new(type)      ((type*) g_slice_alloc (sizeof (type)))
-#define  g_slice_new0(type)     ((type*) g_slice_alloc0 (sizeof (type)))
-/* MemoryBlockType *
- *       g_slice_dup                    (MemoryBlockType,
- *	                                 MemoryBlockType *mem_block);
- *       g_slice_free                   (MemoryBlockType,
- *	                                 MemoryBlockType *mem_block);
- *       g_slice_free_chain             (MemoryBlockType,
- *                                       MemoryBlockType *first_chain_block,
- *                                       memory_block_next_field);
- * pseudo prototypes for the macro
- * definitions following below.
- */
-
-/* we go through extra hoops to ensure type safety */
-#define g_slice_dup(type, mem)                                  \
-  (1 ? (type*) g_slice_copy (sizeof (type), (mem))              \
-     : ((void) ((type*) 0 == (mem)), (type*) 0))
-#define g_slice_free(type, mem)				do {	\
-  if (1) g_slice_free1 (sizeof (type), (mem));			\
-  else   (void) ((type*) 0 == (mem)); 				\
-} while (0)
-#define g_slice_free_chain(type, mem_chain, next)	do {	\
-  if (1) g_slice_free_chain_with_offset (sizeof (type),		\
-                 (mem_chain), G_STRUCT_OFFSET (type, next)); 	\
-  else   (void) ((type*) 0 == (mem_chain));			\
-} while (0)
-
-
-/* --- internal debugging API --- */
-typedef enum {
-  G_SLICE_CONFIG_ALWAYS_MALLOC = 1,
-  G_SLICE_CONFIG_BYPASS_MAGAZINES,
-  G_SLICE_CONFIG_WORKING_SET_MSECS,
-  G_SLICE_CONFIG_COLOR_INCREMENT,
-  G_SLICE_CONFIG_CHUNK_SIZES,
-  G_SLICE_CONFIG_CONTENTION_COUNTER
-} GSliceConfig;
-void     g_slice_set_config	   (GSliceConfig ckey, gint64 value);
-gint64   g_slice_get_config	   (GSliceConfig ckey);
-gint64*  g_slice_get_config_state  (GSliceConfig ckey, gint64 address, guint *n_values);
-
-G_END_DECLS
-
-#endif /* __G_SLICE_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gslist.h b/protocols/Sametime/src/glib/include/glib/gslist.h
deleted file mode 100644
index 8b01faf5cd..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gslist.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_SLIST_H__
-#define __G_SLIST_H__
-
-#include <glib/gmem.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GSList GSList;
-
-struct _GSList
-{
-  gpointer data;
-  GSList *next;
-};
-
-/* Singly linked lists
- */
-GSList*  g_slist_alloc                   (void) G_GNUC_WARN_UNUSED_RESULT;
-void     g_slist_free                    (GSList           *list);
-void     g_slist_free_1                  (GSList           *list);
-#define	 g_slist_free1		         g_slist_free_1
-GSList*  g_slist_append                  (GSList           *list,
-					  gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_prepend                 (GSList           *list,
-					  gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_insert                  (GSList           *list,
-					  gpointer          data,
-					  gint              position) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_insert_sorted           (GSList           *list,
-					  gpointer          data,
-					  GCompareFunc      func) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_insert_sorted_with_data (GSList           *list,
-					  gpointer          data,
-					  GCompareDataFunc  func,
-					  gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_insert_before           (GSList           *slist,
-					  GSList           *sibling,
-					  gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_concat                  (GSList           *list1,
-					  GSList           *list2) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_remove                  (GSList           *list,
-					  gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_remove_all              (GSList           *list,
-					  gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_remove_link             (GSList           *list,
-					  GSList           *link_) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_delete_link             (GSList           *list,
-					  GSList           *link_) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_reverse                 (GSList           *list) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_copy                    (GSList           *list) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_nth                     (GSList           *list,
-					  guint             n);
-GSList*  g_slist_find                    (GSList           *list,
-					  gconstpointer     data);
-GSList*  g_slist_find_custom             (GSList           *list,
-					  gconstpointer     data,
-					  GCompareFunc      func);
-gint     g_slist_position                (GSList           *list,
-					  GSList           *llink);
-gint     g_slist_index                   (GSList           *list,
-					  gconstpointer     data);
-GSList*  g_slist_last                    (GSList           *list);
-guint    g_slist_length                  (GSList           *list);
-void     g_slist_foreach                 (GSList           *list,
-					  GFunc             func,
-					  gpointer          user_data);
-GSList*  g_slist_sort                    (GSList           *list,
-					  GCompareFunc      compare_func) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_sort_with_data          (GSList           *list,
-					  GCompareDataFunc  compare_func,
-					  gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-gpointer g_slist_nth_data                (GSList           *list,
-					  guint             n);
-
-#define  g_slist_next(slist)	         ((slist) ? (((GSList *)(slist))->next) : NULL)
-
-#ifndef G_DISABLE_DEPRECATED
-void     g_slist_push_allocator          (gpointer	   dummy);
-void     g_slist_pop_allocator           (void);
-#endif
-
-G_END_DECLS
-
-#endif /* __G_SLIST_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gspawn.h b/protocols/Sametime/src/glib/include/glib/gspawn.h
deleted file mode 100644
index 9836b34242..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gspawn.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* gspawn.h - Process launching
- *
- *  Copyright 2000 Red Hat, Inc.
- *
- * GLib is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not, write
- * to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_SPAWN_H__
-#define __G_SPAWN_H__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-/* I'm not sure I remember our proposed naming convention here. */
-#define G_SPAWN_ERROR g_spawn_error_quark ()
-
-typedef enum
-{
-  G_SPAWN_ERROR_FORK,   /* fork failed due to lack of memory */
-  G_SPAWN_ERROR_READ,   /* read or select on pipes failed */
-  G_SPAWN_ERROR_CHDIR,  /* changing to working dir failed */
-  G_SPAWN_ERROR_ACCES,  /* execv() returned EACCES */
-  G_SPAWN_ERROR_PERM,   /* execv() returned EPERM */
-  G_SPAWN_ERROR_2BIG,   /* execv() returned E2BIG */
-  G_SPAWN_ERROR_NOEXEC, /* execv() returned ENOEXEC */
-  G_SPAWN_ERROR_NAMETOOLONG, /* ""  "" ENAMETOOLONG */
-  G_SPAWN_ERROR_NOENT,       /* ""  "" ENOENT */
-  G_SPAWN_ERROR_NOMEM,       /* ""  "" ENOMEM */
-  G_SPAWN_ERROR_NOTDIR,      /* ""  "" ENOTDIR */
-  G_SPAWN_ERROR_LOOP,        /* ""  "" ELOOP   */
-  G_SPAWN_ERROR_TXTBUSY,     /* ""  "" ETXTBUSY */
-  G_SPAWN_ERROR_IO,          /* ""  "" EIO */
-  G_SPAWN_ERROR_NFILE,       /* ""  "" ENFILE */
-  G_SPAWN_ERROR_MFILE,       /* ""  "" EMFLE */
-  G_SPAWN_ERROR_INVAL,       /* ""  "" EINVAL */
-  G_SPAWN_ERROR_ISDIR,       /* ""  "" EISDIR */
-  G_SPAWN_ERROR_LIBBAD,      /* ""  "" ELIBBAD */
-  G_SPAWN_ERROR_FAILED       /* other fatal failure, error->message
-                              * should explain
-                              */
-} GSpawnError;
-
-typedef void (* GSpawnChildSetupFunc) (gpointer user_data);
-
-typedef enum
-{
-  G_SPAWN_LEAVE_DESCRIPTORS_OPEN = 1 << 0,
-  G_SPAWN_DO_NOT_REAP_CHILD      = 1 << 1,
-  /* look for argv[0] in the path i.e. use execvp() */
-  G_SPAWN_SEARCH_PATH            = 1 << 2,
-  /* Dump output to /dev/null */
-  G_SPAWN_STDOUT_TO_DEV_NULL     = 1 << 3,
-  G_SPAWN_STDERR_TO_DEV_NULL     = 1 << 4,
-  G_SPAWN_CHILD_INHERITS_STDIN   = 1 << 5,
-  G_SPAWN_FILE_AND_ARGV_ZERO     = 1 << 6
-} GSpawnFlags;
-
-GQuark g_spawn_error_quark (void);
-
-#ifdef G_OS_WIN32
-#define g_spawn_async g_spawn_async_utf8
-#define g_spawn_async_with_pipes g_spawn_async_with_pipes_utf8
-#define g_spawn_sync g_spawn_sync_utf8
-#define g_spawn_command_line_sync g_spawn_command_line_sync_utf8
-#define g_spawn_command_line_async g_spawn_command_line_async_utf8
-#endif
-
-gboolean g_spawn_async (const gchar           *working_directory,
-                        gchar                **argv,
-                        gchar                **envp,
-                        GSpawnFlags            flags,
-                        GSpawnChildSetupFunc   child_setup,
-                        gpointer               user_data,
-                        GPid                  *child_pid,
-                        GError               **error);
-
-
-/* Opens pipes for non-NULL standard_output, standard_input, standard_error,
- * and returns the parent's end of the pipes.
- */
-gboolean g_spawn_async_with_pipes (const gchar          *working_directory,
-                                   gchar               **argv,
-                                   gchar               **envp,
-                                   GSpawnFlags           flags,
-                                   GSpawnChildSetupFunc  child_setup,
-                                   gpointer              user_data,
-                                   GPid                 *child_pid,
-                                   gint                 *standard_input,
-                                   gint                 *standard_output,
-                                   gint                 *standard_error,
-                                   GError              **error);
-
-
-/* If standard_output or standard_error are non-NULL, the full
- * standard output or error of the command will be placed there.
- */
-
-gboolean g_spawn_sync         (const gchar          *working_directory,
-                               gchar               **argv,
-                               gchar               **envp,
-                               GSpawnFlags           flags,
-                               GSpawnChildSetupFunc  child_setup,
-                               gpointer              user_data,
-                               gchar               **standard_output,
-                               gchar               **standard_error,
-                               gint                 *exit_status,
-                               GError              **error);
-
-gboolean g_spawn_command_line_sync  (const gchar          *command_line,
-                                     gchar               **standard_output,
-                                     gchar               **standard_error,
-                                     gint                 *exit_status,
-                                     GError              **error);
-gboolean g_spawn_command_line_async (const gchar          *command_line,
-                                     GError              **error);
-
-void g_spawn_close_pid (GPid pid);
-
-G_END_DECLS
-
-#endif /* __G_SPAWN_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gstrfuncs.h b/protocols/Sametime/src/glib/include/glib/gstrfuncs.h
deleted file mode 100644
index 5c7332a3c4..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gstrfuncs.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_STRFUNCS_H__
-#define __G_STRFUNCS_H__
-
-#include <stdarg.h>
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* Functions like the ones in <ctype.h> that are not affected by locale. */
-typedef enum {
-  G_ASCII_ALNUM  = 1 << 0,
-  G_ASCII_ALPHA  = 1 << 1,
-  G_ASCII_CNTRL  = 1 << 2,
-  G_ASCII_DIGIT  = 1 << 3,
-  G_ASCII_GRAPH  = 1 << 4,
-  G_ASCII_LOWER  = 1 << 5,
-  G_ASCII_PRINT  = 1 << 6,
-  G_ASCII_PUNCT  = 1 << 7,
-  G_ASCII_SPACE  = 1 << 8,
-  G_ASCII_UPPER  = 1 << 9,
-  G_ASCII_XDIGIT = 1 << 10
-} GAsciiType;
-
-GLIB_VAR const guint16 * const g_ascii_table;
-
-#define g_ascii_isalnum(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_ALNUM) != 0)
-
-#define g_ascii_isalpha(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_ALPHA) != 0)
-
-#define g_ascii_iscntrl(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_CNTRL) != 0)
-
-#define g_ascii_isdigit(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_DIGIT) != 0)
-
-#define g_ascii_isgraph(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_GRAPH) != 0)
-
-#define g_ascii_islower(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_LOWER) != 0)
-
-#define g_ascii_isprint(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_PRINT) != 0)
-
-#define g_ascii_ispunct(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_PUNCT) != 0)
-
-#define g_ascii_isspace(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_SPACE) != 0)
-
-#define g_ascii_isupper(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_UPPER) != 0)
-
-#define g_ascii_isxdigit(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_XDIGIT) != 0)
-
-gchar                 g_ascii_tolower  (gchar        c) G_GNUC_CONST;
-gchar                 g_ascii_toupper  (gchar        c) G_GNUC_CONST;
-
-gint                  g_ascii_digit_value  (gchar    c) G_GNUC_CONST;
-gint                  g_ascii_xdigit_value (gchar    c) G_GNUC_CONST;
-
-/* String utility functions that modify a string argument or
- * return a constant string that must not be freed.
- */
-#define	 G_STR_DELIMITERS	"_-|> <."
-gchar*	              g_strdelimit     (gchar	     *string,
-					const gchar  *delimiters,
-					gchar	      new_delimiter);
-gchar*	              g_strcanon       (gchar        *string,
-					const gchar  *valid_chars,
-					gchar         substitutor);
-G_CONST_RETURN gchar* g_strerror       (gint	      errnum) G_GNUC_CONST;
-G_CONST_RETURN gchar* g_strsignal      (gint	      signum) G_GNUC_CONST;
-gchar*	              g_strreverse     (gchar	     *string);
-gsize	              g_strlcpy	       (gchar	     *dest,
-					const gchar  *src,
-					gsize         dest_size);
-gsize	              g_strlcat        (gchar	     *dest,
-					const gchar  *src,
-					gsize         dest_size);
-gchar *               g_strstr_len     (const gchar  *haystack,
-					gssize        haystack_len,
-					const gchar  *needle);
-gchar *               g_strrstr        (const gchar  *haystack,
-					const gchar  *needle);
-gchar *               g_strrstr_len    (const gchar  *haystack,
-					gssize        haystack_len,
-					const gchar  *needle);
-
-gboolean              g_str_has_suffix (const gchar  *str,
-					const gchar  *suffix);
-gboolean              g_str_has_prefix (const gchar  *str,
-					const gchar  *prefix);
-
-/* String to/from double conversion functions */
-
-gdouble	              g_strtod         (const gchar  *nptr,
-					gchar	    **endptr);
-gdouble	              g_ascii_strtod   (const gchar  *nptr,
-					gchar	    **endptr);
-guint64		      g_ascii_strtoull (const gchar *nptr,
-					gchar      **endptr,
-					guint        base);
-gint64		      g_ascii_strtoll  (const gchar *nptr,
-					gchar      **endptr,
-					guint        base);
-/* 29 bytes should enough for all possible values that
- * g_ascii_dtostr can produce.
- * Then add 10 for good measure */
-#define G_ASCII_DTOSTR_BUF_SIZE (29 + 10)
-gchar *               g_ascii_dtostr   (gchar        *buffer,
-					gint          buf_len,
-					gdouble       d);
-gchar *               g_ascii_formatd  (gchar        *buffer,
-					gint          buf_len,
-					const gchar  *format,
-					gdouble       d);
-
-/* removes leading spaces */
-gchar*                g_strchug        (gchar        *string);
-/* removes trailing spaces */
-gchar*                g_strchomp       (gchar        *string);
-/* removes leading & trailing spaces */
-#define g_strstrip( string )	g_strchomp (g_strchug (string))
-
-gint                  g_ascii_strcasecmp  (const gchar *s1,
-					   const gchar *s2);
-gint                  g_ascii_strncasecmp (const gchar *s1,
-					   const gchar *s2,
-					   gsize        n);
-gchar*                g_ascii_strdown     (const gchar *str,
-					   gssize       len) G_GNUC_MALLOC;
-gchar*                g_ascii_strup       (const gchar *str,
-					   gssize       len) G_GNUC_MALLOC;
-
-#ifndef G_DISABLE_DEPRECATED
-
-/* The following four functions are deprecated and will be removed in
- * the next major release. They use the locale-specific tolower and
- * toupper, which is almost never the right thing.
- */
-
-gint	              g_strcasecmp     (const gchar *s1,
-					const gchar *s2);
-gint	              g_strncasecmp    (const gchar *s1,
-					const gchar *s2,
-					guint        n);
-gchar*	              g_strdown	       (gchar	     *string);
-gchar*	              g_strup	       (gchar	     *string);
-
-#endif /* G_DISABLE_DEPRECATED */
-
-/* String utility functions that return a newly allocated string which
- * ought to be freed with g_free from the caller at some point.
- */
-gchar*	              g_strdup	       (const gchar *str) G_GNUC_MALLOC;
-gchar*	              g_strdup_printf  (const gchar *format,
-					...) G_GNUC_PRINTF (1, 2) G_GNUC_MALLOC;
-gchar*	              g_strdup_vprintf (const gchar *format,
-					va_list      args) G_GNUC_MALLOC;
-gchar*	              g_strndup	       (const gchar *str,
-					gsize        n) G_GNUC_MALLOC;  
-gchar*	              g_strnfill       (gsize        length,  
-					gchar        fill_char) G_GNUC_MALLOC;
-gchar*	              g_strconcat      (const gchar *string1,
-					...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-gchar*                g_strjoin	       (const gchar  *separator,
-					...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-
-/* Make a copy of a string interpreting C string -style escape
- * sequences. Inverse of g_strescape. The recognized sequences are \b
- * \f \n \r \t \\ \" and the octal format.
- */
-gchar*                g_strcompress    (const gchar *source) G_GNUC_MALLOC;
-
-/* Copy a string escaping nonprintable characters like in C strings.
- * Inverse of g_strcompress. The exceptions parameter, if non-NULL, points
- * to a string containing characters that are not to be escaped.
- *
- * Deprecated API: gchar* g_strescape (const gchar *source);
- * Luckily this function wasn't used much, using NULL as second parameter
- * provides mostly identical semantics.
- */
-gchar*                g_strescape      (const gchar *source,
-					const gchar *exceptions) G_GNUC_MALLOC;
-
-gpointer              g_memdup	       (gconstpointer mem,
-					guint	       byte_size) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(2);
-
-/* NULL terminated string arrays.
- * g_strsplit(), g_strsplit_set() split up string into max_tokens tokens
- * at delim and return a newly allocated string array.
- * g_strjoinv() concatenates all of str_array's strings, sliding in an
- * optional separator, the returned string is newly allocated.
- * g_strfreev() frees the array itself and all of its strings.
- * g_strdupv() copies a NULL-terminated array of strings
- * g_strv_length() returns the length of a NULL-terminated array of strings
- */
-gchar**	              g_strsplit       (const gchar  *string,
-					const gchar  *delimiter,
-					gint          max_tokens) G_GNUC_MALLOC;
-gchar **	      g_strsplit_set   (const gchar *string,
-					const gchar *delimiters,
-					gint         max_tokens) G_GNUC_MALLOC;
-gchar*                g_strjoinv       (const gchar  *separator,
-					gchar       **str_array) G_GNUC_MALLOC;
-void                  g_strfreev       (gchar       **str_array);
-gchar**               g_strdupv        (gchar       **str_array) G_GNUC_MALLOC;
-guint                 g_strv_length    (gchar       **str_array);
-
-gchar*                g_stpcpy         (gchar        *dest,
-                                        const char   *src);
-
-G_CONST_RETURN gchar *g_strip_context  (const gchar *msgid, 
-					const gchar *msgval) G_GNUC_FORMAT(1);
-
-G_CONST_RETURN gchar *g_dgettext       (const gchar *domain,
-					const gchar *msgid) G_GNUC_FORMAT(2);
-G_CONST_RETURN gchar *g_dcgettext      (const gchar *domain,
-					const gchar *msgid,
-                                        int          category) G_GNUC_FORMAT(2);
-G_CONST_RETURN gchar *g_dngettext      (const gchar *domain,
-					const gchar *msgid,
-					const gchar *msgid_plural,
-					gulong       n) G_GNUC_FORMAT(3);
-G_CONST_RETURN gchar *g_dpgettext      (const gchar *domain,
-                                        const gchar *msgctxtid,
-                                        gsize        msgidoffset) G_GNUC_FORMAT(2);
-G_CONST_RETURN gchar *g_dpgettext2     (const gchar *domain,
-                                        const gchar *context,
-                                        const gchar *msgid) G_GNUC_FORMAT(3);
-
-G_END_DECLS
-
-#endif /* __G_STRFUNCS_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gstring.h b/protocols/Sametime/src/glib/include/glib/gstring.h
deleted file mode 100644
index 2b1dd6ece2..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gstring.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_STRING_H__
-#define __G_STRING_H__
-
-#include <glib/gtypes.h>
-#include <glib/gunicode.h>
-#include <glib/gutils.h>  /* for G_CAN_INLINE */
-
-G_BEGIN_DECLS
-
-typedef struct _GString		GString;
-typedef struct _GStringChunk	GStringChunk;
-
-struct _GString
-{
-  gchar  *str;
-  gsize len;    
-  gsize allocated_len;
-};
-
-/* String Chunks
- */
-GStringChunk* g_string_chunk_new	   (gsize size);  
-void	      g_string_chunk_free	   (GStringChunk *chunk);
-void	      g_string_chunk_clear	   (GStringChunk *chunk);
-gchar*	      g_string_chunk_insert	   (GStringChunk *chunk,
-					    const gchar	 *string);
-gchar*	      g_string_chunk_insert_len	   (GStringChunk *chunk,
-					    const gchar	 *string,
-					    gssize        len);
-gchar*	      g_string_chunk_insert_const  (GStringChunk *chunk,
-					    const gchar	 *string);
-
-
-/* Strings
- */
-GString*     g_string_new	        (const gchar	 *init);
-GString*     g_string_new_len           (const gchar     *init,
-                                         gssize           len);   
-GString*     g_string_sized_new         (gsize            dfl_size);  
-gchar*	     g_string_free	        (GString	 *string,
-					 gboolean	  free_segment);
-gboolean     g_string_equal             (const GString	 *v,
-					 const GString 	 *v2);
-guint        g_string_hash              (const GString   *str);
-GString*     g_string_assign            (GString	 *string,
-					 const gchar	 *rval);
-GString*     g_string_truncate          (GString	 *string,
-					 gsize		  len);    
-GString*     g_string_set_size          (GString         *string,
-					 gsize            len);
-GString*     g_string_insert_len        (GString         *string,
-                                         gssize           pos,   
-                                         const gchar     *val,
-                                         gssize           len);  
-GString*     g_string_append            (GString	 *string,
-			                 const gchar	 *val);
-GString*     g_string_append_len        (GString	 *string,
-			                 const gchar	 *val,
-                                         gssize           len);  
-GString*     g_string_append_c          (GString	 *string,
-					 gchar		  c);
-GString*     g_string_append_unichar    (GString	 *string,
-					 gunichar	  wc);
-GString*     g_string_prepend           (GString	 *string,
-					 const gchar	 *val);
-GString*     g_string_prepend_c         (GString	 *string,
-					 gchar		  c);
-GString*     g_string_prepend_unichar   (GString	 *string,
-					 gunichar	  wc);
-GString*     g_string_prepend_len       (GString	 *string,
-			                 const gchar	 *val,
-                                         gssize           len);  
-GString*     g_string_insert            (GString	 *string,
-					 gssize		  pos,    
-					 const gchar	 *val);
-GString*     g_string_insert_c          (GString	 *string,
-					 gssize		  pos,    
-					 gchar		  c);
-GString*     g_string_insert_unichar    (GString	 *string,
-					 gssize		  pos,    
-					 gunichar	  wc);
-GString*     g_string_overwrite         (GString	 *string,
-					 gsize		  pos,    
-					 const gchar	 *val);
-GString*     g_string_overwrite_len     (GString	 *string,
-					 gsize		  pos,    
-					 const gchar	 *val,
-					 gssize           len);
-GString*     g_string_erase	        (GString	 *string,
-					 gssize		  pos,
-					 gssize		  len);
-GString*     g_string_ascii_down        (GString	 *string);
-GString*     g_string_ascii_up          (GString	 *string);
-void         g_string_vprintf           (GString	 *string,
-					 const gchar	 *format,
-					 va_list          args);
-void         g_string_printf            (GString	 *string,
-					 const gchar	 *format,
-					 ...) G_GNUC_PRINTF (2, 3);
-void         g_string_append_vprintf    (GString	 *string,
-					 const gchar	 *format,
-					 va_list          args);
-void         g_string_append_printf     (GString	 *string,
-					 const gchar	 *format,
-					 ...) G_GNUC_PRINTF (2, 3);
-GString *    g_string_append_uri_escaped(GString         *string,
-					 const char      *unescaped,
-					 const char      *reserved_chars_allowed,
-					 gboolean         allow_utf8);
-
-/* -- optimize g_strig_append_c --- */
-#ifdef G_CAN_INLINE
-static inline GString*
-g_string_append_c_inline (GString *gstring,
-                          gchar    c)
-{
-  if (gstring->len + 1 < gstring->allocated_len)
-    {
-      gstring->str[gstring->len++] = c;
-      gstring->str[gstring->len] = 0;
-    }
-  else
-    g_string_insert_c (gstring, -1, c);
-  return gstring;
-}
-#define g_string_append_c(gstr,c)       g_string_append_c_inline (gstr, c)
-#endif /* G_CAN_INLINE */
-
-
-#ifndef G_DISABLE_DEPRECATED
-
-/* The following two functions are deprecated and will be removed in
- * the next major release. They use the locale-specific tolower and
- * toupper, which is almost never the right thing.
- */
-
-GString*     g_string_down              (GString	 *string);
-GString*     g_string_up                (GString	 *string);
-
-/* These aliases are included for compatibility. */
-#define	g_string_sprintf	g_string_printf
-#define	g_string_sprintfa	g_string_append_printf
-
-#endif /* G_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __G_STRING_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gtestutils.h b/protocols/Sametime/src/glib/include/glib/gtestutils.h
deleted file mode 100644
index b441fe08bc..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gtestutils.h
+++ /dev/null
@@ -1,297 +0,0 @@
-/* GLib testing utilities
- * Copyright (C) 2007 Imendio AB
- * Authors: Tim Janik
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_TEST_UTILS_H__
-#define __G_TEST_UTILS_H__
-
-#include <glib/gmessages.h>
-#include <glib/gstring.h>
-#include <glib/gerror.h>
-#include <glib/gslist.h>
-
-G_BEGIN_DECLS
-
-typedef struct GTestCase  GTestCase;
-typedef struct GTestSuite GTestSuite;
-typedef void (*GTestFunc)        (void);
-typedef void (*GTestDataFunc)    (gconstpointer user_data);
-typedef void (*GTestFixtureFunc) (gpointer      fixture,
-                                  gconstpointer user_data);
-
-/* assertion API */
-#define g_assert_cmpstr(s1, cmp, s2)    do { const char *__s1 = (s1), *__s2 = (s2); \
-                                             if (g_strcmp0 (__s1, __s2) cmp 0) ; else \
-                                               g_assertion_message_cmpstr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #s1 " " #cmp " " #s2, __s1, #cmp, __s2); } while (0)
-#define g_assert_cmpint(n1, cmp, n2)    do { gint64 __n1 = (n1), __n2 = (n2); \
-                                             if (__n1 cmp __n2) ; else \
-                                               g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #n1 " " #cmp " " #n2, __n1, #cmp, __n2, 'i'); } while (0)
-#define g_assert_cmpuint(n1, cmp, n2)   do { guint64 __n1 = (n1), __n2 = (n2); \
-                                             if (__n1 cmp __n2) ; else \
-                                               g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #n1 " " #cmp " " #n2, __n1, #cmp, __n2, 'i'); } while (0)
-#define g_assert_cmphex(n1, cmp, n2)    do { guint64 __n1 = (n1), __n2 = (n2); \
-                                             if (__n1 cmp __n2) ; else \
-                                               g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #n1 " " #cmp " " #n2, __n1, #cmp, __n2, 'x'); } while (0)
-#define g_assert_cmpfloat(n1,cmp,n2)    do { long double __n1 = (n1), __n2 = (n2); \
-                                             if (__n1 cmp __n2) ; else \
-                                               g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #n1 " " #cmp " " #n2, __n1, #cmp, __n2, 'f'); } while (0)
-#define g_assert_no_error(err)          do { if (err) \
-                                               g_assertion_message_error (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #err, err, 0, 0); } while (0)
-#define g_assert_error(err, dom, c)	do { if (!err || (err)->domain != dom || (err)->code != c) \
-                                               g_assertion_message_error (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #err, err, dom, c); } while (0)
-#ifdef G_DISABLE_ASSERT
-#define g_assert_not_reached()          do { (void) 0; } while (0)
-#define g_assert(expr)                  do { (void) 0; } while (0)
-#else /* !G_DISABLE_ASSERT */
-#define g_assert_not_reached()          do { g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, NULL); } while (0)
-#define g_assert(expr)                  do { if G_LIKELY (expr) ; else \
-                                               g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #expr); } while (0)
-#endif /* !G_DISABLE_ASSERT */
-
-int     g_strcmp0                       (const char     *str1,
-                                         const char     *str2);
-
-/* report performance results */
-void    g_test_minimized_result         (double          minimized_quantity,
-                                         const char     *format,
-                                         ...) G_GNUC_PRINTF (2, 3);
-void    g_test_maximized_result         (double          maximized_quantity,
-                                         const char     *format,
-                                         ...) G_GNUC_PRINTF (2, 3);
-
-/* initialize testing framework */
-void    g_test_init                     (int            *argc,
-                                         char         ***argv,
-                                         ...);
-/* query testing framework config */
-#define g_test_quick()                  (g_test_config_vars->test_quick)
-#define g_test_slow()                   (!g_test_config_vars->test_quick)
-#define g_test_thorough()               (!g_test_config_vars->test_quick)
-#define g_test_perf()                   (g_test_config_vars->test_perf)
-#define g_test_verbose()                (g_test_config_vars->test_verbose)
-#define g_test_quiet()                  (g_test_config_vars->test_quiet)
-/* run all tests under toplevel suite (path: /) */
-int     g_test_run                      (void);
-/* hook up a test functions under test path */
-void    g_test_add_func                 (const char     *testpath,
-                                         GTestFunc       test_func);
-
-void    g_test_add_data_func            (const char     *testpath,
-                                         gconstpointer   test_data,
-                                         GTestDataFunc   test_func);
-
-/* hook up a test with fixture under test path */
-#define g_test_add(testpath, Fixture, tdata, fsetup, ftest, fteardown) \
-					G_STMT_START {			\
-                                         void (*add_vtable) (const char*,       \
-                                                    gsize,             \
-                                                    gconstpointer,     \
-                                                    void (*) (Fixture*, gconstpointer),   \
-                                                    void (*) (Fixture*, gconstpointer),   \
-                                                    void (*) (Fixture*, gconstpointer)) =  (void (*) (const gchar *, gsize, gconstpointer, void (*) (Fixture*, gconstpointer), void (*) (Fixture*, gconstpointer), void (*) (Fixture*, gconstpointer))) g_test_add_vtable; \
-                                         add_vtable \
-                                          (testpath, sizeof (Fixture), tdata, fsetup, ftest, fteardown); \
-					} G_STMT_END
-
-/* add test messages to the test report */
-void    g_test_message                  (const char *format,
-                                         ...) G_GNUC_PRINTF (1, 2);
-void    g_test_bug_base                 (const char *uri_pattern);
-void    g_test_bug                      (const char *bug_uri_snippet);
-/* measure test timings */
-void    g_test_timer_start              (void);
-double  g_test_timer_elapsed            (void); /* elapsed seconds */
-double  g_test_timer_last               (void); /* repeat last elapsed() result */
-
-/* automatically g_free or g_object_unref upon teardown */
-void    g_test_queue_free               (gpointer gfree_pointer);
-void    g_test_queue_destroy            (GDestroyNotify destroy_func,
-                                         gpointer       destroy_data);
-#define g_test_queue_unref(gobject)     g_test_queue_destroy (g_object_unref, gobject)
-
-/* test traps are guards used around forked tests */
-typedef enum {
-  G_TEST_TRAP_SILENCE_STDOUT    = 1 << 7,
-  G_TEST_TRAP_SILENCE_STDERR    = 1 << 8,
-  G_TEST_TRAP_INHERIT_STDIN     = 1 << 9
-} GTestTrapFlags;
-gboolean g_test_trap_fork               (guint64              usec_timeout,
-                                         GTestTrapFlags       test_trap_flags);
-gboolean g_test_trap_has_passed         (void);
-gboolean g_test_trap_reached_timeout    (void);
-#define  g_test_trap_assert_passed()                      g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 0, 0)
-#define  g_test_trap_assert_failed()                      g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 1, 0)
-#define  g_test_trap_assert_stdout(soutpattern)           g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 2, soutpattern)
-#define  g_test_trap_assert_stdout_unmatched(soutpattern) g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 3, soutpattern)
-#define  g_test_trap_assert_stderr(serrpattern)           g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 4, serrpattern)
-#define  g_test_trap_assert_stderr_unmatched(serrpattern) g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 5, serrpattern)
-
-/* provide seed-able random numbers for tests */
-#define  g_test_rand_bit()              (0 != (g_test_rand_int() & (1 << 15)))
-gint32   g_test_rand_int                (void);
-gint32   g_test_rand_int_range          (gint32          begin,
-                                         gint32          end);
-double   g_test_rand_double             (void);
-double   g_test_rand_double_range       (double          range_start,
-                                         double          range_end);
-
-/* semi-internal API */
-GTestCase*    g_test_create_case        (const char       *test_name,
-                                         gsize             data_size,
-                                         gconstpointer     test_data,
-                                         GTestFixtureFunc  data_setup,
-                                         GTestFixtureFunc  data_test,
-                                         GTestFixtureFunc  data_teardown);
-GTestSuite*   g_test_create_suite       (const char       *suite_name);
-GTestSuite*   g_test_get_root           (void);
-void          g_test_suite_add          (GTestSuite     *suite,
-                                         GTestCase      *test_case);
-void          g_test_suite_add_suite    (GTestSuite     *suite,
-                                         GTestSuite     *nestedsuite);
-int           g_test_run_suite          (GTestSuite     *suite);
-
-/* internal ABI */
-void    g_test_trap_assertions          (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         guint64         assertion_flags, /* 0-pass, 1-fail, 2-outpattern, 4-errpattern */
-                                         const char     *pattern);
-void    g_assertion_message             (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *message) G_GNUC_NORETURN;
-void    g_assertion_message_expr        (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *expr) G_GNUC_NORETURN;
-void    g_assertion_message_cmpstr      (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *expr,
-                                         const char     *arg1,
-                                         const char     *cmp,
-                                         const char     *arg2) G_GNUC_NORETURN;
-void    g_assertion_message_cmpnum      (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *expr,
-                                         long double     arg1,
-                                         const char     *cmp,
-                                         long double     arg2,
-                                         char            numtype) G_GNUC_NORETURN;
-void    g_assertion_message_error       (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *expr,
-                                         const GError   *error,
-                                         GQuark          error_domain,
-                                         int             error_code) G_GNUC_NORETURN;
-void    g_test_add_vtable               (const char     *testpath,
-                                         gsize           data_size,
-                                         gconstpointer   test_data,
-                                         GTestFixtureFunc  data_setup,
-                                         GTestFixtureFunc  data_test,
-                                         GTestFixtureFunc  data_teardown);
-typedef struct {
-  gboolean      test_initialized;
-  gboolean      test_quick;     /* disable thorough tests */
-  gboolean      test_perf;      /* run performance tests */
-  gboolean      test_verbose;   /* extra info */
-  gboolean      test_quiet;     /* reduce output */
-} GTestConfig;
-GLIB_VAR const GTestConfig * const g_test_config_vars;
-
-/* internal logging API */
-typedef enum {
-  G_TEST_LOG_NONE,
-  G_TEST_LOG_ERROR,             /* s:msg */
-  G_TEST_LOG_START_BINARY,      /* s:binaryname s:seed */
-  G_TEST_LOG_LIST_CASE,         /* s:testpath */
-  G_TEST_LOG_SKIP_CASE,         /* s:testpath */
-  G_TEST_LOG_START_CASE,        /* s:testpath */
-  G_TEST_LOG_STOP_CASE,         /* d:status d:nforks d:elapsed */
-  G_TEST_LOG_MIN_RESULT,        /* s:blurb d:result */
-  G_TEST_LOG_MAX_RESULT,        /* s:blurb d:result */
-  G_TEST_LOG_MESSAGE            /* s:blurb */
-} GTestLogType;
-
-typedef struct {
-  GTestLogType  log_type;
-  guint         n_strings;
-  gchar       **strings; /* NULL terminated */
-  guint         n_nums;
-  long double  *nums;
-} GTestLogMsg;
-typedef struct {
-  /*< private >*/
-  GString     *data;
-  GSList      *msgs;
-} GTestLogBuffer;
-
-const char*     g_test_log_type_name    (GTestLogType    log_type);
-GTestLogBuffer* g_test_log_buffer_new   (void);
-void            g_test_log_buffer_free  (GTestLogBuffer *tbuffer);
-void            g_test_log_buffer_push  (GTestLogBuffer *tbuffer,
-                                         guint           n_bytes,
-                                         const guint8   *bytes);
-GTestLogMsg*    g_test_log_buffer_pop   (GTestLogBuffer *tbuffer);
-void            g_test_log_msg_free     (GTestLogMsg    *tmsg);
-
-/**
- * GTestLogFatalFunc:
- * @log_domain: the log domain of the message
- * @log_level: the log level of the message (including the fatal and recursion flags)
- * @message: the message to process
- * @user_data: user data, set in g_test_log_set_fatal_handler()
- *
- * Specifies the prototype of fatal log handler functions.
- *
- * Return value: %TRUE if the program should abort, %FALSE otherwise
- *
- * Since: 2.22
- */
-typedef gboolean        (*GTestLogFatalFunc)    (const gchar    *log_domain,
-                                                 GLogLevelFlags  log_level,
-                                                 const gchar    *message,
-                                                 gpointer        user_data);
-void
-g_test_log_set_fatal_handler            (GTestLogFatalFunc log_func,
-                                         gpointer          user_data);
-
-G_END_DECLS
-
-#endif /* __G_TEST_UTILS_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gthread.h b/protocols/Sametime/src/glib/include/glib/gthread.h
deleted file mode 100644
index 82d40c0b85..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gthread.h
+++ /dev/null
@@ -1,407 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_THREAD_H__
-#define __G_THREAD_H__
-
-#include <glib/gerror.h>
-#include <glib/gutils.h>        /* for G_INLINE_FUNC */
-#include <glib/gatomic.h>       /* for g_atomic_pointer_get */
-
-G_BEGIN_DECLS
-
-/* GLib Thread support
- */
-
-extern GQuark g_thread_error_quark (void);
-#define G_THREAD_ERROR g_thread_error_quark ()
-
-typedef enum
-{
-  G_THREAD_ERROR_AGAIN /* Resource temporarily unavailable */
-} GThreadError;
-
-typedef gpointer (*GThreadFunc) (gpointer data);
-
-typedef enum
-{
-  G_THREAD_PRIORITY_LOW,
-  G_THREAD_PRIORITY_NORMAL,
-  G_THREAD_PRIORITY_HIGH,
-  G_THREAD_PRIORITY_URGENT
-} GThreadPriority;
-
-typedef struct _GThread         GThread;
-struct  _GThread
-{
-  /*< private >*/
-  GThreadFunc func;
-  gpointer data;
-  gboolean joinable;
-  GThreadPriority priority;
-};
-
-typedef struct _GMutex          GMutex;
-typedef struct _GCond           GCond;
-typedef struct _GPrivate        GPrivate;
-typedef struct _GStaticPrivate  GStaticPrivate;
-
-typedef struct _GThreadFunctions GThreadFunctions;
-struct _GThreadFunctions
-{
-  GMutex*  (*mutex_new)           (void);
-  void     (*mutex_lock)          (GMutex               *mutex);
-  gboolean (*mutex_trylock)       (GMutex               *mutex);
-  void     (*mutex_unlock)        (GMutex               *mutex);
-  void     (*mutex_free)          (GMutex               *mutex);
-  GCond*   (*cond_new)            (void);
-  void     (*cond_signal)         (GCond                *cond);
-  void     (*cond_broadcast)      (GCond                *cond);
-  void     (*cond_wait)           (GCond                *cond,
-                                   GMutex               *mutex);
-  gboolean (*cond_timed_wait)     (GCond                *cond,
-                                   GMutex               *mutex,
-                                   GTimeVal             *end_time);
-  void      (*cond_free)          (GCond                *cond);
-  GPrivate* (*private_new)        (GDestroyNotify        destructor);
-  gpointer  (*private_get)        (GPrivate             *private_key);
-  void      (*private_set)        (GPrivate             *private_key,
-                                   gpointer              data);
-  void      (*thread_create)      (GThreadFunc           func,
-                                   gpointer              data,
-                                   gulong                stack_size,
-                                   gboolean              joinable,
-                                   gboolean              bound,
-                                   GThreadPriority       priority,
-                                   gpointer              thread,
-                                   GError              **error);
-  void      (*thread_yield)       (void);
-  void      (*thread_join)        (gpointer              thread);
-  void      (*thread_exit)        (void);
-  void      (*thread_set_priority)(gpointer              thread,
-                                   GThreadPriority       priority);
-  void      (*thread_self)        (gpointer              thread);
-  gboolean  (*thread_equal)       (gpointer              thread1,
-				   gpointer              thread2);
-};
-
-GLIB_VAR GThreadFunctions       g_thread_functions_for_glib_use;
-GLIB_VAR gboolean               g_thread_use_default_impl;
-GLIB_VAR gboolean               g_threads_got_initialized;
-
-GLIB_VAR guint64   (*g_thread_gettime) (void);
-
-/* initializes the mutex/cond/private implementation for glib, might
- * only be called once, and must not be called directly or indirectly
- * from another glib-function, e.g. as a callback.
- */
-void    g_thread_init   (GThreadFunctions       *vtable);
-
-/* Errorcheck mutexes. If you define G_ERRORCHECK_MUTEXES, then all
- * mutexes will check for re-locking and re-unlocking */
-
-/* Initialize thread system with errorcheck mutexes. vtable must be
- * NULL. Do not call directly. Use #define G_ERRORCHECK_MUTEXES
- * instead.
- */
-void    g_thread_init_with_errorcheck_mutexes (GThreadFunctions* vtable);
-
-/* Checks if thread support is initialized.  Identical to the
- * g_thread_supported macro but provided for language bindings.
- */
-gboolean g_thread_get_initialized (void);
-
-/* A random number to recognize debug calls to g_mutex_... */
-#define G_MUTEX_DEBUG_MAGIC 0xf8e18ad7
-
-#ifdef G_ERRORCHECK_MUTEXES
-#define g_thread_init(vtable) g_thread_init_with_errorcheck_mutexes (vtable)
-#endif
-
-/* internal function for fallback static mutex implementation */
-GMutex* g_static_mutex_get_mutex_impl   (GMutex **mutex);
-
-#define g_static_mutex_get_mutex_impl_shortcut(mutex) \
-  (g_atomic_pointer_get (mutex) ? *(mutex) : \
-   g_static_mutex_get_mutex_impl (mutex))
-
-/* shorthands for conditional and unconditional function calls */
-
-#define G_THREAD_UF(op, arglist)					\
-    (*g_thread_functions_for_glib_use . op) arglist
-#define G_THREAD_CF(op, fail, arg)					\
-    (g_thread_supported () ? G_THREAD_UF (op, arg) : (fail))
-#define G_THREAD_ECF(op, fail, mutex, type)				\
-    (g_thread_supported () ? 						\
-      ((type(*)(GMutex*, const gulong, gchar const*))			\
-      (*g_thread_functions_for_glib_use . op))				\
-     (mutex, G_MUTEX_DEBUG_MAGIC, G_STRLOC) : (fail))
-
-#ifndef G_ERRORCHECK_MUTEXES
-# define g_mutex_lock(mutex)						\
-    G_THREAD_CF (mutex_lock,     (void)0, (mutex))
-# define g_mutex_trylock(mutex)						\
-    G_THREAD_CF (mutex_trylock,  TRUE,    (mutex))
-# define g_mutex_unlock(mutex)						\
-    G_THREAD_CF (mutex_unlock,   (void)0, (mutex))
-# define g_mutex_free(mutex)						\
-    G_THREAD_CF (mutex_free,     (void)0, (mutex))
-# define g_cond_wait(cond, mutex)					\
-    G_THREAD_CF (cond_wait,      (void)0, (cond, mutex))
-# define g_cond_timed_wait(cond, mutex, abs_time)			\
-    G_THREAD_CF (cond_timed_wait, TRUE,   (cond, mutex, abs_time))
-#else /* G_ERRORCHECK_MUTEXES */
-# define g_mutex_lock(mutex)						\
-    G_THREAD_ECF (mutex_lock,    (void)0, (mutex), void)
-# define g_mutex_trylock(mutex)						\
-    G_THREAD_ECF (mutex_trylock, TRUE,    (mutex), gboolean)
-# define g_mutex_unlock(mutex)						\
-    G_THREAD_ECF (mutex_unlock,  (void)0, (mutex), void)
-# define g_mutex_free(mutex)						\
-    G_THREAD_ECF (mutex_free,    (void)0, (mutex), void)
-# define g_cond_wait(cond, mutex)					\
-    (g_thread_supported () ? ((void(*)(GCond*, GMutex*, gulong, gchar*))\
-      g_thread_functions_for_glib_use.cond_wait)			\
-        (cond, mutex, G_MUTEX_DEBUG_MAGIC, G_STRLOC) : (void) 0)
-# define g_cond_timed_wait(cond, mutex, abs_time)			\
-    (g_thread_supported () ?						\
-      ((gboolean(*)(GCond*, GMutex*, GTimeVal*, gulong, gchar*))	\
-        g_thread_functions_for_glib_use.cond_timed_wait)		\
-          (cond, mutex, abs_time, G_MUTEX_DEBUG_MAGIC, G_STRLOC) : TRUE)
-#endif /* G_ERRORCHECK_MUTEXES */
-
-#if defined(G_THREADS_ENABLED) && defined(G_THREADS_MANDATORY)
-#define g_thread_supported()     1
-#else
-#define g_thread_supported()    (g_threads_got_initialized)
-#endif
-#define g_mutex_new()            G_THREAD_UF (mutex_new,      ())
-#define g_cond_new()             G_THREAD_UF (cond_new,       ())
-#define g_cond_signal(cond)      G_THREAD_CF (cond_signal,    (void)0, (cond))
-#define g_cond_broadcast(cond)   G_THREAD_CF (cond_broadcast, (void)0, (cond))
-#define g_cond_free(cond)        G_THREAD_CF (cond_free,      (void)0, (cond))
-#define g_private_new(destructor) G_THREAD_UF (private_new, (destructor))
-#define g_private_get(private_key) G_THREAD_CF (private_get, \
-                                                ((gpointer)private_key), \
-                                                (private_key))
-#define g_private_set(private_key, value) G_THREAD_CF (private_set, \
-                                                       (void) (private_key = \
-                                                        (GPrivate*) (value)), \
-                                                       (private_key, value))
-#define g_thread_yield()              G_THREAD_CF (thread_yield, (void)0, ())
-
-#define g_thread_create(func, data, joinable, error)			\
-  (g_thread_create_full (func, data, 0, joinable, FALSE, 		\
-                         G_THREAD_PRIORITY_NORMAL, error))
-
-GThread* g_thread_create_full  (GThreadFunc            func,
-                                gpointer               data,
-                                gulong                 stack_size,
-                                gboolean               joinable,
-                                gboolean               bound,
-                                GThreadPriority        priority,
-                                GError               **error);
-GThread* g_thread_self         (void);
-void     g_thread_exit         (gpointer               retval);
-gpointer g_thread_join         (GThread               *thread);
-
-void     g_thread_set_priority (GThread               *thread,
-                                GThreadPriority        priority);
-
-/* GStaticMutexes can be statically initialized with the value
- * G_STATIC_MUTEX_INIT, and then they can directly be used, that is
- * much easier, than having to explicitly allocate the mutex before
- * use
- */
-#define g_static_mutex_lock(mutex) \
-    g_mutex_lock (g_static_mutex_get_mutex (mutex))
-#define g_static_mutex_trylock(mutex) \
-    g_mutex_trylock (g_static_mutex_get_mutex (mutex))
-#define g_static_mutex_unlock(mutex) \
-    g_mutex_unlock (g_static_mutex_get_mutex (mutex))
-void g_static_mutex_init (GStaticMutex *mutex);
-void g_static_mutex_free (GStaticMutex *mutex);
-
-struct _GStaticPrivate
-{
-  /*< private >*/
-  guint index;
-};
-#define G_STATIC_PRIVATE_INIT { 0 }
-void     g_static_private_init           (GStaticPrivate   *private_key);
-gpointer g_static_private_get            (GStaticPrivate   *private_key);
-void     g_static_private_set            (GStaticPrivate   *private_key,
-					  gpointer          data,
-					  GDestroyNotify    notify);
-void     g_static_private_free           (GStaticPrivate   *private_key);
-
-typedef struct _GStaticRecMutex GStaticRecMutex;
-struct _GStaticRecMutex
-{
-  /*< private >*/
-  GStaticMutex mutex;
-  guint depth;
-  GSystemThread owner;
-};
-
-#define G_STATIC_REC_MUTEX_INIT { G_STATIC_MUTEX_INIT }
-void     g_static_rec_mutex_init        (GStaticRecMutex *mutex);
-void     g_static_rec_mutex_lock        (GStaticRecMutex *mutex);
-gboolean g_static_rec_mutex_trylock     (GStaticRecMutex *mutex);
-void     g_static_rec_mutex_unlock      (GStaticRecMutex *mutex);
-void     g_static_rec_mutex_lock_full   (GStaticRecMutex *mutex,
-                                         guint            depth);
-guint    g_static_rec_mutex_unlock_full (GStaticRecMutex *mutex);
-void     g_static_rec_mutex_free        (GStaticRecMutex *mutex);
-
-typedef struct _GStaticRWLock GStaticRWLock;
-struct _GStaticRWLock
-{
-  /*< private >*/
-  GStaticMutex mutex;
-  GCond *read_cond;
-  GCond *write_cond;
-  guint read_counter;
-  gboolean have_writer;
-  guint want_to_read;
-  guint want_to_write;
-};
-
-#define G_STATIC_RW_LOCK_INIT { G_STATIC_MUTEX_INIT, NULL, NULL, 0, FALSE, 0, 0 }
-
-void      g_static_rw_lock_init           (GStaticRWLock* lock);
-void      g_static_rw_lock_reader_lock    (GStaticRWLock* lock);
-gboolean  g_static_rw_lock_reader_trylock (GStaticRWLock* lock);
-void      g_static_rw_lock_reader_unlock  (GStaticRWLock* lock);
-void      g_static_rw_lock_writer_lock    (GStaticRWLock* lock);
-gboolean  g_static_rw_lock_writer_trylock (GStaticRWLock* lock);
-void      g_static_rw_lock_writer_unlock  (GStaticRWLock* lock);
-void      g_static_rw_lock_free           (GStaticRWLock* lock);
-
-void	  g_thread_foreach         	  (GFunc    	  thread_func,
-					   gpointer 	  user_data);
-
-typedef enum
-{
-  G_ONCE_STATUS_NOTCALLED,
-  G_ONCE_STATUS_PROGRESS,
-  G_ONCE_STATUS_READY  
-} GOnceStatus;
-
-typedef struct _GOnce GOnce;
-struct _GOnce
-{
-  volatile GOnceStatus status;
-  volatile gpointer retval;
-};
-
-#define G_ONCE_INIT { G_ONCE_STATUS_NOTCALLED, NULL }
-
-gpointer g_once_impl (GOnce *once, GThreadFunc func, gpointer arg);
-
-#ifdef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
-# define g_once(once, func, arg) g_once_impl ((once), (func), (arg))
-#else /* !G_ATOMIC_OP_MEMORY_BARRIER_NEEDED*/
-# define g_once(once, func, arg) \
-  (((once)->status == G_ONCE_STATUS_READY) ? \
-   (once)->retval : \
-   g_once_impl ((once), (func), (arg)))
-#endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
-
-/* initialize-once guards, keyed by value_location */
-G_INLINE_FUNC gboolean  g_once_init_enter       (volatile gsize *value_location);
-gboolean                g_once_init_enter_impl  (volatile gsize *value_location);
-void                    g_once_init_leave       (volatile gsize *value_location,
-                                                 gsize           initialization_value);
-#if defined (G_CAN_INLINE) || defined (__G_THREAD_C__)
-G_INLINE_FUNC gboolean
-g_once_init_enter (volatile gsize *value_location)
-{
-  if G_LIKELY ((gpointer) g_atomic_pointer_get (value_location) != NULL)
-    return FALSE;
-  else
-    return g_once_init_enter_impl (value_location);
-}
-#endif /* G_CAN_INLINE || __G_THREAD_C__ */
-
-/* these are some convenience macros that expand to nothing if GLib
- * was configured with --disable-threads. for using StaticMutexes,
- * you define them with G_LOCK_DEFINE_STATIC (name) or G_LOCK_DEFINE (name)
- * if you need to export the mutex. With G_LOCK_EXTERN (name) you can
- * declare such an globally defined lock. name is a unique identifier
- * for the protected varibale or code portion. locking, testing and
- * unlocking of such mutexes can be done with G_LOCK(), G_UNLOCK() and
- * G_TRYLOCK() respectively.
- */
-extern void glib_dummy_decl (void);
-#define G_LOCK_NAME(name)               g__ ## name ## _lock
-#ifdef  G_THREADS_ENABLED
-#  define G_LOCK_DEFINE_STATIC(name)    static G_LOCK_DEFINE (name)
-#  define G_LOCK_DEFINE(name)           \
-    GStaticMutex G_LOCK_NAME (name) = G_STATIC_MUTEX_INIT
-#  define G_LOCK_EXTERN(name)           extern GStaticMutex G_LOCK_NAME (name)
-
-#  ifdef G_DEBUG_LOCKS
-#    define G_LOCK(name)                G_STMT_START{             \
-        g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,                   \
-               "file %s: line %d (%s): locking: %s ",             \
-               __FILE__,        __LINE__, G_STRFUNC,              \
-               #name);                                            \
-        g_static_mutex_lock (&G_LOCK_NAME (name));                \
-     }G_STMT_END
-#    define G_UNLOCK(name)              G_STMT_START{             \
-        g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,                   \
-               "file %s: line %d (%s): unlocking: %s ",           \
-               __FILE__,        __LINE__, G_STRFUNC,              \
-               #name);                                            \
-       g_static_mutex_unlock (&G_LOCK_NAME (name));               \
-     }G_STMT_END
-#    define G_TRYLOCK(name)                                       \
-        (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,                  \
-               "file %s: line %d (%s): try locking: %s ",         \
-               __FILE__,        __LINE__, G_STRFUNC,              \
-               #name), g_static_mutex_trylock (&G_LOCK_NAME (name)))
-#  else  /* !G_DEBUG_LOCKS */
-#    define G_LOCK(name) g_static_mutex_lock       (&G_LOCK_NAME (name))
-#    define G_UNLOCK(name) g_static_mutex_unlock   (&G_LOCK_NAME (name))
-#    define G_TRYLOCK(name) g_static_mutex_trylock (&G_LOCK_NAME (name))
-#  endif /* !G_DEBUG_LOCKS */
-#else   /* !G_THREADS_ENABLED */
-#  define G_LOCK_DEFINE_STATIC(name)    extern void glib_dummy_decl (void)
-#  define G_LOCK_DEFINE(name)           extern void glib_dummy_decl (void)
-#  define G_LOCK_EXTERN(name)           extern void glib_dummy_decl (void)
-#  define G_LOCK(name)
-#  define G_UNLOCK(name)
-#  define G_TRYLOCK(name)               (TRUE)
-#endif  /* !G_THREADS_ENABLED */
-
-G_END_DECLS
-
-#endif /* __G_THREAD_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gthreadpool.h b/protocols/Sametime/src/glib/include/glib/gthreadpool.h
deleted file mode 100644
index d5864241e6..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gthreadpool.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_THREADPOOL_H__
-#define __G_THREADPOOL_H__
-
-#include <glib/gthread.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GThreadPool     GThreadPool;
-
-/* Thread Pools
- */
-
-/* The real GThreadPool is bigger, so you may only create a thread
- * pool with the constructor function */
-struct _GThreadPool
-{
-  GFunc func;
-  gpointer user_data;
-  gboolean exclusive;
-};
-
-/* Get a thread pool with the function func, at most max_threads may
- * run at a time (max_threads == -1 means no limit), exclusive == TRUE
- * means, that the threads shouldn't be shared and that they will be
- * prestarted (otherwise they are started as needed) user_data is the
- * 2nd argument to the func */
-GThreadPool*    g_thread_pool_new             (GFunc            func,
-                                               gpointer         user_data,
-                                               gint             max_threads,
-                                               gboolean         exclusive,
-                                               GError         **error);
-
-/* Push new data into the thread pool. This task is assigned to a thread later
- * (when the maximal number of threads is reached for that pool) or now
- * (otherwise). If necessary a new thread will be started. The function
- * returns immediatly */
-void            g_thread_pool_push            (GThreadPool     *pool,
-                                               gpointer         data,
-                                               GError         **error);
-
-/* Set the number of threads, which can run concurrently for that pool, -1
- * means no limit. 0 means has the effect, that the pool won't process
- * requests until the limit is set higher again */
-void            g_thread_pool_set_max_threads (GThreadPool     *pool,
-                                               gint             max_threads,
-                                               GError         **error);
-gint            g_thread_pool_get_max_threads (GThreadPool     *pool);
-
-/* Get the number of threads assigned to that pool. This number doesn't
- * necessarily represent the number of working threads in that pool */
-guint           g_thread_pool_get_num_threads (GThreadPool     *pool);
-
-/* Get the number of unprocessed items in the pool */
-guint           g_thread_pool_unprocessed     (GThreadPool     *pool);
-
-/* Free the pool, immediate means, that all unprocessed items in the queue
- * wont be processed, wait means, that the function doesn't return immediatly,
- * but after all threads in the pool are ready processing items. immediate
- * does however not mean, that threads are killed. */
-void            g_thread_pool_free            (GThreadPool     *pool,
-                                               gboolean         immediate,
-                                               gboolean         wait_);
-
-/* Set the maximal number of unused threads before threads will be stopped by
- * GLib, -1 means no limit */
-void            g_thread_pool_set_max_unused_threads (gint      max_threads);
-gint            g_thread_pool_get_max_unused_threads (void);
-guint           g_thread_pool_get_num_unused_threads (void);
-
-/* Stop all currently unused threads, but leave the limit untouched */
-void            g_thread_pool_stop_unused_threads    (void);
-
-/* Set sort function for priority threading */
-void            g_thread_pool_set_sort_function      (GThreadPool      *pool,
-		                                      GCompareDataFunc  func,
-						      gpointer          user_data);
-
-/* Set maximum time a thread can be idle in the pool before it is stopped */
-void            g_thread_pool_set_max_idle_time      (guint             interval);
-guint           g_thread_pool_get_max_idle_time      (void);
-
-G_END_DECLS
-
-#endif /* __G_THREADPOOL_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gtimer.h b/protocols/Sametime/src/glib/include/glib/gtimer.h
deleted file mode 100644
index 743eed1f90..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gtimer.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_TIMER_H__
-#define __G_TIMER_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* Timer
- */
-
-/* microseconds per second */
-typedef struct _GTimer		GTimer;
-
-#define G_USEC_PER_SEC 1000000
-
-GTimer*  g_timer_new	         (void);
-void	 g_timer_destroy         (GTimer      *timer);
-void	 g_timer_start	         (GTimer      *timer);
-void	 g_timer_stop	         (GTimer      *timer);
-void	 g_timer_reset	         (GTimer      *timer);
-void	 g_timer_continue        (GTimer      *timer);
-gdouble  g_timer_elapsed         (GTimer      *timer,
-				  gulong      *microseconds);
-
-void     g_usleep                (gulong       microseconds);
-
-void     g_time_val_add          (GTimeVal    *time_, 
-                                  glong        microseconds);
-gboolean g_time_val_from_iso8601 (const gchar *iso_date,
-				  GTimeVal    *time_);
-gchar*   g_time_val_to_iso8601   (GTimeVal    *time_) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __G_TIMER_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gtimezone.h b/protocols/Sametime/src/glib/include/glib/gtimezone.h
deleted file mode 100644
index 1032a3c09c..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gtimezone.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_TIME_ZONE_H__
-#define __G_TIME_ZONE_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GTimeZone GTimeZone;
-
-GTimeZone *             g_time_zone_new                                 (const gchar *identifier);
-GTimeZone *             g_time_zone_new_utc                             (void);
-GTimeZone *             g_time_zone_new_local                           (void);
-
-GTimeZone *             g_time_zone_ref                                 (GTimeZone   *tz);
-void                    g_time_zone_unref                               (GTimeZone   *tz);
-
-G_END_DECLS
-
-#endif /* __G_TIME_ZONE_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gtree.h b/protocols/Sametime/src/glib/include/glib/gtree.h
deleted file mode 100644
index db06ba3b82..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gtree.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_TREE_H__
-#define __G_TREE_H__
-
-#include <glib/gnode.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GTree  GTree;
-
-typedef gboolean (*GTraverseFunc) (gpointer  key,
-                                   gpointer  value,
-                                   gpointer  data);
-
-/* Balanced binary trees
- */
-GTree*   g_tree_new             (GCompareFunc      key_compare_func);
-GTree*   g_tree_new_with_data   (GCompareDataFunc  key_compare_func,
-                                 gpointer          key_compare_data);
-GTree*   g_tree_new_full        (GCompareDataFunc  key_compare_func,
-                                 gpointer          key_compare_data,
-                                 GDestroyNotify    key_destroy_func,
-                                 GDestroyNotify    value_destroy_func);
-GTree*   g_tree_ref             (GTree            *tree);
-void     g_tree_unref           (GTree            *tree);
-void     g_tree_destroy         (GTree            *tree);
-void     g_tree_insert          (GTree            *tree,
-                                 gpointer          key,
-                                 gpointer          value);
-void     g_tree_replace         (GTree            *tree,
-                                 gpointer          key,
-                                 gpointer          value);
-gboolean g_tree_remove          (GTree            *tree,
-                                 gconstpointer     key);
-gboolean g_tree_steal           (GTree            *tree,
-                                 gconstpointer     key);
-gpointer g_tree_lookup          (GTree            *tree,
-                                 gconstpointer     key);
-gboolean g_tree_lookup_extended (GTree            *tree,
-                                 gconstpointer     lookup_key,
-                                 gpointer         *orig_key,
-                                 gpointer         *value);
-void     g_tree_foreach         (GTree            *tree,
-                                 GTraverseFunc	   func,
-                                 gpointer	   user_data);
-
-#ifndef G_DISABLE_DEPRECATED
-void     g_tree_traverse        (GTree            *tree,
-                                 GTraverseFunc     traverse_func,
-                                 GTraverseType     traverse_type,
-                                 gpointer          user_data);
-#endif /* G_DISABLE_DEPRECATED */
-
-gpointer g_tree_search          (GTree            *tree,
-                                 GCompareFunc      search_func,
-                                 gconstpointer     user_data);
-gint     g_tree_height          (GTree            *tree);
-gint     g_tree_nnodes          (GTree            *tree);
-
-G_END_DECLS
-
-#endif /* __G_TREE_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gtypes.h b/protocols/Sametime/src/glib/include/glib/gtypes.h
deleted file mode 100644
index e616f9988c..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gtypes.h
+++ /dev/null
@@ -1,451 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_TYPES_H__
-#define __G_TYPES_H__
-
-#include <glibconfig.h>
-#include <glib/gmacros.h>
-
-G_BEGIN_DECLS
-
-/* Provide type definitions for commonly used types.
- *  These are useful because a "gint8" can be adjusted
- *  to be 1 byte (8 bits) on all platforms. Similarly and
- *  more importantly, "gint32" can be adjusted to be
- *  4 bytes (32 bits) on all platforms.
- */
-
-typedef char   gchar;
-typedef short  gshort;
-typedef long   glong;
-typedef int    gint;
-typedef gint   gboolean;
-
-typedef unsigned char   guchar;
-typedef unsigned short  gushort;
-typedef unsigned long   gulong;
-typedef unsigned int    guint;
-
-typedef float   gfloat;
-typedef double  gdouble;
-
-/* Define min and max constants for the fixed size numerical types */
-#define G_MININT8	((gint8)  0x80)
-#define G_MAXINT8	((gint8)  0x7f)
-#define G_MAXUINT8	((guint8) 0xff)
-
-#define G_MININT16	((gint16)  0x8000)
-#define G_MAXINT16	((gint16)  0x7fff)
-#define G_MAXUINT16	((guint16) 0xffff)
-
-#define G_MININT32	((gint32)  0x80000000)
-#define G_MAXINT32	((gint32)  0x7fffffff)
-#define G_MAXUINT32	((guint32) 0xffffffff)
-
-#define G_MININT64	((gint64) G_GINT64_CONSTANT(0x8000000000000000))
-#define G_MAXINT64	G_GINT64_CONSTANT(0x7fffffffffffffff)
-#define G_MAXUINT64	G_GINT64_CONSTANT(0xffffffffffffffffU)
-
-typedef void* gpointer;
-typedef const void *gconstpointer;
-
-typedef gint            (*GCompareFunc)         (gconstpointer  a,
-                                                 gconstpointer  b);
-typedef gint            (*GCompareDataFunc)     (gconstpointer  a,
-                                                 gconstpointer  b,
-						 gpointer       user_data);
-typedef gboolean        (*GEqualFunc)           (gconstpointer  a,
-                                                 gconstpointer  b);
-typedef void            (*GDestroyNotify)       (gpointer       data);
-typedef void            (*GFunc)                (gpointer       data,
-                                                 gpointer       user_data);
-typedef guint           (*GHashFunc)            (gconstpointer  key);
-typedef void            (*GHFunc)               (gpointer       key,
-                                                 gpointer       value,
-                                                 gpointer       user_data);
-typedef void            (*GFreeFunc)            (gpointer       data);
-
-/**
- * GTranslateFunc:
- * @str: the untranslated string
- * @data: user data specified when installing the function, e.g.
- *  in g_option_group_set_translate_func()
- * 
- * The type of functions which are used to translate user-visible
- * strings, for <option>--help</option> output.
- * 
- * Returns: a translation of the string for the current locale.
- *  The returned string is owned by GLib and must not be freed.
- */
-typedef const gchar *   (*GTranslateFunc)       (const gchar   *str,
-						 gpointer       data);
-
-
-/* Define some mathematical constants that aren't available
- * symbolically in some strict ISO C implementations.
- *
- * Note that the large number of digits used in these definitions
- * doesn't imply that GLib or current computers in general would be
- * able to handle floating point numbers with an accuracy like this.
- * It's mostly an exercise in futility and future proofing. For
- * extended precision floating point support, look somewhere else
- * than GLib.
- */
-#define G_E     2.7182818284590452353602874713526624977572470937000
-#define G_LN2   0.69314718055994530941723212145817656807550013436026
-#define G_LN10  2.3025850929940456840179914546843642076011014886288
-#define G_PI    3.1415926535897932384626433832795028841971693993751
-#define G_PI_2  1.5707963267948966192313216916397514420985846996876
-#define G_PI_4  0.78539816339744830961566084581987572104929234984378
-#define G_SQRT2 1.4142135623730950488016887242096980785696718753769
-
-/* Portable endian checks and conversions
- *
- * glibconfig.h defines G_BYTE_ORDER which expands to one of
- * the below macros.
- */
-#define G_LITTLE_ENDIAN 1234
-#define G_BIG_ENDIAN    4321
-#define G_PDP_ENDIAN    3412		/* unused, need specific PDP check */	
-
-
-/* Basic bit swapping functions
- */
-#define GUINT16_SWAP_LE_BE_CONSTANT(val)	((guint16) ( \
-    (guint16) ((guint16) (val) >> 8) |	\
-    (guint16) ((guint16) (val) << 8)))
-
-#define GUINT32_SWAP_LE_BE_CONSTANT(val)	((guint32) ( \
-    (((guint32) (val) & (guint32) 0x000000ffU) << 24) | \
-    (((guint32) (val) & (guint32) 0x0000ff00U) <<  8) | \
-    (((guint32) (val) & (guint32) 0x00ff0000U) >>  8) | \
-    (((guint32) (val) & (guint32) 0xff000000U) >> 24)))
-
-#define GUINT64_SWAP_LE_BE_CONSTANT(val)	((guint64) ( \
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x00000000000000ffU)) << 56) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x000000000000ff00U)) << 40) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x0000000000ff0000U)) << 24) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x00000000ff000000U)) <<  8) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x000000ff00000000U)) >>  8) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x0000ff0000000000U)) >> 24) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x00ff000000000000U)) >> 40) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0xff00000000000000U)) >> 56)))
-
-/* Arch specific stuff for speed
- */
-#if defined (__GNUC__) && (__GNUC__ >= 2) && defined (__OPTIMIZE__)
-#  if defined (__i386__)
-#    define GUINT16_SWAP_LE_BE_IA32(val) \
-       (__extension__						\
-	({ register guint16 __v, __x = ((guint16) (val));	\
-	   if (__builtin_constant_p (__x))			\
-	     __v = GUINT16_SWAP_LE_BE_CONSTANT (__x);		\
-	   else							\
-	     __asm__ ("rorw $8, %w0"				\
-		      : "=r" (__v)				\
-		      : "0" (__x)				\
-		      : "cc");					\
-	    __v; }))
-#    if !defined (__i486__) && !defined (__i586__) \
-	&& !defined (__pentium__) && !defined (__i686__) \
-	&& !defined (__pentiumpro__) && !defined (__pentium4__)
-#       define GUINT32_SWAP_LE_BE_IA32(val) \
-	  (__extension__					\
-	   ({ register guint32 __v, __x = ((guint32) (val));	\
-	      if (__builtin_constant_p (__x))			\
-		__v = GUINT32_SWAP_LE_BE_CONSTANT (__x);	\
-	      else						\
-		__asm__ ("rorw $8, %w0\n\t"			\
-			 "rorl $16, %0\n\t"			\
-			 "rorw $8, %w0"				\
-			 : "=r" (__v)				\
-			 : "0" (__x)				\
-			 : "cc");				\
-	      __v; }))
-#    else /* 486 and higher has bswap */
-#       define GUINT32_SWAP_LE_BE_IA32(val) \
-	  (__extension__					\
-	   ({ register guint32 __v, __x = ((guint32) (val));	\
-	      if (__builtin_constant_p (__x))			\
-		__v = GUINT32_SWAP_LE_BE_CONSTANT (__x);	\
-	      else						\
-		__asm__ ("bswap %0"				\
-			 : "=r" (__v)				\
-			 : "0" (__x));				\
-	      __v; }))
-#    endif /* processor specific 32-bit stuff */
-#    define GUINT64_SWAP_LE_BE_IA32(val) \
-       (__extension__							\
-	({ union { guint64 __ll;					\
-		   guint32 __l[2]; } __w, __r;				\
-	   __w.__ll = ((guint64) (val));				\
-	   if (__builtin_constant_p (__w.__ll))				\
-	     __r.__ll = GUINT64_SWAP_LE_BE_CONSTANT (__w.__ll);		\
-	   else								\
-	     {								\
-	       __r.__l[0] = GUINT32_SWAP_LE_BE (__w.__l[1]);		\
-	       __r.__l[1] = GUINT32_SWAP_LE_BE (__w.__l[0]);		\
-	     }								\
-	   __r.__ll; }))
-     /* Possibly just use the constant version and let gcc figure it out? */
-#    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_IA32 (val))
-#    define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_IA32 (val))
-#    define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_IA32 (val))
-#  elif defined (__ia64__)
-#    define GUINT16_SWAP_LE_BE_IA64(val) \
-       (__extension__						\
-	({ register guint16 __v, __x = ((guint16) (val));	\
-	   if (__builtin_constant_p (__x))			\
-	     __v = GUINT16_SWAP_LE_BE_CONSTANT (__x);		\
-	   else							\
-	     __asm__ __volatile__ ("shl %0 = %1, 48 ;;"		\
-				   "mux1 %0 = %0, @rev ;;"	\
-				    : "=r" (__v)		\
-				    : "r" (__x));		\
-	    __v; }))
-#    define GUINT32_SWAP_LE_BE_IA64(val) \
-       (__extension__						\
-	 ({ register guint32 __v, __x = ((guint32) (val));	\
-	    if (__builtin_constant_p (__x))			\
-	      __v = GUINT32_SWAP_LE_BE_CONSTANT (__x);		\
-	    else						\
-	     __asm__ __volatile__ ("shl %0 = %1, 32 ;;"		\
-				   "mux1 %0 = %0, @rev ;;"	\
-				    : "=r" (__v)		\
-				    : "r" (__x));		\
-	    __v; }))
-#    define GUINT64_SWAP_LE_BE_IA64(val) \
-       (__extension__						\
-	({ register guint64 __v, __x = ((guint64) (val));	\
-	   if (__builtin_constant_p (__x))			\
-	     __v = GUINT64_SWAP_LE_BE_CONSTANT (__x);		\
-	   else							\
-	     __asm__ __volatile__ ("mux1 %0 = %1, @rev ;;"	\
-				   : "=r" (__v)			\
-				   : "r" (__x));		\
-	   __v; }))
-#    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_IA64 (val))
-#    define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_IA64 (val))
-#    define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_IA64 (val))
-#  elif defined (__x86_64__)
-#    define GUINT32_SWAP_LE_BE_X86_64(val) \
-       (__extension__						\
-	 ({ register guint32 __v, __x = ((guint32) (val));	\
-	    if (__builtin_constant_p (__x))			\
-	      __v = GUINT32_SWAP_LE_BE_CONSTANT (__x);		\
-	    else						\
-	     __asm__ ("bswapl %0"				\
-		      : "=r" (__v)				\
-		      : "0" (__x));				\
-	    __v; }))
-#    define GUINT64_SWAP_LE_BE_X86_64(val) \
-       (__extension__						\
-	({ register guint64 __v, __x = ((guint64) (val));	\
-	   if (__builtin_constant_p (__x))			\
-	     __v = GUINT64_SWAP_LE_BE_CONSTANT (__x);		\
-	   else							\
-	     __asm__ ("bswapq %0"				\
-		      : "=r" (__v)				\
-		      : "0" (__x));				\
-	   __v; }))
-     /* gcc seems to figure out optimal code for this on its own */
-#    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_CONSTANT (val))
-#    define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_X86_64 (val))
-#    define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_X86_64 (val))
-#  else /* generic gcc */
-#    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_CONSTANT (val))
-#    define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_CONSTANT (val))
-#    define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_CONSTANT (val))
-#  endif
-#else /* generic */
-#  define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_CONSTANT (val))
-#  define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_CONSTANT (val))
-#  define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_CONSTANT (val))
-#endif /* generic */
-
-#define GUINT16_SWAP_LE_PDP(val)	((guint16) (val))
-#define GUINT16_SWAP_BE_PDP(val)	(GUINT16_SWAP_LE_BE (val))
-#define GUINT32_SWAP_LE_PDP(val)	((guint32) ( \
-    (((guint32) (val) & (guint32) 0x0000ffffU) << 16) | \
-    (((guint32) (val) & (guint32) 0xffff0000U) >> 16)))
-#define GUINT32_SWAP_BE_PDP(val)	((guint32) ( \
-    (((guint32) (val) & (guint32) 0x00ff00ffU) << 8) | \
-    (((guint32) (val) & (guint32) 0xff00ff00U) >> 8)))
-
-/* The G*_TO_?E() macros are defined in glibconfig.h.
- * The transformation is symmetric, so the FROM just maps to the TO.
- */
-#define GINT16_FROM_LE(val)	(GINT16_TO_LE (val))
-#define GUINT16_FROM_LE(val)	(GUINT16_TO_LE (val))
-#define GINT16_FROM_BE(val)	(GINT16_TO_BE (val))
-#define GUINT16_FROM_BE(val)	(GUINT16_TO_BE (val))
-#define GINT32_FROM_LE(val)	(GINT32_TO_LE (val))
-#define GUINT32_FROM_LE(val)	(GUINT32_TO_LE (val))
-#define GINT32_FROM_BE(val)	(GINT32_TO_BE (val))
-#define GUINT32_FROM_BE(val)	(GUINT32_TO_BE (val))
-
-#define GINT64_FROM_LE(val)	(GINT64_TO_LE (val))
-#define GUINT64_FROM_LE(val)	(GUINT64_TO_LE (val))
-#define GINT64_FROM_BE(val)	(GINT64_TO_BE (val))
-#define GUINT64_FROM_BE(val)	(GUINT64_TO_BE (val))
-
-#define GLONG_FROM_LE(val)	(GLONG_TO_LE (val))
-#define GULONG_FROM_LE(val)	(GULONG_TO_LE (val))
-#define GLONG_FROM_BE(val)	(GLONG_TO_BE (val))
-#define GULONG_FROM_BE(val)	(GULONG_TO_BE (val))
-
-#define GINT_FROM_LE(val)	(GINT_TO_LE (val))
-#define GUINT_FROM_LE(val)	(GUINT_TO_LE (val))
-#define GINT_FROM_BE(val)	(GINT_TO_BE (val))
-#define GUINT_FROM_BE(val)	(GUINT_TO_BE (val))
-
-#define GSIZE_FROM_LE(val)	(GSIZE_TO_LE (val))
-#define GSSIZE_FROM_LE(val)	(GSSIZE_TO_LE (val))
-#define GSIZE_FROM_BE(val)	(GSIZE_TO_BE (val))
-#define GSSIZE_FROM_BE(val)	(GSSIZE_TO_BE (val))
-
-
-/* Portable versions of host-network order stuff
- */
-#define g_ntohl(val) (GUINT32_FROM_BE (val))
-#define g_ntohs(val) (GUINT16_FROM_BE (val))
-#define g_htonl(val) (GUINT32_TO_BE (val))
-#define g_htons(val) (GUINT16_TO_BE (val))
-
-/* IEEE Standard 754 Single Precision Storage Format (gfloat):
- *
- *        31 30           23 22            0
- * +--------+---------------+---------------+
- * | s 1bit | e[30:23] 8bit | f[22:0] 23bit |
- * +--------+---------------+---------------+
- * B0------------------->B1------->B2-->B3-->
- *
- * IEEE Standard 754 Double Precision Storage Format (gdouble):
- *
- *        63 62            52 51            32   31            0
- * +--------+----------------+----------------+ +---------------+
- * | s 1bit | e[62:52] 11bit | f[51:32] 20bit | | f[31:0] 32bit |
- * +--------+----------------+----------------+ +---------------+
- * B0--------------->B1---------->B2--->B3---->  B4->B5->B6->B7->
- */
-/* subtract from biased_exponent to form base2 exponent (normal numbers) */
-typedef union  _GDoubleIEEE754	GDoubleIEEE754;
-typedef union  _GFloatIEEE754	GFloatIEEE754;
-#define G_IEEE754_FLOAT_BIAS	(127)
-#define G_IEEE754_DOUBLE_BIAS	(1023)
-/* multiply with base2 exponent to get base10 exponent (normal numbers) */
-#define G_LOG_2_BASE_10		(0.30102999566398119521)
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-union _GFloatIEEE754
-{
-  gfloat v_float;
-  struct {
-    guint mantissa : 23;
-    guint biased_exponent : 8;
-    guint sign : 1;
-  } mpn;
-};
-union _GDoubleIEEE754
-{
-  gdouble v_double;
-  struct {
-    guint mantissa_low : 32;
-    guint mantissa_high : 20;
-    guint biased_exponent : 11;
-    guint sign : 1;
-  } mpn;
-};
-#elif G_BYTE_ORDER == G_BIG_ENDIAN
-union _GFloatIEEE754
-{
-  gfloat v_float;
-  struct {
-    guint sign : 1;
-    guint biased_exponent : 8;
-    guint mantissa : 23;
-  } mpn;
-};
-union _GDoubleIEEE754
-{
-  gdouble v_double;
-  struct {
-    guint sign : 1;
-    guint biased_exponent : 11;
-    guint mantissa_high : 20;
-    guint mantissa_low : 32;
-  } mpn;
-};
-#else /* !G_LITTLE_ENDIAN && !G_BIG_ENDIAN */
-#error unknown ENDIAN type
-#endif /* !G_LITTLE_ENDIAN && !G_BIG_ENDIAN */
-
-typedef struct _GTimeVal                GTimeVal;
-
-struct _GTimeVal
-{
-  glong tv_sec;
-  glong tv_usec;
-};
-
-G_END_DECLS
-
-/* We prefix variable declarations so they can
- * properly get exported in Windows DLLs.
- */
-#ifndef GLIB_VAR
-#  ifdef G_PLATFORM_WIN32
-#    ifdef GLIB_STATIC_COMPILATION
-#      define GLIB_VAR extern
-#    else /* !GLIB_STATIC_COMPILATION */
-#      ifdef GLIB_COMPILATION
-#        ifdef DLL_EXPORT
-#          define GLIB_VAR __declspec(dllexport)
-#        else /* !DLL_EXPORT */
-#          define GLIB_VAR extern
-#        endif /* !DLL_EXPORT */
-#      else /* !GLIB_COMPILATION */
-#        define GLIB_VAR extern __declspec(dllimport)
-#      endif /* !GLIB_COMPILATION */
-#    endif /* !GLIB_STATIC_COMPILATION */
-#  else /* !G_PLATFORM_WIN32 */
-#    define GLIB_VAR extern
-#  endif /* !G_PLATFORM_WIN32 */
-#endif /* GLIB_VAR */
-
-#endif /* __G_TYPES_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gunicode.h b/protocols/Sametime/src/glib/include/glib/gunicode.h
deleted file mode 100644
index 4ca7bd3017..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gunicode.h
+++ /dev/null
@@ -1,421 +0,0 @@
-/* gunicode.h - Unicode manipulation functions
- *
- *  Copyright (C) 1999, 2000 Tom Tromey
- *  Copyright 2000, 2005 Red Hat, Inc.
- *
- * The Gnome Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The Gnome Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_UNICODE_H__
-#define __G_UNICODE_H__
-
-#include <glib/gerror.h>
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef guint32 gunichar;
-typedef guint16 gunichar2;
-
-/* These are the possible character classifications.
- * See http://www.unicode.org/Public/UNIDATA/UCD.html#General_Category_Values
- */
-typedef enum
-{
-  G_UNICODE_CONTROL,
-  G_UNICODE_FORMAT,
-  G_UNICODE_UNASSIGNED,
-  G_UNICODE_PRIVATE_USE,
-  G_UNICODE_SURROGATE,
-  G_UNICODE_LOWERCASE_LETTER,
-  G_UNICODE_MODIFIER_LETTER,
-  G_UNICODE_OTHER_LETTER,
-  G_UNICODE_TITLECASE_LETTER,
-  G_UNICODE_UPPERCASE_LETTER,
-  G_UNICODE_COMBINING_MARK,
-  G_UNICODE_ENCLOSING_MARK,
-  G_UNICODE_NON_SPACING_MARK,
-  G_UNICODE_DECIMAL_NUMBER,
-  G_UNICODE_LETTER_NUMBER,
-  G_UNICODE_OTHER_NUMBER,
-  G_UNICODE_CONNECT_PUNCTUATION,
-  G_UNICODE_DASH_PUNCTUATION,
-  G_UNICODE_CLOSE_PUNCTUATION,
-  G_UNICODE_FINAL_PUNCTUATION,
-  G_UNICODE_INITIAL_PUNCTUATION,
-  G_UNICODE_OTHER_PUNCTUATION,
-  G_UNICODE_OPEN_PUNCTUATION,
-  G_UNICODE_CURRENCY_SYMBOL,
-  G_UNICODE_MODIFIER_SYMBOL,
-  G_UNICODE_MATH_SYMBOL,
-  G_UNICODE_OTHER_SYMBOL,
-  G_UNICODE_LINE_SEPARATOR,
-  G_UNICODE_PARAGRAPH_SEPARATOR,
-  G_UNICODE_SPACE_SEPARATOR
-} GUnicodeType;
-
-/* These are the possible line break classifications.
- * Note that new types may be added in the future.
- * Implementations may regard unknown values like G_UNICODE_BREAK_UNKNOWN
- * See http://www.unicode.org/unicode/reports/tr14/
- */
-typedef enum
-{
-  G_UNICODE_BREAK_MANDATORY,
-  G_UNICODE_BREAK_CARRIAGE_RETURN,
-  G_UNICODE_BREAK_LINE_FEED,
-  G_UNICODE_BREAK_COMBINING_MARK,
-  G_UNICODE_BREAK_SURROGATE,
-  G_UNICODE_BREAK_ZERO_WIDTH_SPACE,
-  G_UNICODE_BREAK_INSEPARABLE,
-  G_UNICODE_BREAK_NON_BREAKING_GLUE,
-  G_UNICODE_BREAK_CONTINGENT,
-  G_UNICODE_BREAK_SPACE,
-  G_UNICODE_BREAK_AFTER,
-  G_UNICODE_BREAK_BEFORE,
-  G_UNICODE_BREAK_BEFORE_AND_AFTER,
-  G_UNICODE_BREAK_HYPHEN,
-  G_UNICODE_BREAK_NON_STARTER,
-  G_UNICODE_BREAK_OPEN_PUNCTUATION,
-  G_UNICODE_BREAK_CLOSE_PUNCTUATION,
-  G_UNICODE_BREAK_QUOTATION,
-  G_UNICODE_BREAK_EXCLAMATION,
-  G_UNICODE_BREAK_IDEOGRAPHIC,
-  G_UNICODE_BREAK_NUMERIC,
-  G_UNICODE_BREAK_INFIX_SEPARATOR,
-  G_UNICODE_BREAK_SYMBOL,
-  G_UNICODE_BREAK_ALPHABETIC,
-  G_UNICODE_BREAK_PREFIX,
-  G_UNICODE_BREAK_POSTFIX,
-  G_UNICODE_BREAK_COMPLEX_CONTEXT,
-  G_UNICODE_BREAK_AMBIGUOUS,
-  G_UNICODE_BREAK_UNKNOWN,
-  G_UNICODE_BREAK_NEXT_LINE,
-  G_UNICODE_BREAK_WORD_JOINER,
-  G_UNICODE_BREAK_HANGUL_L_JAMO,
-  G_UNICODE_BREAK_HANGUL_V_JAMO,
-  G_UNICODE_BREAK_HANGUL_T_JAMO,
-  G_UNICODE_BREAK_HANGUL_LV_SYLLABLE,
-  G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
-} GUnicodeBreakType;
-
-typedef enum 
-{                         /* ISO 15924 code */
-  G_UNICODE_SCRIPT_INVALID_CODE = -1,
-  G_UNICODE_SCRIPT_COMMON       = 0,   /* Zyyy */
-  G_UNICODE_SCRIPT_INHERITED,          /* Qaai */
-  G_UNICODE_SCRIPT_ARABIC,             /* Arab */
-  G_UNICODE_SCRIPT_ARMENIAN,           /* Armn */
-  G_UNICODE_SCRIPT_BENGALI,            /* Beng */
-  G_UNICODE_SCRIPT_BOPOMOFO,           /* Bopo */
-  G_UNICODE_SCRIPT_CHEROKEE,           /* Cher */
-  G_UNICODE_SCRIPT_COPTIC,             /* Qaac */
-  G_UNICODE_SCRIPT_CYRILLIC,           /* Cyrl (Cyrs) */
-  G_UNICODE_SCRIPT_DESERET,            /* Dsrt */
-  G_UNICODE_SCRIPT_DEVANAGARI,         /* Deva */
-  G_UNICODE_SCRIPT_ETHIOPIC,           /* Ethi */
-  G_UNICODE_SCRIPT_GEORGIAN,           /* Geor (Geon, Geoa) */
-  G_UNICODE_SCRIPT_GOTHIC,             /* Goth */
-  G_UNICODE_SCRIPT_GREEK,              /* Grek */
-  G_UNICODE_SCRIPT_GUJARATI,           /* Gujr */
-  G_UNICODE_SCRIPT_GURMUKHI,           /* Guru */
-  G_UNICODE_SCRIPT_HAN,                /* Hani */
-  G_UNICODE_SCRIPT_HANGUL,             /* Hang */
-  G_UNICODE_SCRIPT_HEBREW,             /* Hebr */
-  G_UNICODE_SCRIPT_HIRAGANA,           /* Hira */
-  G_UNICODE_SCRIPT_KANNADA,            /* Knda */
-  G_UNICODE_SCRIPT_KATAKANA,           /* Kana */
-  G_UNICODE_SCRIPT_KHMER,              /* Khmr */
-  G_UNICODE_SCRIPT_LAO,                /* Laoo */
-  G_UNICODE_SCRIPT_LATIN,              /* Latn (Latf, Latg) */
-  G_UNICODE_SCRIPT_MALAYALAM,          /* Mlym */
-  G_UNICODE_SCRIPT_MONGOLIAN,          /* Mong */
-  G_UNICODE_SCRIPT_MYANMAR,            /* Mymr */
-  G_UNICODE_SCRIPT_OGHAM,              /* Ogam */
-  G_UNICODE_SCRIPT_OLD_ITALIC,         /* Ital */
-  G_UNICODE_SCRIPT_ORIYA,              /* Orya */
-  G_UNICODE_SCRIPT_RUNIC,              /* Runr */
-  G_UNICODE_SCRIPT_SINHALA,            /* Sinh */
-  G_UNICODE_SCRIPT_SYRIAC,             /* Syrc (Syrj, Syrn, Syre) */
-  G_UNICODE_SCRIPT_TAMIL,              /* Taml */
-  G_UNICODE_SCRIPT_TELUGU,             /* Telu */
-  G_UNICODE_SCRIPT_THAANA,             /* Thaa */
-  G_UNICODE_SCRIPT_THAI,               /* Thai */
-  G_UNICODE_SCRIPT_TIBETAN,            /* Tibt */
-  G_UNICODE_SCRIPT_CANADIAN_ABORIGINAL, /* Cans */
-  G_UNICODE_SCRIPT_YI,                 /* Yiii */
-  G_UNICODE_SCRIPT_TAGALOG,            /* Tglg */
-  G_UNICODE_SCRIPT_HANUNOO,            /* Hano */
-  G_UNICODE_SCRIPT_BUHID,              /* Buhd */
-  G_UNICODE_SCRIPT_TAGBANWA,           /* Tagb */
-
-  /* Unicode-4.0 additions */
-  G_UNICODE_SCRIPT_BRAILLE,            /* Brai */
-  G_UNICODE_SCRIPT_CYPRIOT,            /* Cprt */
-  G_UNICODE_SCRIPT_LIMBU,              /* Limb */
-  G_UNICODE_SCRIPT_OSMANYA,            /* Osma */
-  G_UNICODE_SCRIPT_SHAVIAN,            /* Shaw */
-  G_UNICODE_SCRIPT_LINEAR_B,           /* Linb */
-  G_UNICODE_SCRIPT_TAI_LE,             /* Tale */
-  G_UNICODE_SCRIPT_UGARITIC,           /* Ugar */
-      
-  /* Unicode-4.1 additions */
-  G_UNICODE_SCRIPT_NEW_TAI_LUE,        /* Talu */
-  G_UNICODE_SCRIPT_BUGINESE,           /* Bugi */
-  G_UNICODE_SCRIPT_GLAGOLITIC,         /* Glag */
-  G_UNICODE_SCRIPT_TIFINAGH,           /* Tfng */
-  G_UNICODE_SCRIPT_SYLOTI_NAGRI,       /* Sylo */
-  G_UNICODE_SCRIPT_OLD_PERSIAN,        /* Xpeo */
-  G_UNICODE_SCRIPT_KHAROSHTHI,         /* Khar */
-
-  /* Unicode-5.0 additions */
-  G_UNICODE_SCRIPT_UNKNOWN,            /* Zzzz */
-  G_UNICODE_SCRIPT_BALINESE,           /* Bali */
-  G_UNICODE_SCRIPT_CUNEIFORM,          /* Xsux */
-  G_UNICODE_SCRIPT_PHOENICIAN,         /* Phnx */
-  G_UNICODE_SCRIPT_PHAGS_PA,           /* Phag */
-  G_UNICODE_SCRIPT_NKO,                /* Nkoo */
-
-  /* Unicode-5.1 additions */
-  G_UNICODE_SCRIPT_KAYAH_LI,           /* Kali */
-  G_UNICODE_SCRIPT_LEPCHA,             /* Lepc */
-  G_UNICODE_SCRIPT_REJANG,             /* Rjng */
-  G_UNICODE_SCRIPT_SUNDANESE,          /* Sund */
-  G_UNICODE_SCRIPT_SAURASHTRA,         /* Saur */
-  G_UNICODE_SCRIPT_CHAM,               /* Cham */
-  G_UNICODE_SCRIPT_OL_CHIKI,           /* Olck */
-  G_UNICODE_SCRIPT_VAI,                /* Vaii */
-  G_UNICODE_SCRIPT_CARIAN,             /* Cari */
-  G_UNICODE_SCRIPT_LYCIAN,             /* Lyci */
-  G_UNICODE_SCRIPT_LYDIAN,             /* Lydi */
-
-  /* Unicode-5.2 additions */
-  G_UNICODE_SCRIPT_AVESTAN,                /* Avestan */
-  G_UNICODE_SCRIPT_BAMUM,                  /* Bamum */
-  G_UNICODE_SCRIPT_EGYPTIAN_HIEROGLYPHS,   /* Egyptian Hieroglyphs */
-  G_UNICODE_SCRIPT_IMPERIAL_ARAMAIC,       /* Imperial Aramaic */
-  G_UNICODE_SCRIPT_INSCRIPTIONAL_PAHLAVI,  /* Inscriptional Pahlavi */
-  G_UNICODE_SCRIPT_INSCRIPTIONAL_PARTHIAN, /* Inscriptional Parthian */
-  G_UNICODE_SCRIPT_JAVANESE,               /* Javanese */
-  G_UNICODE_SCRIPT_KAITHI,                 /* Kaithi */
-  G_UNICODE_SCRIPT_LISU,                   /* Lisu */
-  G_UNICODE_SCRIPT_MEETEI_MAYEK,           /* Meetei Mayek */
-  G_UNICODE_SCRIPT_OLD_SOUTH_ARABIAN,      /* Old South Arabian */
-  G_UNICODE_SCRIPT_OLD_TURKISH,            /* Old Turkish */
-  G_UNICODE_SCRIPT_SAMARITAN,              /* Samaritan */
-  G_UNICODE_SCRIPT_TAI_THAM,               /* Tai Tham */
-  G_UNICODE_SCRIPT_TAI_VIET                /* Tai Viet */
-} GUnicodeScript;
-
-/* Returns TRUE if current locale uses UTF-8 charset.  If CHARSET is
- * not null, sets *CHARSET to the name of the current locale's
- * charset.  This value is statically allocated, and should be copied
- * in case the locale's charset will be changed later using setlocale()
- * or in some other way.
- */
-gboolean g_get_charset (G_CONST_RETURN char **charset);
-
-/* These are all analogs of the <ctype.h> functions.
- */
-gboolean g_unichar_isalnum   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isalpha   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iscntrl   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isdigit   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isgraph   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_islower   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isprint   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_ispunct   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isspace   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isupper   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isxdigit  (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_istitle   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isdefined (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iswide    (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iswide_cjk(gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iszerowidth(gunichar c) G_GNUC_CONST;
-gboolean g_unichar_ismark    (gunichar c) G_GNUC_CONST;
-
-/* More <ctype.h> functions.  These convert between the three cases.
- * See the Unicode book to understand title case.  */
-gunichar g_unichar_toupper (gunichar c) G_GNUC_CONST;
-gunichar g_unichar_tolower (gunichar c) G_GNUC_CONST;
-gunichar g_unichar_totitle (gunichar c) G_GNUC_CONST;
-
-/* If C is a digit (according to `g_unichar_isdigit'), then return its
-   numeric value.  Otherwise return -1.  */
-gint g_unichar_digit_value (gunichar c) G_GNUC_CONST;
-
-gint g_unichar_xdigit_value (gunichar c) G_GNUC_CONST;
-
-/* Return the Unicode character type of a given character.  */
-GUnicodeType g_unichar_type (gunichar c) G_GNUC_CONST;
-
-/* Return the line break property for a given character */
-GUnicodeBreakType g_unichar_break_type (gunichar c) G_GNUC_CONST;
-
-/* Returns the combining class for a given character */
-gint g_unichar_combining_class (gunichar uc) G_GNUC_CONST;
-
-
-/* Compute canonical ordering of a string in-place.  This rearranges
-   decomposed characters in the string according to their combining
-   classes.  See the Unicode manual for more information.  */
-void g_unicode_canonical_ordering (gunichar *string,
-				   gsize     len);
-
-/* Compute canonical decomposition of a character.  Returns g_malloc()d
-   string of Unicode characters.  RESULT_LEN is set to the resulting
-   length of the string.  */
-gunichar *g_unicode_canonical_decomposition (gunichar  ch,
-					     gsize    *result_len) G_GNUC_MALLOC;
-
-/* Array of skip-bytes-per-initial character.
- */
-GLIB_VAR const gchar * const g_utf8_skip;
-
-#define g_utf8_next_char(p) (char *)((p) + g_utf8_skip[*(const guchar *)(p)])
-
-gunichar g_utf8_get_char           (const gchar  *p) G_GNUC_PURE;
-gunichar g_utf8_get_char_validated (const  gchar *p,
-				    gssize        max_len) G_GNUC_PURE;
-
-gchar*   g_utf8_offset_to_pointer (const gchar *str,
-                                   glong        offset) G_GNUC_PURE;
-glong    g_utf8_pointer_to_offset (const gchar *str,      
-				   const gchar *pos) G_GNUC_PURE;
-gchar*   g_utf8_prev_char         (const gchar *p) G_GNUC_PURE;
-gchar*   g_utf8_find_next_char    (const gchar *p,
-				   const gchar *end) G_GNUC_PURE;
-gchar*   g_utf8_find_prev_char    (const gchar *str,
-				   const gchar *p) G_GNUC_PURE;
-
-glong g_utf8_strlen (const gchar *p,  
-		     gssize       max) G_GNUC_PURE;
-
-/* Copies n characters from src to dest */
-gchar* g_utf8_strncpy (gchar       *dest,
-		       const gchar *src,
-		       gsize        n);
-
-/* Find the UTF-8 character corresponding to ch, in string p. These
-   functions are equivalants to strchr and strrchr */
-gchar* g_utf8_strchr  (const gchar *p,
-		       gssize       len,
-		       gunichar     c);
-gchar* g_utf8_strrchr (const gchar *p,
-		       gssize       len,
-		       gunichar     c);
-gchar* g_utf8_strreverse (const gchar *str,
-			  gssize len);
-
-gunichar2 *g_utf8_to_utf16     (const gchar      *str,
-				glong             len,            
-				glong            *items_read,     
-				glong            *items_written,  
-				GError          **error) G_GNUC_MALLOC;
-gunichar * g_utf8_to_ucs4      (const gchar      *str,
-				glong             len,            
-				glong            *items_read,     
-				glong            *items_written,  
-				GError          **error) G_GNUC_MALLOC;
-gunichar * g_utf8_to_ucs4_fast (const gchar      *str,
-				glong             len,            
-				glong            *items_written) G_GNUC_MALLOC; 
-gunichar * g_utf16_to_ucs4     (const gunichar2  *str,
-				glong             len,            
-				glong            *items_read,     
-				glong            *items_written,  
-				GError          **error) G_GNUC_MALLOC;
-gchar*     g_utf16_to_utf8     (const gunichar2  *str,
-				glong             len,            
-				glong            *items_read,     
-				glong            *items_written,  
-				GError          **error) G_GNUC_MALLOC;
-gunichar2 *g_ucs4_to_utf16     (const gunichar   *str,
-				glong             len,            
-				glong            *items_read,     
-				glong            *items_written,  
-				GError          **error) G_GNUC_MALLOC;
-gchar*     g_ucs4_to_utf8      (const gunichar   *str,
-				glong             len,            
-				glong            *items_read,     
-				glong            *items_written,  
-				GError          **error) G_GNUC_MALLOC;
-
-/* Convert a single character into UTF-8. outbuf must have at
- * least 6 bytes of space. Returns the number of bytes in the
- * result.
- */
-gint      g_unichar_to_utf8 (gunichar    c,
-			     gchar      *outbuf);
-
-/* Validate a UTF8 string, return TRUE if valid, put pointer to
- * first invalid char in **end
- */
-
-gboolean g_utf8_validate (const gchar  *str,
-                          gssize        max_len,  
-                          const gchar **end);
-
-/* Validate a Unicode character */
-gboolean g_unichar_validate (gunichar ch) G_GNUC_CONST;
-
-gchar *g_utf8_strup   (const gchar *str,
-		       gssize       len) G_GNUC_MALLOC;
-gchar *g_utf8_strdown (const gchar *str,
-		       gssize       len) G_GNUC_MALLOC;
-gchar *g_utf8_casefold (const gchar *str,
-			gssize       len) G_GNUC_MALLOC;
-
-typedef enum {
-  G_NORMALIZE_DEFAULT,
-  G_NORMALIZE_NFD = G_NORMALIZE_DEFAULT,
-  G_NORMALIZE_DEFAULT_COMPOSE,
-  G_NORMALIZE_NFC = G_NORMALIZE_DEFAULT_COMPOSE,
-  G_NORMALIZE_ALL,
-  G_NORMALIZE_NFKD = G_NORMALIZE_ALL,
-  G_NORMALIZE_ALL_COMPOSE,
-  G_NORMALIZE_NFKC = G_NORMALIZE_ALL_COMPOSE
-} GNormalizeMode;
-
-gchar *g_utf8_normalize (const gchar   *str,
-			 gssize         len,
-			 GNormalizeMode mode) G_GNUC_MALLOC;
-
-gint   g_utf8_collate     (const gchar *str1,
-			   const gchar *str2) G_GNUC_PURE;
-gchar *g_utf8_collate_key (const gchar *str,
-			   gssize       len) G_GNUC_MALLOC;
-gchar *g_utf8_collate_key_for_filename (const gchar *str,
-			                gssize       len) G_GNUC_MALLOC;
-
-gboolean g_unichar_get_mirror_char (gunichar ch,
-                                    gunichar *mirrored_ch);
-
-GUnicodeScript g_unichar_get_script (gunichar ch) G_GNUC_CONST;
-
-
-/* private */
-
-gchar *_g_utf8_make_valid (const gchar *name);
-
-G_END_DECLS
-
-#endif /* __G_UNICODE_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gurifuncs.h b/protocols/Sametime/src/glib/include/glib/gurifuncs.h
deleted file mode 100644
index bbc8f8800a..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gurifuncs.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_URI_FUNCS_H__
-#define __G_URI_FUNCS_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_URI_RESERVED_CHARS_GENERIC_DELIMITERS:
- * 
- * Generic delimiters characters as defined in RFC 3986. Includes ":/?#[]@".
- **/
-#define G_URI_RESERVED_CHARS_GENERIC_DELIMITERS ":/?#[]@"
-
-/**
- * G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS
- * 
- * Subcomponent delimiter characters as defined in RFC 3986. Includes "!$&'()*+,;=".
- **/
-#define G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS "!$&'()*+,;="
-
-/**
- * G_URI_RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT:
- * 
- * Allowed characters in path elements. Includes "!$&'()*+,;=:@".
- **/
-#define G_URI_RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS ":@"
-
-/**
- * G_URI_RESERVED_CHARS_ALLOWED_IN_PATH:
- * 
- * Allowed characters in a path. Includes "!$&'()*+,;=:@/".
- **/
-#define G_URI_RESERVED_CHARS_ALLOWED_IN_PATH G_URI_RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT "/"
-
-/**
- * G_URI_RESERVED_CHARS_ALLOWED_IN_USERINFO:
- * 
- * Allowed characters in userinfo as defined in RFC 3986. Includes "!$&'()*+,;=:".
- **/
-#define G_URI_RESERVED_CHARS_ALLOWED_IN_USERINFO G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS ":"
-
-char *   g_uri_unescape_string       (const char *escaped_string,
-				      const char *illegal_characters);
-char *   g_uri_unescape_segment      (const char *escaped_string,
-				      const char *escaped_string_end,
-				      const char *illegal_characters);
-char *   g_uri_parse_scheme          (const char *uri);
-char *   g_uri_escape_string         (const char *unescaped,
-				      const char *reserved_chars_allowed,
-				      gboolean    allow_utf8);
-
-G_END_DECLS
-
-#endif /* __G_URI_FUNCS_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gutils.h b/protocols/Sametime/src/glib/include/glib/gutils.h
deleted file mode 100644
index 90281579c6..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gutils.h
+++ /dev/null
@@ -1,490 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_UTILS_H__
-#define __G_UTILS_H__
-
-#include <glib/gtypes.h>
-#include <stdarg.h>
-
-G_BEGIN_DECLS
-
-#ifdef G_OS_WIN32
-
-/* On Win32, the canonical directory separator is the backslash, and
- * the search path separator is the semicolon. Note that also the
- * (forward) slash works as directory separator.
- */
-#define G_DIR_SEPARATOR '\\'
-#define G_DIR_SEPARATOR_S "\\"
-#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR || (c) == '/')
-#define G_SEARCHPATH_SEPARATOR ';'
-#define G_SEARCHPATH_SEPARATOR_S ";"
-
-#else  /* !G_OS_WIN32 */
-
-/* Unix */
-
-#define G_DIR_SEPARATOR '/'
-#define G_DIR_SEPARATOR_S "/"
-#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR)
-#define G_SEARCHPATH_SEPARATOR ':'
-#define G_SEARCHPATH_SEPARATOR_S ":"
-
-#endif /* !G_OS_WIN32 */
-
-/* Define G_VA_COPY() to do the right thing for copying va_list variables.
- * glibconfig.h may have already defined G_VA_COPY as va_copy or __va_copy.
- */
-#if !defined (G_VA_COPY)
-#  if defined (__GNUC__) && defined (__PPC__) && (defined (_CALL_SYSV) || defined (_WIN32))
-#    define G_VA_COPY(ap1, ap2)	  (*(ap1) = *(ap2))
-#  elif defined (G_VA_COPY_AS_ARRAY)
-#    define G_VA_COPY(ap1, ap2)	  g_memmove ((ap1), (ap2), sizeof (va_list))
-#  else /* va_list is a pointer */
-#    define G_VA_COPY(ap1, ap2)	  ((ap1) = (ap2))
-#  endif /* va_list is a pointer */
-#endif /* !G_VA_COPY */
-
-/* inlining hassle. for compilers that don't allow the `inline' keyword,
- * mostly because of strict ANSI C compliance or dumbness, we try to fall
- * back to either `__inline__' or `__inline'.
- * G_CAN_INLINE is defined in glibconfig.h if the compiler seems to be 
- * actually *capable* to do function inlining, in which case inline 
- * function bodies do make sense. we also define G_INLINE_FUNC to properly 
- * export the function prototypes if no inlining can be performed.
- * inline function bodies have to be special cased with G_CAN_INLINE and a
- * .c file specific macro to allow one compiled instance with extern linkage
- * of the functions by defining G_IMPLEMENT_INLINES and the .c file macro.
- */
-#if defined (G_HAVE_INLINE) && defined (__GNUC__) && defined (__STRICT_ANSI__)
-#  undef inline
-#  define inline __inline__
-#elif !defined (G_HAVE_INLINE)
-#  undef inline
-#  if defined (G_HAVE___INLINE__)
-#    define inline __inline__
-#  elif defined (G_HAVE___INLINE)
-#    define inline __inline
-#  else /* !inline && !__inline__ && !__inline */
-#    define inline  /* don't inline, then */
-#  endif
-#endif
-#ifdef G_IMPLEMENT_INLINES
-#  define G_INLINE_FUNC
-#  undef  G_CAN_INLINE
-#elif defined (__GNUC__) 
-#  define G_INLINE_FUNC static __inline __attribute__ ((unused))
-#elif defined (G_CAN_INLINE) 
-#  define G_INLINE_FUNC static inline
-#else /* can't inline */
-#  define G_INLINE_FUNC
-#endif /* !G_INLINE_FUNC */
-
-/* Retrive static string info
- */
-#ifdef G_OS_WIN32
-#define g_get_user_name g_get_user_name_utf8
-#define g_get_real_name g_get_real_name_utf8
-#define g_get_home_dir g_get_home_dir_utf8
-#define g_get_tmp_dir g_get_tmp_dir_utf8
-#endif
-
-G_CONST_RETURN gchar* g_get_user_name        (void);
-G_CONST_RETURN gchar* g_get_real_name        (void);
-G_CONST_RETURN gchar* g_get_home_dir         (void);
-G_CONST_RETURN gchar* g_get_tmp_dir          (void);
-G_CONST_RETURN gchar* g_get_host_name	     (void);
-gchar*                g_get_prgname          (void);
-void                  g_set_prgname          (const gchar *prgname);
-G_CONST_RETURN gchar* g_get_application_name (void);
-void                  g_set_application_name (const gchar *application_name);
-
-void    g_reload_user_special_dirs_cache     (void);
-G_CONST_RETURN gchar*    g_get_user_data_dir      (void);
-G_CONST_RETURN gchar*    g_get_user_config_dir    (void);
-G_CONST_RETURN gchar*    g_get_user_cache_dir     (void);
-G_CONST_RETURN gchar* G_CONST_RETURN * g_get_system_data_dirs   (void);
-
-#ifdef G_OS_WIN32
-/* This functions is not part of the public GLib API */
-G_CONST_RETURN gchar* G_CONST_RETURN * g_win32_get_system_data_dirs_for_module (void (*address_of_function)(void));
-#endif
-
-#if defined (G_OS_WIN32) && defined (G_CAN_INLINE) && !defined (__cplusplus)
-/* This function is not part of the public GLib API either. Just call
- * g_get_system_data_dirs() in your code, never mind that that is
- * actually a macro and you will in fact call this inline function.
- */
-static inline G_CONST_RETURN gchar * G_CONST_RETURN *
-_g_win32_get_system_data_dirs (void)
-{
-  return g_win32_get_system_data_dirs_for_module ((void (*)(void)) &_g_win32_get_system_data_dirs);
-}
-#define g_get_system_data_dirs _g_win32_get_system_data_dirs
-#endif
-
-G_CONST_RETURN gchar* G_CONST_RETURN * g_get_system_config_dirs (void);
-
-G_CONST_RETURN gchar* G_CONST_RETURN * g_get_language_names (void);
-
-/**
- * GUserDirectory:
- * @G_USER_DIRECTORY_DESKTOP: the user's Desktop directory
- * @G_USER_DIRECTORY_DOCUMENTS: the user's Documents directory
- * @G_USER_DIRECTORY_DOWNLOAD: the user's Downloads directory
- * @G_USER_DIRECTORY_MUSIC: the user's Music directory
- * @G_USER_DIRECTORY_PICTURES: the user's Pictures directory
- * @G_USER_DIRECTORY_PUBLIC_SHARE: the user's shared directory
- * @G_USER_DIRECTORY_TEMPLATES: the user's Templates directory
- * @G_USER_DIRECTORY_VIDEOS: the user's Movies directory
- * @G_USER_N_DIRECTORIES: the number of enum values
- *
- * These are logical ids for special directories which are defined
- * depending on the platform used. You should use g_get_user_special_dir()
- * to retrieve the full path associated to the logical id.
- *
- * The #GUserDirectory enumeration can be extended at later date. Not
- * every platform has a directory for every logical id in this
- * enumeration.
- *
- * Since: 2.14
- */
-typedef enum {
-  G_USER_DIRECTORY_DESKTOP,
-  G_USER_DIRECTORY_DOCUMENTS,
-  G_USER_DIRECTORY_DOWNLOAD,
-  G_USER_DIRECTORY_MUSIC,
-  G_USER_DIRECTORY_PICTURES,
-  G_USER_DIRECTORY_PUBLIC_SHARE,
-  G_USER_DIRECTORY_TEMPLATES,
-  G_USER_DIRECTORY_VIDEOS,
-
-  G_USER_N_DIRECTORIES
-} GUserDirectory;
-
-G_CONST_RETURN gchar* g_get_user_special_dir (GUserDirectory directory);
-
-typedef struct _GDebugKey	GDebugKey;
-struct _GDebugKey
-{
-  const gchar *key;
-  guint	       value;
-};
-
-/* Miscellaneous utility functions
- */
-guint                 g_parse_debug_string (const gchar     *string,
-					    const GDebugKey *keys,
-					    guint            nkeys);
-
-gint                  g_snprintf           (gchar       *string,
-					    gulong       n,
-					    gchar const *format,
-					    ...) G_GNUC_PRINTF (3, 4);
-gint                  g_vsnprintf          (gchar       *string,
-					    gulong       n,
-					    gchar const *format,
-					    va_list      args);
-
-/* Check if a file name is an absolute path */
-gboolean              g_path_is_absolute   (const gchar *file_name);
-
-/* In case of absolute paths, skip the root part */
-G_CONST_RETURN gchar* g_path_skip_root     (const gchar *file_name);
-
-#ifndef G_DISABLE_DEPRECATED
-
-/* These two functions are deprecated and will be removed in the next
- * major release of GLib. Use g_path_get_dirname/g_path_get_basename
- * instead. Whatch out! The string returned by g_path_get_basename
- * must be g_freed, while the string returned by g_basename must not.*/
-G_CONST_RETURN gchar* g_basename           (const gchar *file_name);
-#define g_dirname g_path_get_dirname
-
-#endif /* G_DISABLE_DEPRECATED */
-
-#ifdef G_OS_WIN32
-#define g_get_current_dir g_get_current_dir_utf8
-#endif
-
-/* The returned strings are newly allocated with g_malloc() */
-gchar*                g_get_current_dir    (void);
-gchar*                g_path_get_basename  (const gchar *file_name) G_GNUC_MALLOC;
-gchar*                g_path_get_dirname   (const gchar *file_name) G_GNUC_MALLOC;
-
-/* Set the pointer at the specified location to NULL */
-void                  g_nullify_pointer    (gpointer    *nullify_location);
-
-/* return the environment string for the variable. The returned memory
- * must not be freed. */
-#ifdef G_OS_WIN32
-#define g_getenv g_getenv_utf8
-#define g_setenv g_setenv_utf8
-#define g_unsetenv g_unsetenv_utf8
-#define g_find_program_in_path g_find_program_in_path_utf8
-#endif
-
-G_CONST_RETURN gchar* g_getenv             (const gchar *variable);
-gboolean              g_setenv             (const gchar *variable,
-					    const gchar *value,
-					    gboolean     overwrite);
-void                  g_unsetenv           (const gchar *variable);
-gchar**               g_listenv            (void);
-
-/* private */
-const gchar*	     _g_getenv_nomalloc	   (const gchar	*variable,
-					    gchar        buffer[1024]);
-
-/* we try to provide a useful equivalent for ATEXIT if it is
- * not defined, but use is actually abandoned. people should
- * use g_atexit() instead.
- */
-typedef	void		(*GVoidFunc)		(void);
-#ifndef ATEXIT
-# define ATEXIT(proc)	g_ATEXIT(proc)
-#else
-# define G_NATIVE_ATEXIT
-#endif /* ATEXIT */
-/* we use a GLib function as a replacement for ATEXIT, so
- * the programmer is not required to check the return value
- * (if there is any in the implementation) and doesn't encounter
- * missing include files.
- */
-void	g_atexit		(GVoidFunc    func);
-
-#ifdef G_OS_WIN32
-/* It's a bad idea to wrap atexit() on Windows. If the GLib DLL calls
- * atexit(), the function will be called when the GLib DLL is detached
- * from the program, which is not what the caller wants. The caller
- * wants the function to be called when it *itself* exits (or is
- * detached, in case the caller, too, is a DLL).
- */
-#if (defined(__MINGW_H) && !defined(_STDLIB_H_)) || (defined(_MSC_VER) && !defined(_INC_STDLIB))
-int atexit (void (*)(void));
-#endif
-#define g_atexit(func) atexit(func)
-#endif
-
-/* Look for an executable in PATH, following execvp() rules */
-gchar*  g_find_program_in_path  (const gchar *program);
-
-/* Bit tests
- */
-G_INLINE_FUNC gint	g_bit_nth_lsf (gulong  mask,
-				       gint    nth_bit) G_GNUC_CONST;
-G_INLINE_FUNC gint	g_bit_nth_msf (gulong  mask,
-				       gint    nth_bit) G_GNUC_CONST;
-G_INLINE_FUNC guint	g_bit_storage (gulong  number) G_GNUC_CONST;
-
-/* Trash Stacks
- * elements need to be >= sizeof (gpointer)
- */
-typedef struct _GTrashStack     GTrashStack;
-struct _GTrashStack
-{
-  GTrashStack *next;
-};
-
-G_INLINE_FUNC void	g_trash_stack_push	(GTrashStack **stack_p,
-						 gpointer      data_p);
-G_INLINE_FUNC gpointer	g_trash_stack_pop	(GTrashStack **stack_p);
-G_INLINE_FUNC gpointer	g_trash_stack_peek	(GTrashStack **stack_p);
-G_INLINE_FUNC guint	g_trash_stack_height	(GTrashStack **stack_p);
-
-/* inline function implementations
- */
-#if defined (G_CAN_INLINE) || defined (__G_UTILS_C__)
-G_INLINE_FUNC gint
-g_bit_nth_lsf (gulong mask,
-	       gint   nth_bit)
-{
-  if (G_UNLIKELY (nth_bit < -1))
-    nth_bit = -1;
-  while (nth_bit < ((GLIB_SIZEOF_LONG * 8) - 1))
-    {
-      nth_bit++;
-      if (mask & (1UL << nth_bit))
-	return nth_bit;
-    }
-  return -1;
-}
-G_INLINE_FUNC gint
-g_bit_nth_msf (gulong mask,
-	       gint   nth_bit)
-{
-  if (nth_bit < 0 || G_UNLIKELY (nth_bit > GLIB_SIZEOF_LONG * 8))
-    nth_bit = GLIB_SIZEOF_LONG * 8;
-  while (nth_bit > 0)
-    {
-      nth_bit--;
-      if (mask & (1UL << nth_bit))
-	return nth_bit;
-    }
-  return -1;
-}
-G_INLINE_FUNC guint
-g_bit_storage (gulong number)
-{
-#if defined(__GNUC__) && (__GNUC__ >= 4) && defined(__OPTIMIZE__)
-  return G_LIKELY (number) ?
-	   ((GLIB_SIZEOF_LONG * 8U - 1) ^ __builtin_clzl(number)) + 1 : 1;
-#else
-  register guint n_bits = 0;
-  
-  do
-    {
-      n_bits++;
-      number >>= 1;
-    }
-  while (number);
-  return n_bits;
-#endif
-}
-G_INLINE_FUNC void
-g_trash_stack_push (GTrashStack **stack_p,
-		    gpointer      data_p)
-{
-  GTrashStack *data = (GTrashStack *) data_p;
-
-  data->next = *stack_p;
-  *stack_p = data;
-}
-G_INLINE_FUNC gpointer
-g_trash_stack_pop (GTrashStack **stack_p)
-{
-  GTrashStack *data;
-
-  data = *stack_p;
-  if (data)
-    {
-      *stack_p = data->next;
-      /* NULLify private pointer here, most platforms store NULL as
-       * subsequent 0 bytes
-       */
-      data->next = NULL;
-    }
-
-  return data;
-}
-G_INLINE_FUNC gpointer
-g_trash_stack_peek (GTrashStack **stack_p)
-{
-  GTrashStack *data;
-
-  data = *stack_p;
-
-  return data;
-}
-G_INLINE_FUNC guint
-g_trash_stack_height (GTrashStack **stack_p)
-{
-  GTrashStack *data;
-  guint i = 0;
-
-  for (data = *stack_p; data; data = data->next)
-    i++;
-
-  return i;
-}
-#endif  /* G_CAN_INLINE || __G_UTILS_C__ */
-
-/* Glib version.
- * we prefix variable declarations so they can
- * properly get exported in windows dlls.
- */
-GLIB_VAR const guint glib_major_version;
-GLIB_VAR const guint glib_minor_version;
-GLIB_VAR const guint glib_micro_version;
-GLIB_VAR const guint glib_interface_age;
-GLIB_VAR const guint glib_binary_age;
-
-const gchar * glib_check_version (guint required_major,
-                                  guint required_minor,
-                                  guint required_micro);
-
-#define GLIB_CHECK_VERSION(major,minor,micro)    \
-    (GLIB_MAJOR_VERSION > (major) || \
-     (GLIB_MAJOR_VERSION == (major) && GLIB_MINOR_VERSION > (minor)) || \
-     (GLIB_MAJOR_VERSION == (major) && GLIB_MINOR_VERSION == (minor) && \
-      GLIB_MICRO_VERSION >= (micro)))
-
-G_END_DECLS
-
-#ifndef G_DISABLE_DEPRECATED
-
-/*
- * This macro is deprecated. This DllMain() is too complex. It is
- * recommended to write an explicit minimal DLlMain() that just saves
- * the handle to the DLL and then use that handle instead, for
- * instance passing it to
- * g_win32_get_package_installation_directory_of_module().
- *
- * On Windows, this macro defines a DllMain function that stores the
- * actual DLL name that the code being compiled will be included in.
- * STATIC should be empty or 'static'. DLL_NAME is the name of the
- * (pointer to the) char array where the DLL name will be stored. If
- * this is used, you must also include <windows.h>. If you need a more complex
- * DLL entry point function, you cannot use this.
- *
- * On non-Windows platforms, expands to nothing.
- */
-
-#ifndef G_PLATFORM_WIN32
-# define G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name)
-#else
-# define G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name)			\
-static char *dll_name;							\
-									\
-BOOL WINAPI								\
-DllMain (HINSTANCE hinstDLL,						\
-	 DWORD     fdwReason,						\
-	 LPVOID    lpvReserved)						\
-{									\
-  wchar_t wcbfr[1000];							\
-  char *tem;								\
-  switch (fdwReason)							\
-    {									\
-    case DLL_PROCESS_ATTACH:						\
-      GetModuleFileNameW ((HMODULE) hinstDLL, wcbfr, G_N_ELEMENTS (wcbfr)); \
-      tem = g_utf16_to_utf8 (wcbfr, -1, NULL, NULL, NULL);		\
-      dll_name = g_path_get_basename (tem);				\
-      g_free (tem);							\
-      break;								\
-    }									\
-									\
-  return TRUE;								\
-}
-
-#endif	/* !G_DISABLE_DEPRECATED */
-
-#endif /* G_PLATFORM_WIN32 */
-
-#endif /* __G_UTILS_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gvariant.h b/protocols/Sametime/src/glib/include/glib/gvariant.h
deleted file mode 100644
index 528492b685..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gvariant.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright © 2007, 2008 Ryan Lortie
- * Copyright © 2009, 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_VARIANT_H__
-#define __G_VARIANT_H__
-
-#include <glib/gvarianttype.h>
-#include <glib/gstring.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GVariant        GVariant;
-
-typedef enum
-{
-  G_VARIANT_CLASS_BOOLEAN       = 'b',
-  G_VARIANT_CLASS_BYTE          = 'y',
-  G_VARIANT_CLASS_INT16         = 'n',
-  G_VARIANT_CLASS_UINT16        = 'q',
-  G_VARIANT_CLASS_INT32         = 'i',
-  G_VARIANT_CLASS_UINT32        = 'u',
-  G_VARIANT_CLASS_INT64         = 'x',
-  G_VARIANT_CLASS_UINT64        = 't',
-  G_VARIANT_CLASS_HANDLE        = 'h',
-  G_VARIANT_CLASS_DOUBLE        = 'd',
-  G_VARIANT_CLASS_STRING        = 's',
-  G_VARIANT_CLASS_OBJECT_PATH   = 'o',
-  G_VARIANT_CLASS_SIGNATURE     = 'g',
-  G_VARIANT_CLASS_VARIANT       = 'v',
-  G_VARIANT_CLASS_MAYBE         = 'm',
-  G_VARIANT_CLASS_ARRAY         = 'a',
-  G_VARIANT_CLASS_TUPLE         = '(',
-  G_VARIANT_CLASS_DICT_ENTRY    = '{'
-} GVariantClass;
-
-void                            g_variant_unref                         (GVariant             *value);
-GVariant *                      g_variant_ref                           (GVariant             *value);
-GVariant *                      g_variant_ref_sink                      (GVariant             *value);
-gboolean                        g_variant_is_floating                   (GVariant             *value);
-
-const GVariantType *            g_variant_get_type                      (GVariant             *value);
-const gchar *                   g_variant_get_type_string               (GVariant             *value);
-gboolean                        g_variant_is_of_type                    (GVariant             *value,
-                                                                         const GVariantType   *type);
-gboolean                        g_variant_is_container                  (GVariant             *value);
-GVariantClass                   g_variant_classify                      (GVariant             *value);
-GVariant *                      g_variant_new_boolean                   (gboolean              boolean);
-GVariant *                      g_variant_new_byte                      (guchar                byte);
-GVariant *                      g_variant_new_int16                     (gint16                int16);
-GVariant *                      g_variant_new_uint16                    (guint16               uint16);
-GVariant *                      g_variant_new_int32                     (gint32                int32);
-GVariant *                      g_variant_new_uint32                    (guint32               uint32);
-GVariant *                      g_variant_new_int64                     (gint64                int64);
-GVariant *                      g_variant_new_uint64                    (guint64               uint64);
-GVariant *                      g_variant_new_handle                    (gint32                handle);
-GVariant *                      g_variant_new_double                    (gdouble               floating);
-GVariant *                      g_variant_new_string                    (const gchar          *string);
-GVariant *                      g_variant_new_object_path               (const gchar          *object_path);
-gboolean                        g_variant_is_object_path                (const gchar          *string);
-GVariant *                      g_variant_new_signature                 (const gchar          *signature);
-gboolean                        g_variant_is_signature                  (const gchar          *string);
-GVariant *                      g_variant_new_variant                   (GVariant             *value);
-GVariant *                      g_variant_new_strv                      (const gchar * const  *strv,
-                                                                         gssize                length);
-GVariant *                      g_variant_new_bytestring                (const gchar          *string);
-GVariant *                      g_variant_new_bytestring_array          (const gchar * const  *strv,
-                                                                         gssize                length);
-
-gboolean                        g_variant_get_boolean                   (GVariant             *value);
-guchar                          g_variant_get_byte                      (GVariant             *value);
-gint16                          g_variant_get_int16                     (GVariant             *value);
-guint16                         g_variant_get_uint16                    (GVariant             *value);
-gint32                          g_variant_get_int32                     (GVariant             *value);
-guint32                         g_variant_get_uint32                    (GVariant             *value);
-gint64                          g_variant_get_int64                     (GVariant             *value);
-guint64                         g_variant_get_uint64                    (GVariant             *value);
-gint32                          g_variant_get_handle                    (GVariant             *value);
-gdouble                         g_variant_get_double                    (GVariant             *value);
-GVariant *                      g_variant_get_variant                   (GVariant             *value);
-const gchar *                   g_variant_get_string                    (GVariant             *value,
-                                                                         gsize                *length);
-gchar *                         g_variant_dup_string                    (GVariant             *value,
-                                                                         gsize                *length);
-const gchar **                  g_variant_get_strv                      (GVariant             *value,
-                                                                         gsize                *length);
-gchar **                        g_variant_dup_strv                      (GVariant             *value,
-                                                                         gsize                *length);
-const gchar *                   g_variant_get_bytestring                (GVariant             *value);
-gchar *                         g_variant_dup_bytestring                (GVariant             *value,
-                                                                         gsize                *length);
-const gchar **                  g_variant_get_bytestring_array          (GVariant             *value,
-                                                                         gsize                *length);
-gchar **                        g_variant_dup_bytestring_array          (GVariant             *value,
-                                                                         gsize                *length);
-
-GVariant *                      g_variant_new_maybe                     (const GVariantType   *child_type,
-                                                                         GVariant             *child);
-GVariant *                      g_variant_new_array                     (const GVariantType   *child_type,
-                                                                         GVariant * const     *children,
-                                                                         gsize                 n_children);
-GVariant *                      g_variant_new_tuple                     (GVariant * const     *children,
-                                                                         gsize                 n_children);
-GVariant *                      g_variant_new_dict_entry                (GVariant             *key,
-                                                                         GVariant             *value);
-
-GVariant *                      g_variant_get_maybe                     (GVariant             *value);
-gsize                           g_variant_n_children                    (GVariant             *value);
-void                            g_variant_get_child                     (GVariant             *value,
-                                                                         gsize                 index_,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-GVariant *                      g_variant_get_child_value               (GVariant             *value,
-                                                                         gsize                 index_);
-gconstpointer                   g_variant_get_fixed_array               (GVariant             *value,
-                                                                         gsize                *n_elements,
-                                                                         gsize                 element_size);
-
-gsize                           g_variant_get_size                      (GVariant             *value);
-gconstpointer                   g_variant_get_data                      (GVariant             *value);
-void                            g_variant_store                         (GVariant             *value,
-                                                                         gpointer              data);
-
-gchar *                         g_variant_print                         (GVariant             *value,
-                                                                         gboolean              type_annotate);
-GString *                       g_variant_print_string                  (GVariant             *value,
-                                                                         GString              *string,
-                                                                         gboolean              type_annotate);
-
-guint                           g_variant_hash                          (gconstpointer         value);
-gboolean                        g_variant_equal                         (gconstpointer         one,
-                                                                         gconstpointer         two);
-
-GVariant *                      g_variant_get_normal_form               (GVariant             *value);
-gboolean                        g_variant_is_normal_form                (GVariant             *value);
-GVariant *                      g_variant_byteswap                      (GVariant             *value);
-GVariant *                      g_variant_new_from_data                 (const GVariantType   *type,
-                                                                         gconstpointer         data,
-                                                                         gsize                 size,
-                                                                         gboolean              trusted,
-                                                                         GDestroyNotify        notify,
-                                                                         gpointer              user_data);
-
-typedef struct _GVariantIter GVariantIter;
-struct _GVariantIter {
-  /*< private >*/
-  gsize x[16];
-};
-
-GVariantIter *                  g_variant_iter_new                      (GVariant             *value);
-gsize                           g_variant_iter_init                     (GVariantIter         *iter,
-                                                                         GVariant             *value);
-GVariantIter *                  g_variant_iter_copy                     (GVariantIter         *iter);
-gsize                           g_variant_iter_n_children               (GVariantIter         *iter);
-void                            g_variant_iter_free                     (GVariantIter         *iter);
-GVariant *                      g_variant_iter_next_value               (GVariantIter         *iter);
-gboolean                        g_variant_iter_next                     (GVariantIter         *iter,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-gboolean                        g_variant_iter_loop                     (GVariantIter         *iter,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-
-
-typedef struct _GVariantBuilder GVariantBuilder;
-struct _GVariantBuilder {
-  /*< private >*/
-  gsize x[16];
-};
-
-typedef enum
-{
-  G_VARIANT_PARSE_ERROR_FAILED
-} GVariantParseError;
-#define G_VARIANT_PARSE_ERROR (g_variant_parser_get_error_quark ())
-
-GQuark                          g_variant_parser_get_error_quark        (void);
-
-GVariantBuilder *               g_variant_builder_new                   (const GVariantType   *type);
-void                            g_variant_builder_unref                 (GVariantBuilder      *builder);
-GVariantBuilder *               g_variant_builder_ref                   (GVariantBuilder      *builder);
-void                            g_variant_builder_init                  (GVariantBuilder      *builder,
-                                                                         const GVariantType   *type);
-GVariant *                      g_variant_builder_end                   (GVariantBuilder      *builder);
-void                            g_variant_builder_clear                 (GVariantBuilder      *builder);
-void                            g_variant_builder_open                  (GVariantBuilder      *builder,
-                                                                         const GVariantType   *type);
-void                            g_variant_builder_close                 (GVariantBuilder      *builder);
-void                            g_variant_builder_add_value             (GVariantBuilder      *builder,
-                                                                         GVariant             *value);
-void                            g_variant_builder_add                   (GVariantBuilder      *builder,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-void                            g_variant_builder_add_parsed            (GVariantBuilder      *builder,
-                                                                         const gchar          *format,
-                                                                         ...);
-
-GVariant *                      g_variant_new                           (const gchar          *format_string,
-                                                                         ...);
-void                            g_variant_get                           (GVariant             *value,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-GVariant *                      g_variant_new_va                        (const gchar          *format_string,
-                                                                         const gchar         **endptr,
-                                                                         va_list              *app);
-void                            g_variant_get_va                        (GVariant             *value,
-                                                                         const gchar          *format_string,
-                                                                         const gchar         **endptr,
-                                                                         va_list              *app);
-
-
-GVariant *                      g_variant_parse                         (const GVariantType   *type,
-                                                                         const gchar          *text,
-                                                                         const gchar          *limit,
-                                                                         const gchar         **endptr,
-                                                                         GError              **error);
-GVariant *                      g_variant_new_parsed                    (const gchar          *format,
-                                                                         ...);
-GVariant *                      g_variant_new_parsed_va                 (const gchar          *format,
-                                                                         va_list              *app);
-
-gint                            g_variant_compare                       (gconstpointer one,
-                                                                         gconstpointer two);
-G_END_DECLS
-
-#endif /* __G_VARIANT_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gvarianttype.h b/protocols/Sametime/src/glib/include/glib/gvarianttype.h
deleted file mode 100644
index 124fa46b59..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gvarianttype.h
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
- * Copyright © 2007, 2008 Ryan Lortie
- * Copyright © 2009, 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_VARIANT_TYPE_H__
-#define __G_VARIANT_TYPE_H__
-
-#include <glib/gmessages.h>
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GVariantType:
- *
- * A type in the GVariant type system.
- *
- * Two types may not be compared by value; use g_variant_type_equal() or
- * g_variant_type_is_subtype().  May be copied using
- * g_variant_type_copy() and freed using g_variant_type_free().
- **/
-typedef struct _GVariantType GVariantType;
-
-/**
- * G_VARIANT_TYPE_BOOLEAN:
- *
- * The type of a value that can be either %TRUE or %FALSE.
- **/
-#define G_VARIANT_TYPE_BOOLEAN              ((const GVariantType *) "b")
-
-/**
- * G_VARIANT_TYPE_BYTE:
- *
- * The type of an integer value that can range from 0 to 255.
- **/
-#define G_VARIANT_TYPE_BYTE                 ((const GVariantType *) "y")
-
-/**
- * G_VARIANT_TYPE_INT16:
- *
- * The type of an integer value that can range from -32768 to 32767.
- **/
-#define G_VARIANT_TYPE_INT16                ((const GVariantType *) "n")
-
-/**
- * G_VARIANT_TYPE_UINT16:
- *
- * The type of an integer value that can range from 0 to 65535.
- * There were about this many people living in Toronto in the 1870s.
- **/
-#define G_VARIANT_TYPE_UINT16               ((const GVariantType *) "q")
-
-/**
- * G_VARIANT_TYPE_INT32:
- *
- * The type of an integer value that can range from -2147483648 to
- * 2147483647.
- **/
-#define G_VARIANT_TYPE_INT32                ((const GVariantType *) "i")
-
-/**
- * G_VARIANT_TYPE_UINT32:
- *
- * The type of an integer value that can range from 0 to 4294967295.
- * That's one number for everyone who was around in the late 1970s.
- **/
-#define G_VARIANT_TYPE_UINT32               ((const GVariantType *) "u")
-
-/**
- * G_VARIANT_TYPE_INT64:
- *
- * The type of an integer value that can range from
- * -9223372036854775808 to 9223372036854775807.
- **/
-#define G_VARIANT_TYPE_INT64                ((const GVariantType *) "x")
-
-/**
- * G_VARIANT_TYPE_UINT64:
- *
- * The type of an integer value that can range from 0 to
- * 18446744073709551616.  That's a really big number, but a Rubik's
- * cube can have a bit more than twice as many possible positions.
- **/
-#define G_VARIANT_TYPE_UINT64               ((const GVariantType *) "t")
-
-/**
- * G_VARIANT_TYPE_DOUBLE:
- *
- * The type of a double precision IEEE754 floating point number.
- * These guys go up to about 1.80e308 (plus and minus) but miss out on
- * some numbers in between.  In any case, that's far greater than the
- * estimated number of fundamental particles in the observable
- * universe.
- **/
-#define G_VARIANT_TYPE_DOUBLE               ((const GVariantType *) "d")
-
-/**
- * G_VARIANT_TYPE_STRING:
- *
- * The type of a string.  "" is a string.  %NULL is not a string.
- **/
-#define G_VARIANT_TYPE_STRING               ((const GVariantType *) "s")
-
-/**
- * G_VARIANT_TYPE_OBJECT_PATH:
- *
- * The type of a DBus object reference.  These are strings of a
- * specific format used to identify objects at a given destination on
- * the bus.
- *
- * If you are not interacting with DBus, then there is no reason to make
- * use of this type.  If you are, then the DBus specification contains a
- * precise description of valid object paths.
- **/
-#define G_VARIANT_TYPE_OBJECT_PATH          ((const GVariantType *) "o")
-
-/**
- * G_VARIANT_TYPE_SIGNATURE:
- *
- * The type of a DBus type signature.  These are strings of a specific
- * format used as type signatures for DBus methods and messages.
- *
- * If you are not interacting with DBus, then there is no reason to make
- * use of this type.  If you are, then the DBus specification contains a
- * precise description of valid signature strings.
- **/
-#define G_VARIANT_TYPE_SIGNATURE            ((const GVariantType *) "g")
-
-/**
- * G_VARIANT_TYPE_VARIANT:
- *
- * The type of a box that contains any other value (including another
- * variant).
- **/
-#define G_VARIANT_TYPE_VARIANT              ((const GVariantType *) "v")
-
-/**
- * G_VARIANT_TYPE_HANDLE:
- *
- * The type of a 32bit signed integer value, that by convention, is used
- * as an index into an array of file descriptors that are sent alongside
- * a DBus message.
- *
- * If you are not interacting with DBus, then there is no reason to make
- * use of this type.
- **/
-#define G_VARIANT_TYPE_HANDLE               ((const GVariantType *) "h")
-
-/**
- * G_VARIANT_TYPE_UNIT:
- *
- * The empty tuple type.  Has only one instance.  Known also as "triv"
- * or "void".
- **/
-#define G_VARIANT_TYPE_UNIT                 ((const GVariantType *) "()")
-
-/**
- * G_VARIANT_TYPE_ANY:
- *
- * An indefinite type that is a supertype of every type (including
- * itself).
- **/
-#define G_VARIANT_TYPE_ANY                  ((const GVariantType *) "*")
-
-/**
- * G_VARIANT_TYPE_BASIC:
- *
- * An indefinite type that is a supertype of every basic (ie:
- * non-container) type.
- **/
-#define G_VARIANT_TYPE_BASIC                ((const GVariantType *) "?")
-
-/**
- * G_VARIANT_TYPE_MAYBE:
- *
- * An indefinite type that is a supertype of every maybe type.
- **/
-#define G_VARIANT_TYPE_MAYBE                ((const GVariantType *) "m*")
-
-/**
- * G_VARIANT_TYPE_ARRAY:
- *
- * An indefinite type that is a supertype of every array type.
- **/
-#define G_VARIANT_TYPE_ARRAY                ((const GVariantType *) "a*")
-
-/**
- * G_VARIANT_TYPE_TUPLE:
- *
- * An indefinite type that is a supertype of every tuple type,
- * regardless of the number of items in the tuple.
- **/
-#define G_VARIANT_TYPE_TUPLE                ((const GVariantType *) "r")
-
-/**
- * G_VARIANT_TYPE_DICT_ENTRY:
- *
- * An indefinite type that is a supertype of every dictionary entry
- * type.
- **/
-#define G_VARIANT_TYPE_DICT_ENTRY           ((const GVariantType *) "{?*}")
-
-/**
- * G_VARIANT_TYPE_DICTIONARY:
- *
- * An indefinite type that is a supertype of every dictionary type --
- * that is, any array type that has an element type equal to any
- * dictionary entry type.
- **/
-#define G_VARIANT_TYPE_DICTIONARY           ((const GVariantType *) "a{?*}")
-
-/**
- * G_VARIANT_TYPE_STRING_ARRAY:
- *
- * The type of an array of strings.
- **/
-#define G_VARIANT_TYPE_STRING_ARRAY         ((const GVariantType *) "as")
-
-/**
- * G_VARIANT_TYPE_BYTESTRING:
- *
- * The type of an array of bytes.  This type is commonly used to pass
- * around strings that may not be valid utf8.  In that case, the
- * convention is that the nul terminator character should be included as
- * the last character in the array.
- **/
-#define G_VARIANT_TYPE_BYTESTRING           ((const GVariantType *) "ay")
-
-/**
- * G_VARIANT_TYPE_BYTESTRING_ARRAY:
- *
- * The type of an array of byte strings (an array of arrays of bytes).
- **/
-#define G_VARIANT_TYPE_BYTESTRING_ARRAY     ((const GVariantType *) "aay")
-
-
-/**
- * G_VARIANT_TYPE:
- * @type_string: a well-formed #GVariantType type string
- *
- * Converts a string to a const #GVariantType.  Depending on the
- * current debugging level, this function may perform a runtime check
- * to ensure that @string is a valid GVariant type string.
- *
- * It is always a programmer error to use this macro with an invalid
- * type string.
- *
- * Since 2.24
- **/
-#ifndef G_DISABLE_CHECKS
-# define G_VARIANT_TYPE(type_string)            (g_variant_type_checked_ ((type_string)))
-#else
-# define G_VARIANT_TYPE(type_string)            ((const GVariantType *) (type_string))
-#endif
-
-/* type string checking */
-gboolean                        g_variant_type_string_is_valid          (const gchar         *type_string);
-gboolean                        g_variant_type_string_scan              (const gchar         *string,
-                                                                         const gchar         *limit,
-                                                                         const gchar        **endptr);
-
-/* create/destroy */
-void                            g_variant_type_free                     (GVariantType        *type);
-GVariantType *                  g_variant_type_copy                     (const GVariantType  *type);
-GVariantType *                  g_variant_type_new                      (const gchar         *type_string);
-
-/* getters */
-gsize                           g_variant_type_get_string_length        (const GVariantType  *type);
-const gchar *                   g_variant_type_peek_string              (const GVariantType  *type);
-gchar *                         g_variant_type_dup_string               (const GVariantType  *type);
-
-/* classification */
-gboolean                        g_variant_type_is_definite              (const GVariantType  *type);
-gboolean                        g_variant_type_is_container             (const GVariantType  *type);
-gboolean                        g_variant_type_is_basic                 (const GVariantType  *type);
-gboolean                        g_variant_type_is_maybe                 (const GVariantType  *type);
-gboolean                        g_variant_type_is_array                 (const GVariantType  *type);
-gboolean                        g_variant_type_is_tuple                 (const GVariantType  *type);
-gboolean                        g_variant_type_is_dict_entry            (const GVariantType  *type);
-gboolean                        g_variant_type_is_variant               (const GVariantType  *type);
-
-/* for hash tables */
-guint                           g_variant_type_hash                     (gconstpointer        type);
-gboolean                        g_variant_type_equal                    (gconstpointer        type1,
-                                                                         gconstpointer        type2);
-
-/* subtypes */
-gboolean                        g_variant_type_is_subtype_of            (const GVariantType  *type,
-                                                                         const GVariantType  *supertype);
-
-/* type iterator interface */
-const GVariantType *            g_variant_type_element                  (const GVariantType  *type);
-const GVariantType *            g_variant_type_first                    (const GVariantType  *type);
-const GVariantType *            g_variant_type_next                     (const GVariantType  *type);
-gsize                           g_variant_type_n_items                  (const GVariantType  *type);
-const GVariantType *            g_variant_type_key                      (const GVariantType  *type);
-const GVariantType *            g_variant_type_value                    (const GVariantType  *type);
-
-/* constructors */
-GVariantType *                  g_variant_type_new_array                (const GVariantType  *element);
-GVariantType *                  g_variant_type_new_maybe                (const GVariantType  *element);
-GVariantType *                  g_variant_type_new_tuple                (const GVariantType * const *items,
-                                                                         gint                 length);
-GVariantType *                  g_variant_type_new_dict_entry           (const GVariantType  *key,
-                                                                         const GVariantType  *value);
-
-/*< private >*/
-const GVariantType *            g_variant_type_checked_                 (const gchar *);
-
-G_END_DECLS
-
-#endif /* __G_VARIANT_TYPE_H__ */
diff --git a/protocols/Sametime/src/glib/include/glib/gwin32.h b/protocols/Sametime/src/glib/include/glib/gwin32.h
deleted file mode 100644
index 5793335478..0000000000
--- a/protocols/Sametime/src/glib/include/glib/gwin32.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_WIN32_H__
-#define __G_WIN32_H__
-
-#include <glib/gtypes.h>
-
-#ifdef G_PLATFORM_WIN32
-
-G_BEGIN_DECLS
-
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
-
-#ifdef G_OS_WIN32
-
-/*
- * To get prototypes for the following POSIXish functions, you have to
- * include the indicated non-POSIX headers. The functions are defined
- * in OLDNAMES.LIB (MSVC) or -lmoldname-msvc (mingw32). But note that
- * for POSIX functions that take or return file names in the system
- * codepage, in many cases you would want to use the GLib wrappers in
- * gstdio.h and UTF-8 instead.
- *
- * getcwd: <direct.h> (MSVC), <io.h> (mingw32)
- * getpid: <process.h>
- * access: <io.h>
- * unlink: <stdio.h> or <io.h>
- * open, read, write, lseek, close: <io.h>
- * rmdir: <io.h>
- * pipe: <io.h> (actually, _pipe())
- */
-
-/* For some POSIX functions that are not provided by the MS runtime,
- * we provide emulation functions in glib, which are prefixed with
- * g_win32_. Or that was the idea at some time, but there is just one
- * of those:
- */
-gint		g_win32_ftruncate	(gint		 f,
-					 guint		 size);
-#endif /* G_OS_WIN32 */
-
-/* The MS setlocale uses locale names of the form "English_United
- * States.1252" etc. We want the Unixish standard form "en", "zh_TW"
- * etc. This function gets the current thread locale from Windows and
- * returns it as a string of the above form for use in forming file
- * names etc. The returned string should be deallocated with g_free().
- */
-gchar* 		g_win32_getlocale  (void);
-
-/* Translate a Win32 error code (as returned by GetLastError()) into
- * the corresponding message. The returned string should be deallocated
- * with g_free().
- */
-gchar*          g_win32_error_message (gint error);
-
-#ifndef G_DISABLE_DEPRECATED
-
-#define g_win32_get_package_installation_directory g_win32_get_package_installation_directory_utf8
-#define g_win32_get_package_installation_subdirectory g_win32_get_package_installation_subdirectory_utf8
-
-gchar*          g_win32_get_package_installation_directory (const gchar *package,
-							    const gchar *dll_name);
-
-gchar*          g_win32_get_package_installation_subdirectory (const gchar *package,
-							       const gchar *dll_name,
-							       const gchar *subdir);
-
-#endif
-
-gchar*          g_win32_get_package_installation_directory_of_module (gpointer hmodule);
-
-guint		g_win32_get_windows_version (void);
-
-gchar*          g_win32_locale_filename_from_utf8 (const gchar *utf8filename);
-
-/* As of GLib 2.14 we only support NT-based Windows */
-#define G_WIN32_IS_NT_BASED() TRUE
-#define G_WIN32_HAVE_WIDECHAR_API() TRUE
-
-G_END_DECLS
-
-#endif	 /* G_PLATFORM_WIN32 */
-
-#endif /* __G_WIN32_H__ */
diff --git a/protocols/Sametime/src/glib/include/glibconfig.h b/protocols/Sametime/src/glib/include/glibconfig.h
deleted file mode 100644
index 2fa4af628f..0000000000
--- a/protocols/Sametime/src/glib/include/glibconfig.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/* glibconfig.h.win32.in. Originally merged from two versions of
- * glibconfig.h, generated by the GLib configure script, for gcc and
- * MSVC.
- */
-
-/* glibconfig.h
- *
- * This is a generated file.  Please modify 'glibconfig.h.win32.in'
- */
-
-#ifndef __G_LIBCONFIG_H__
-#define __G_LIBCONFIG_H__
-
-#include <glib/gmacros.h>
-
-#include <limits.h>
-#include <float.h>
-
-G_BEGIN_DECLS
-
-#define G_MINFLOAT	FLT_MIN
-#define G_MAXFLOAT	FLT_MAX
-#define G_MINDOUBLE	DBL_MIN
-#define G_MAXDOUBLE	DBL_MAX
-#define G_MINSHORT	SHRT_MIN
-#define G_MAXSHORT	SHRT_MAX
-#define G_MAXUSHORT	USHRT_MAX
-#define G_MININT	INT_MIN
-#define G_MAXINT	INT_MAX
-#define G_MAXUINT	UINT_MAX
-#define G_MINLONG	LONG_MIN
-#define G_MAXLONG	LONG_MAX
-#define G_MAXULONG	ULONG_MAX
-
-typedef signed char gint8;
-typedef unsigned char guint8;
-typedef signed short gint16;
-typedef unsigned short guint16;
-#define G_GINT16_MODIFIER "h"
-#define G_GINT16_FORMAT "hi"
-#define G_GUINT16_FORMAT "hu"
-typedef signed int gint32;
-typedef unsigned int guint32;
-#define G_GINT32_MODIFIER ""
-#define G_GINT32_FORMAT "i"
-#define G_GUINT32_FORMAT "u"
-#define G_HAVE_GINT64 1          /* deprecated, always true */
-
-#ifndef _MSC_VER
-G_GNUC_EXTENSION typedef signed long long gint64;
-G_GNUC_EXTENSION typedef unsigned long long guint64;
-#else /* _MSC_VER */
-typedef signed __int64 gint64;
-typedef unsigned __int64 guint64;
-#endif /* _MSC_VER */
-
-#ifndef _MSC_VER
-#define G_GINT64_CONSTANT(val)	(G_GNUC_EXTENSION (val##LL))
-#else /* _MSC_VER */
-#define G_GINT64_CONSTANT(val)	(val##i64)
-#endif /* _MSC_VER */
-#ifndef _MSC_VER
-#define G_GUINT64_CONSTANT(val)	(G_GNUC_EXTENSION (val##ULL))
-#else /* _MSC_VER */
-#define G_GUINT64_CONSTANT(val)	(val##Ui64)
-#endif /* _MSC_VER */
-#define G_GINT64_MODIFIER "I64"
-#define G_GINT64_FORMAT "I64i"
-#define G_GUINT64_FORMAT "I64u"
-
-#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64)
-
-#define GLIB_SIZEOF_VOID_P 8
-#define GLIB_SIZEOF_LONG   4
-#define GLIB_SIZEOF_SIZE_T 8
-
-typedef signed long long gssize;
-typedef unsigned long long gsize;
-#define G_GSIZE_MODIFIER "I64"
-#define G_GSSIZE_FORMAT "I64d"
-#define G_GSIZE_FORMAT "I64u"
-
-#define G_MAXSIZE	G_MAXUINT64
-#define G_MINSSIZE	G_MININT64
-#define G_MAXSSIZE	G_MAXINT64
-
-#else
-
-#define GLIB_SIZEOF_VOID_P 4
-#define GLIB_SIZEOF_LONG   4
-#define GLIB_SIZEOF_SIZE_T 4
-
-typedef signed int gssize;
-typedef unsigned int gsize;
-#define G_GSIZE_MODIFIER ""
-#define G_GSSIZE_FORMAT "i"
-#define G_GSIZE_FORMAT "u"
-
-#define G_MAXSIZE	G_MAXUINT
-#define G_MINSSIZE	G_MININT
-#define G_MAXSSIZE	G_MAXINT
-
-#endif
-
-typedef gint64 goffset;
-#define G_MINOFFSET	G_MININT64
-#define G_MAXOFFSET	G_MAXINT64
-
-#define G_GOFFSET_MODIFIER      G_GINT64_MODIFIER
-#define G_GOFFSET_FORMAT        G_GINT64_FORMAT
-#define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val)
-
-
-#ifndef _WIN64
-
-#define GPOINTER_TO_INT(p)	((gint)   (p))
-#define GPOINTER_TO_UINT(p)	((guint)  (p))
-
-#define GINT_TO_POINTER(i)	((gpointer)  (i))
-#define GUINT_TO_POINTER(u)	((gpointer)  (u))
-
-typedef signed int gintptr;
-typedef unsigned int guintptr;
-
-#define G_GINTPTR_MODIFIER      ""
-#define G_GINTPTR_FORMAT        "i"
-#define G_GUINTPTR_FORMAT       "u"
-
-#else
-
-#define GPOINTER_TO_INT(p)	((gint)  (gint64) (p))
-#define GPOINTER_TO_UINT(p)	((guint) (guint64) (p))
-
-#define GINT_TO_POINTER(i)	((gpointer) (gint64) (i))
-#define GUINT_TO_POINTER(u)	((gpointer) (guint64) (u))
-
-#ifndef _MSC_VER
-typedef signed long long gintptr;
-typedef unsigned long long guintptr;
-#else
-typedef signed __int64 gintptr;
-typedef unsigned __int64 guintptr;
-#endif
-
-#define G_GINTPTR_MODIFIER      "I64"
-#define G_GINTPTR_FORMAT        "I64i"
-#define G_GUINTPTR_FORMAT       "I64u"
-
-#endif
-
-#ifdef NeXT /* @#%@! NeXTStep */
-# define g_ATEXIT(proc)	(!atexit (proc))
-#else
-# define g_ATEXIT(proc)	(atexit (proc))
-#endif
-
-#define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END
-
-#define GLIB_MAJOR_VERSION 2
-#define GLIB_MINOR_VERSION 26
-#define GLIB_MICRO_VERSION 1
-
-#define G_OS_WIN32
-#define G_PLATFORM_WIN32
-
-
-#ifndef _MSC_VER
-#define G_VA_COPY	va_copy
-#endif /* not _MSC_VER */
-
-#ifdef	__cplusplus
-#define	G_HAVE_INLINE	1
-#else	/* !__cplusplus */
-#ifndef _MSC_VER
-#define G_HAVE_INLINE 1
-#endif /* _MSC_VER */
-#define G_HAVE___INLINE 1
-#if !defined(_MSC_VER) && !defined(__DMC__)
-#define G_HAVE___INLINE__ 1
-#endif /* !_MSC_VER and !__DMC__ */
-#endif	/* !__cplusplus */
-
-#define G_CAN_INLINE	1
-
-#ifndef _MSC_VER
-#define G_HAVE_ISO_VARARGS 1
-
-/* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
- * is passed ISO vararg support is turned off, and there is no work
- * around to turn it on, so we unconditionally turn it off.
- */
-#if __GNUC__ == 2 && __GNUC_MINOR__ == 95
-#  undef G_HAVE_ISO_VARARGS
-#endif
-
-#define G_HAVE_GNUC_VARARGS 1
-#else /* _MSC_VER */
-/* varargs macros available since msvc8 (vs2005) */
-#  if _MSC_VER >= 1400
-#    define G_HAVE_ISO_VARARGS 1
-#   endif
-#endif /* not _MSC_VER */
-#define G_HAVE_GROWING_STACK 0
-
-#define G_GNUC_INTERNAL
-
-#define G_THREADS_ENABLED
-#define G_THREADS_IMPL_WIN32
-typedef struct _GMutex* GStaticMutex;
-#define G_STATIC_MUTEX_INIT NULL
-#define g_static_mutex_get_mutex(mutex) \
-  (g_static_mutex_get_mutex_impl_shortcut (mutex))
-/* This represents a system thread as used by the implementation. An
- * alien implementaion, as loaded by g_thread_init can only count on
- * "sizeof (gpointer)" bytes to store their info. We however need more
- * for some of our native implementations. */
-typedef union _GSystemThread GSystemThread;
-union _GSystemThread
-{
-#ifndef _WIN64
-  char   data[4];
-#else
-  char   data[8];
-#endif
-  double dummy_double;
-  void  *dummy_pointer;
-  long   dummy_long;
-};
-
-#define GINT16_TO_LE(val)	((gint16) (val))
-#define GUINT16_TO_LE(val)	((guint16) (val))
-#define GINT16_TO_BE(val)	((gint16) GUINT16_SWAP_LE_BE (val))
-#define GUINT16_TO_BE(val)	(GUINT16_SWAP_LE_BE (val))
-#define GINT32_TO_LE(val)	((gint32) (val))
-#define GUINT32_TO_LE(val)	((guint32) (val))
-#define GINT32_TO_BE(val)	((gint32) GUINT32_SWAP_LE_BE (val))
-#define GUINT32_TO_BE(val)	(GUINT32_SWAP_LE_BE (val))
-#define GINT64_TO_LE(val)	((gint64) (val))
-#define GUINT64_TO_LE(val)	((guint64) (val))
-#define GINT64_TO_BE(val)	((gint64) GUINT64_SWAP_LE_BE (val))
-#define GUINT64_TO_BE(val)	(GUINT64_SWAP_LE_BE (val))
-#define GLONG_TO_LE(val)	((glong) GINT32_TO_LE (val))
-#define GULONG_TO_LE(val)	((gulong) GUINT32_TO_LE (val))
-#define GLONG_TO_BE(val)	((glong) GINT32_TO_BE (val))
-#define GULONG_TO_BE(val)	((gulong) GUINT32_TO_BE (val))
-#define GINT_TO_LE(val)		((gint) GINT32_TO_LE (val))
-#define GUINT_TO_LE(val)	((guint) GUINT32_TO_LE (val))
-#define GINT_TO_BE(val)		((gint) GINT32_TO_BE (val))
-#define GUINT_TO_BE(val)	((guint) GUINT32_TO_BE (val))
-#define GSIZE_TO_LE(val)	((gsize) GUINT32_TO_LE (val))
-#define GSSIZE_TO_LE(val)	((gssize) GINT32_TO_LE (val))
-#define GSIZE_TO_BE(val)	((gsize) GUINT32_TO_BE (val))
-#define GSSIZE_TO_BE(val)	((gssize) GINT32_TO_BE (val))
-#define G_BYTE_ORDER G_LITTLE_ENDIAN
-
-#define GLIB_SYSDEF_POLLIN =1
-#define GLIB_SYSDEF_POLLOUT =4
-#define GLIB_SYSDEF_POLLPRI =2
-#define GLIB_SYSDEF_POLLHUP =16
-#define GLIB_SYSDEF_POLLERR =8
-#define GLIB_SYSDEF_POLLNVAL =32
-
-#define G_MODULE_SUFFIX "dll"
-
-/* A GPid is an abstraction for a process "handle". It is *not* an
- * abstraction for a process identifier in general. GPid is used in
- * GLib only for descendant processes spawned with the g_spawn*
- * functions. On POSIX there is no "process handle" concept as such,
- * but on Windows a GPid is a handle to a process, a kind of pointer,
- * not a process identifier.
- */
-typedef void * GPid;
-
-#define GLIB_SYSDEF_AF_UNIX 1
-#define GLIB_SYSDEF_AF_INET 2
-#define GLIB_SYSDEF_AF_INET6 23
-
-#define GLIB_SYSDEF_MSG_OOB       1
-#define GLIB_SYSDEF_MSG_PEEK      2
-#define GLIB_SYSDEF_MSG_DONTROUTE 4
-
-G_END_DECLS
-
-#endif /* GLIBCONFIG_H */