diff -r d0f3a028347a -r 59927b2d3b75 loudmouth/src/lm-utils.c
--- a/loudmouth/src/lm-utils.c	Tue Feb 02 01:10:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,231 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2003 Imendio AB 
- *
- * This program 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 program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-
-#include <glib.h>
-
-#ifndef G_OS_WIN32
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_IDN
-#include <stringprep.h>
-#include <punycode.h>
-#include <idna.h>
-#endif
-
-#include "lm-internals.h"
-#include "lm-utils.h"
-
-#ifdef EMULATOR
-#include "libloudmouth_wsd_solution.h"
-GET_STATIC_VAR_FROM_TLS(last_id, lm_utils, guint)
-  #define last_id (*GET_WSD_VAR_NAME(last_id, lm_utils, s)())
-  
-GET_STATIC_ARRAY_FROM_TLS(base64chars, lm_utils, gchar)
-  #define base64chars (GET_WSD_VAR_NAME(base64chars, lm_utils, s)())
-#endif
-
-
-LmCallback *
-_lm_utils_new_callback (gpointer func, 
-			gpointer user_data,
-			GDestroyNotify notify)
-{
-	LmCallback *cb;
-	
-	cb = g_new0 (LmCallback, 1);
-	cb->func = func;
-	cb->user_data = user_data;
-	cb->notify = notify;
-
-	return cb;
-}
-
-void
-_lm_utils_free_callback (LmCallback *cb)
-{
-	if (!cb) {
-		return;
-	}
-
-	if (cb->notify) {
-		(* cb->notify) (cb->user_data);
-	}
-	g_free (cb);
-}
-
-gchar *
-_lm_utils_generate_id (void)
-{
-#ifndef EMULATOR
-	static guint  last_id = 0;
-#endif
-	GTimeVal      tv;
-	glong         val;
-
-	g_get_current_time (&tv);
-	val = (tv.tv_sec & tv.tv_usec) + last_id++;
-		
-	return g_strdup_printf ("%ld%ld", val, tv.tv_usec);
-}
-
-gchar * 
-_lm_utils_base64_encode (const gchar *s)
-{
-#ifndef EMULATOR
-
-	static const gchar *base64chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-#endif
-	guint    i, j;
-	guint32  bits = 0;
-	guint    maxlen = (strlen(s) * 2) + 3;
-	gchar   *str;
-
-	str = g_malloc(maxlen);
-
-	j = 0;
-	for (i = 0; i < strlen(s); i++) {
-		bits <<= 8;
-		bits |= s[i] & 0xff;
-
-		if (!((i+1) % 3)) {
-			guint indices[4];
-
-			indices[0] = (bits >> 18) & 0x3f;
-			indices[1] = (bits >> 12) & 0x3f;
-			indices[2] = (bits >> 6) & 0x3f;
-			indices[3] = bits & 0x3f;
-			bits = 0;
-
-			str[j++] = base64chars[(indices[0])];
-			str[j++] = base64chars[(indices[1])];
-			str[j++] = base64chars[(indices[2])];
-			str[j++] = base64chars[(indices[3])];
-		}
-	}
-
-	if (j + 4 < maxlen) {
-		if ((i % 3) == 1) {
-			guint indices[2];
-
-			indices[0] = (bits >> 2) & 0x3f;
-			indices[1] = (bits << 4) & 0x3f;
-
-			str[j++] = base64chars[(indices[0])];
-			str[j++] = base64chars[(indices[1])];
-			str[j++] = '=';
-			str[j++] = '=';
-		} else if ((i % 3) == 2) {
-			guint indices[3];
-
-			indices[0] = (bits >> 10) & 0x3f;
-			indices[1] = (bits >> 4) & 0x3f;
-			indices[2] = (bits << 2) & 0x3f;
-
-			str[j++] = base64chars[(indices[0])];
-			str[j++] = base64chars[(indices[1])];
-			str[j++] = base64chars[(indices[2])];
-			str[j++] = '=';
-		}
-	}
-
-	str[j] = '\0';
-
-	return str;
-}
-
-gchar*
-_lm_utils_hostname_to_punycode (const gchar *hostname)
-{
-#ifdef HAVE_IDN
-	char *s;
-	uint32_t *q;
-	int rc;
-	gchar *result;
-
-	q = stringprep_utf8_to_ucs4 (hostname, -1, NULL);
-	if (q == NULL) {
-		return g_strdup (hostname);
-	}
-
-	rc = idna_to_ascii_4z (q, &s, IDNA_ALLOW_UNASSIGNED);
-	free(q);
-	if (rc != IDNA_SUCCESS) {
-		return g_strdup (hostname);
-	}
-
-	/* insures result is allocated through glib */
-	result = g_strdup(s);
-	free(s);
-
-	return result;
-#else
-	return g_strdup(hostname);
-#endif
-}
-
-/**
- * lm_utils_get_localtime:
- * @stamp: An XMPP timestamp
- *
- * Converts an XMPP timestamp to a struct tm showing local time.
- * 
- * Return value: The local time struct.
- **/
-EXPORT_C struct tm *
-lm_utils_get_localtime (const gchar *stamp)
-{
-	struct tm tm;
-	time_t    t;
-	gint      year, month;
-	
-	g_return_val_if_fail (stamp != NULL, NULL);
-
-	/* 20021209T23:51:30 */
-
-	sscanf (stamp, "%4d%2d%2dT%2d:%2d:%2d", 
-		&year, &month, &tm.tm_mday, &tm.tm_hour,
-		&tm.tm_min, &tm.tm_sec);
-
-	tm.tm_year = year - 1900;
-	tm.tm_mon = month - 1;
-	tm.tm_isdst = -1;
-
- 	t = mktime (&tm);
-
-#if defined(HAVE_TM_GMTOFF)
-	t += tm.tm_gmtoff;
-#elif defined(HAVE_TIMEZONE)
-	t -= timezone;
-	if (tm.tm_isdst > 0) {
-		t += 3600;
-	}
-#endif	
-
-	return localtime (&t);
-}
-
-