telepathygabble/src/gabble-connection-manager.c
changeset 10 59927b2d3b75
parent 0 d0f3a028347a
--- a/telepathygabble/src/gabble-connection-manager.c	Tue Feb 02 01:10:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,705 +0,0 @@
-/*
- * gabble-connection-manager.c - Source for GabbleConnectionManager
- * Copyright (C) 2005 Collabora Ltd.
- *  and/or its subsidiary/subsidiaries. All rights reserved.
- *
- * 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
- */
-
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-protocol.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "gabble-connection.h"
-#include "telepathy-constants.h"
-#include "telepathy-errors.h"
-#include "telepathy-helpers.h"
-
-#include "gabble-connection-manager.h"
-#include "gabble-connection-manager-glue.h"
-#include "gabble-connection-manager-signals-marshal.h"
-
-#include "gabble_enums.h"
-
-#define TP_TYPE_PARAM (dbus_g_type_get_struct ("GValueArray", \
-      G_TYPE_STRING, \
-      G_TYPE_UINT, \
-      G_TYPE_STRING, \
-      G_TYPE_VALUE, \
-      G_TYPE_INVALID))
-
-#ifndef EMULATOR
-G_DEFINE_TYPE(GabbleConnectionManager, gabble_connection_manager, G_TYPE_OBJECT)
-#endif
-
-
-/* signal enum */
-enum
-{
-    NEW_CONNECTION,
-    NO_MORE_CONNECTIONS,
-    LAST_SIGNAL 
-#ifdef EMULATOR    
-    = LAST_SIGNAL_CON_MGR
-#endif
-    
-};
-
-
-#ifdef EMULATOR
-#include "libgabble_wsd_solution.h"
-
-	GET_STATIC_ARRAY_FROM_TLS(signals,gabble_conmgr,guint)
-	#define signals (GET_WSD_VAR_NAME(signals,gabble_conmgr, s)())
-	
-	GET_STATIC_VAR_FROM_TLS(ssl,gabble_conmgr,gboolean)
-	#define ssl (*GET_WSD_VAR_NAME(ssl,gabble_conmgr,s)())
-	
-	GET_STATIC_VAR_FROM_TLS(httpport,gabble_conmgr,guint)
-	#define httpport (*GET_WSD_VAR_NAME(httpport,gabble_conmgr,s)())
-	
-	GET_STATIC_VAR_FROM_TLS(httpproxyport,gabble_conmgr,guint)
-	#define httpproxyport (*GET_WSD_VAR_NAME(httpproxyport,gabble_conmgr,s)())
-	
-	GET_STATIC_VAR_FROM_TLS(gabble_connection_manager_parent_class,gabble_conmgr,gpointer)
-	#define gabble_connection_manager_parent_class (*GET_WSD_VAR_NAME(gabble_connection_manager_parent_class,gabble_conmgr,s)())
-	
-	GET_STATIC_VAR_FROM_TLS(g_define_type_id,gabble_conmgr,GType)
-	#define g_define_type_id (*GET_WSD_VAR_NAME(g_define_type_id,gabble_conmgr,s)())
-	
-	
-static void gabble_connection_manager_init (GabbleConnectionManager *self); 
-static void gabble_connection_manager_class_init (GabbleConnectionManagerClass *klass); 
-static void gabble_connection_manager_class_intern_init (gpointer klass) 
-{ 
-gabble_connection_manager_parent_class = g_type_class_peek_parent (klass); 
-gabble_connection_manager_class_init ((GabbleConnectionManagerClass*) klass); 
-} 
-EXPORT_C GType gabble_connection_manager_get_type (void) 
-{ 
-
-if ((g_define_type_id == 0)) 
-{ 
-static const GTypeInfo g_define_type_info = 
-	{ sizeof (GabbleConnectionManagerClass), (GBaseInitFunc) ((void *)0), (GBaseFinalizeFunc) ((void *)0), (GClassInitFunc) gabble_connection_manager_class_intern_init, (GClassFinalizeFunc) ((void *)0), ((void *)0), sizeof (GabbleConnectionManager), 0, (GInstanceInitFunc) gabble_connection_manager_init, ((void *)0) }; g_define_type_id = g_type_register_static ( ((GType) ((20) << (2))), g_intern_static_string ("GabbleConnectionManager"), &g_define_type_info, (GTypeFlags) 0); { {} ; } } return g_define_type_id; 
-	} ;
-
-
-#else
-
-static guint signals[LAST_SIGNAL] = {0};
-
-static gboolean ssl = TRUE;
-static guint httpport = 8080;
-static guint httpproxyport = 443;
-
-#endif
-
-/* private structure */
-typedef struct _GabbleConnectionManagerPrivate GabbleConnectionManagerPrivate;
-
-struct _GabbleConnectionManagerPrivate
-{
-  gboolean dispose_has_run;
-  GHashTable *connections;
-};
-
-#define GABBLE_CONNECTION_MANAGER_GET_PRIVATE(obj) \
-    ((GabbleConnectionManagerPrivate *)obj->priv)
-
-/* type definition stuff */
-
-static void
-gabble_connection_manager_init (GabbleConnectionManager *self)
-{
-  GabbleConnectionManagerPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      GABBLE_TYPE_CONNECTION_MANAGER, GabbleConnectionManagerPrivate);
-
-  self->priv = priv;
-
-  priv->connections = g_hash_table_new (g_direct_hash, g_direct_equal);
-}
-
-static void gabble_connection_manager_dispose (GObject *object);
-static void gabble_connection_manager_finalize (GObject *object);
-
-static void
-gabble_connection_manager_class_init (GabbleConnectionManagerClass *gabble_connection_manager_class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (gabble_connection_manager_class);
-
-  g_type_class_add_private (gabble_connection_manager_class, sizeof (GabbleConnectionManagerPrivate));
-
-  g_message("**NEW LOGS** inside gabble_connection_manager_class_init \n");
-
-  object_class->dispose = gabble_connection_manager_dispose;
-  object_class->finalize = gabble_connection_manager_finalize;
-
-  signals [NEW_CONNECTION] =
-    g_signal_new ("new-connection",
-                  G_OBJECT_CLASS_TYPE (gabble_connection_manager_class),
-                  G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
-                  0,
-                  NULL, NULL,
-                  gabble_connection_manager_marshal_VOID__STRING_STRING_STRING,
-                  G_TYPE_NONE, 3, G_TYPE_STRING, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING);
-
-  signals [NO_MORE_CONNECTIONS] =
-    g_signal_new ("no-more-connections",
-                  G_OBJECT_CLASS_TYPE (gabble_connection_manager_class),
-                  G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
-                  0,
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
-
-  dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (gabble_connection_manager_class), &dbus_glib_gabble_connection_manager_object_info);
-}
-
-void
-gabble_connection_manager_dispose (GObject *object)
-{
-  GabbleConnectionManager *self = GABBLE_CONNECTION_MANAGER (object);
-  GabbleConnectionManagerPrivate *priv = GABBLE_CONNECTION_MANAGER_GET_PRIVATE (self);
-
-  if (priv->dispose_has_run)
-    return;
-
-  priv->dispose_has_run = TRUE;
-
-  /* release any references held by the object here */
-
-  if (G_OBJECT_CLASS (gabble_connection_manager_parent_class)->dispose)
-    G_OBJECT_CLASS (gabble_connection_manager_parent_class)->dispose (object);
-}
-
-void
-gabble_connection_manager_finalize (GObject *object)
-{
-  GabbleConnectionManager *self = GABBLE_CONNECTION_MANAGER (object);
-  GabbleConnectionManagerPrivate *priv = GABBLE_CONNECTION_MANAGER_GET_PRIVATE (self);
-
-  g_hash_table_destroy(priv->connections);
-
-  G_OBJECT_CLASS (gabble_connection_manager_parent_class)->finalize (object);
-}
-
-
-enum {
-    JABBER_PARAM_ACCOUNT = 0,
-    JABBER_PARAM_PASSWORD,
-    JABBER_PARAM_SERVER,
-    JABBER_PARAM_RESOURCE,
-    JABBER_PARAM_PRIORITY,
-    JABBER_PARAM_PORT,
-    JABBER_PARAM_OLD_SSL,
-    JABBER_PARAM_REGISTER,
-    JABBER_PARAM_LOW_BANDWIDTH,
-    JABBER_PARAM_HTTPS_PROXY_SERVER,
-    JABBER_PARAM_HTTPS_PROXY_PORT,
-    JABBER_PARAM_FALLBACK_CONFERENCE_SERVER,
-    JABBER_PARAM_STUN_SERVER,
-    JABBER_PARAM_STUN_PORT,
-    JABBER_PARAM_IGNORE_SSL_ERRORS,
-    JABBER_PARAM_ALIAS,
-    LAST_JABBER_PARAM
-};
-/* private methods */
-
-static gboolean
-get_parameters (const char *proto, const GabbleParamSpec **params, GError **error)
-{
-  if (!strcmp (proto, "jabber"))
-    {
-      *params = jabber_params;
-    }
-  else
-    {
-      g_debug ("%s: unknown protocol %s", G_STRFUNC, proto);
-
-      g_set_error (error, TELEPATHY_ERRORS, NotImplemented,
-          "unknown protocol %s", proto);
-
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-static GValue *param_default_value (const GabbleParamSpec *params, int i)
-{
-  GValue *value;
-
-  value = g_new0(GValue, 1);
-  g_value_init(value, params[i].gtype);
-
-  /* TODO: this check could be stricter if we knew whether register
-  was true. In practice REQUIRED and REGISTER always go together in
-  the Gabble params, though */
-  if (params[i].flags & TP_CONN_MGR_PARAM_FLAG_REQUIRED & TP_CONN_MGR_PARAM_FLAG_REGISTER)
-    {
-      g_assert(params[i].def == NULL);
-      goto OUT;
-    }
-
-  switch (params[i].dtype[0])
-    {
-      case DBUS_TYPE_STRING:
-        g_value_set_static_string (value, (const gchar*) params[i].def);
-        break;
-      case DBUS_TYPE_INT16:
-        g_value_set_int (value, GPOINTER_TO_INT (params[i].def));
-        break;
-      case DBUS_TYPE_UINT16:
-        g_value_set_uint (value, GPOINTER_TO_INT (params[i].def));
-        break;
-      case DBUS_TYPE_BOOLEAN:
-        g_value_set_boolean (value, GPOINTER_TO_INT (params[i].def));
-        break;
-      default:
-        g_error("parameter_defaults: encountered unknown type %s on argument %s",
-                params[i].dtype, params[i].name);
-    }
-
-OUT:
-  return value;
-}
-
-static gboolean
-set_param_from_value (const GabbleParamSpec *paramspec,
-                                     GValue *value,
-                               GabbleParams *params,
-                                    GError **error)
-{
-  if (G_VALUE_TYPE (value) != paramspec->gtype)
-    {
-      g_debug ("%s: expected type %s for parameter %s, got %s",
-               G_STRFUNC,
-               g_type_name (paramspec->gtype), paramspec->name,
-               G_VALUE_TYPE_NAME (value));
-      g_set_error (error, TELEPATHY_ERRORS, InvalidArgument,
-          "expected type %s for account parameter %s, got %s",
-          g_type_name (paramspec->gtype), paramspec->name,
-          G_VALUE_TYPE_NAME (value));
-      return FALSE;
-    }
-
-  switch (paramspec->dtype[0])
-    {
-      case DBUS_TYPE_STRING:
-        {
-          const char *str = g_value_get_string (value);
-          if (!str || *str == '\0')
-            return FALSE;
-          else
-            *((char **) ((char *)params + paramspec->offset)) = g_value_dup_string (value);
-        }
-        break;
-      case DBUS_TYPE_INT16:
-        *((gint *) ((char *)params + paramspec->offset)) = g_value_get_int (value);
-        break;
-      case DBUS_TYPE_UINT16:
-        *((guint *) ((char *)params + paramspec->offset)) = g_value_get_uint (value);
-        break;
-      case DBUS_TYPE_BOOLEAN:
-        *((gboolean *) ((char *)params + paramspec->offset)) = g_value_get_boolean (value);
-        break;
-      default:
-        g_error ("set_param_from_value: encountered unknown type %s on argument %s",
-                 paramspec->dtype, paramspec->name);
-        return FALSE;
-    }
-
-  return TRUE;
-}
-
-static gboolean
-parse_parameters (const GabbleParamSpec *paramspec,
-                  GHashTable            *provided,
-                  GabbleParams          *params,
-                  GError               **error)
-{
-  int unhandled;
-  int i;
-  guint mandatory_flag = TP_CONN_MGR_PARAM_FLAG_REQUIRED;
-  GValue *value;
-
-  unhandled = g_hash_table_size (provided);
-
-  value = g_hash_table_lookup (provided, "register");
-  if (value != NULL && G_VALUE_TYPE(value) == G_TYPE_BOOLEAN &&
-      g_value_get_boolean(value))
-    {
-      mandatory_flag = TP_CONN_MGR_PARAM_FLAG_REGISTER;
-    }
-
-  for (i = 0; paramspec[i].name; i++)
-    {
-      value = g_hash_table_lookup (provided, paramspec[i].name);
-
-      if (value == NULL)
-        {
-          if (paramspec[i].flags & mandatory_flag)
-            {
-              g_debug ("%s: missing mandatory param %s",
-                       G_STRFUNC, paramspec[i].name);
-              g_set_error (error, TELEPATHY_ERRORS, InvalidArgument,
-                  "missing mandatory account parameter %s", paramspec[i].name);
-              return FALSE;
-            }
-          else
-            {
-              g_debug ("%s: using default value for param %s",
-                       G_STRFUNC, paramspec[i].name);
-            }
-        }
-      else
-        {
-          if (!set_param_from_value (&paramspec[i], value, params, error))
-            {
-              g_set_error (error, TELEPATHY_ERRORS, InvalidArgument,
-                  "invalid value for parameter %s", paramspec[i].name);
-              return FALSE;
-            }
-
-          params->set_mask |= 1 << i;
-
-          unhandled--;
-          if (paramspec[i].gtype == G_TYPE_STRING)
-            {
-              if (0 == strcmp (paramspec[i].name, "password"))
-                {
-                  g_debug ("%s: accepted value <hidden> for param password",
-                      G_STRFUNC);
-                }
-              else
-                {
-                  g_debug ("%s: accepted value %s for param %s",
-                      G_STRFUNC,
-                      *((char **) ((char *)params + paramspec[i].offset)),
-                      paramspec[i].name);
-                }
-            }
-          else
-            {
-              g_debug ("%s: accepted value %u for param %s", G_STRFUNC,
-                       *((guint *) ((char *)params + paramspec[i].offset)), paramspec[i].name);
-            }
-        }
-    }
-
-  if (unhandled)
-    {
-      g_debug ("%s: unknown argument name provided", G_STRFUNC);
-      g_set_error (error, TELEPATHY_ERRORS, InvalidArgument,
-          "unknown argument name provided");
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-static void
-free_params (GabbleParams *params)
-{
-  g_free (params->account);
-  g_free (params->password);
-  g_free (params->server);
-  g_free (params->resource);
-  g_free (params->https_proxy_server);
-  g_free (params->fallback_conference_server);
-  g_free (params->stun_server);
-  g_free (params->alias);
-}
-
-/**
- * connection_disconnected_cb:
- * @conn: #GabbleConnection
- * @data: data passed in callback
- *
- * Signal handler called when a connection object disconnects.
- * When they become disconnected, we can unref and discard
- * them, and they will disappear from the bus.
- */
-static void
-connection_disconnected_cb (GabbleConnection        *conn,
-                            gpointer                 data)
-{
-  GabbleConnectionManager *self = GABBLE_CONNECTION_MANAGER (data);
-  GabbleConnectionManagerPrivate *priv = GABBLE_CONNECTION_MANAGER_GET_PRIVATE (self);
-
-  g_assert (g_hash_table_lookup (priv->connections, conn));
-  
-  /* fix: this check should only be done if priv->connections is not null, and conn is not null */
-  
-  if( (priv->connections) && (conn))
-      g_hash_table_remove (priv->connections, conn);
-
-  /* end of fix */
-  
-  g_object_unref (conn);
-
-  g_debug ("%s: dereferenced connection", G_STRFUNC);
-  if(priv->connections)
-    if (g_hash_table_size (priv->connections) == 0)
-    {
-      g_signal_emit (self, signals [NO_MORE_CONNECTIONS], 0);
-      g_debug ("%s: emitting no more connections", G_STRFUNC);
-    }
-
-
-}
-
-/* public methods */
-
-#ifdef SYMBIAN
-EXPORT_C
-#endif
-void
-_gabble_connection_manager_register (GabbleConnectionManager *self)
-{
-  DBusGConnection *bus;
-  DBusGProxy *bus_proxy;
-  GError *error = NULL;
-  guint request_name_result;
-
-  g_assert (GABBLE_IS_CONNECTION_MANAGER (self));
-
-  bus = tp_get_bus ();
-  bus_proxy = tp_get_bus_proxy ();
-
-  if (!dbus_g_proxy_call (bus_proxy, "RequestName", &error,
-                          G_TYPE_STRING, GABBLE_CONN_MGR_BUS_NAME,
-                          G_TYPE_UINT, DBUS_NAME_FLAG_DO_NOT_QUEUE,
-                          G_TYPE_INVALID,
-                          G_TYPE_UINT, &request_name_result,
-                          G_TYPE_INVALID))
-    g_error ("Failed to request bus name: %s", error->message);
-
-  if (request_name_result == DBUS_REQUEST_NAME_REPLY_EXISTS)
-    {
-      g_warning ("Failed to acquire bus name, connection manager already running?");
-      exit (1);
-    }
-
-  dbus_g_connection_register_g_object (bus, GABBLE_CONN_MGR_OBJECT_PATH, G_OBJECT (self));
-}
-
-/* dbus-exported methods */
-
-/**
- * gabble_connection_manager_get_parameters
- *
- * Implements D-Bus method GetParameters
- * on interface org.freedesktop.Telepathy.ConnectionManager
- *
- * @error: Used to return a pointer to a GError detailing any error
- *         that occurred, D-Bus will throw the error only if this
- *         function returns FALSE.
- *
- * Returns: TRUE if successful, FALSE if an error was thrown.
- */
-gboolean
-gabble_connection_manager_get_parameters (GabbleConnectionManager *self,
-                                          const gchar *proto,
-                                          GPtrArray **ret,
-                                          GError **error)
-{
-  const GabbleParamSpec *params = NULL;
-  int i;
-
-  if (!get_parameters (proto, &params, error))
-    return FALSE;
-
-  *ret = g_ptr_array_new ();
-
-  for (i = 0; params[i].name; i++)
-    {
-      GValue *def_value;
-      GValue param = { 0, };
-
-      g_value_init (&param, TP_TYPE_PARAM);
-      g_value_set_static_boxed (&param,
-        dbus_g_type_specialized_construct (TP_TYPE_PARAM));
-      
-      def_value = param_default_value (params, i);
-      dbus_g_type_struct_set (&param,
-        0, params[i].name,
-        1, params[i].flags,
-        2, params[i].dtype,
-        3, def_value,
-        G_MAXUINT);
-      g_value_unset(def_value);
-      g_free(def_value);
-
-      g_ptr_array_add (*ret, g_value_get_boxed (&param));
-    }
-
-  return TRUE;
-}
-
-
-/**
- * gabble_connection_manager_list_protocols
- *
- * Implements D-Bus method ListProtocols
- * on interface org.freedesktop.Telepathy.ConnectionManager
- *
- * @error: Used to return a pointer to a GError detailing any error
- *         that occurred, D-Bus will throw the error only if this
- *         function returns FALSE.
- *
- * Returns: TRUE if successful, FALSE if an error was thrown.
- */
-gboolean
-gabble_connection_manager_list_protocols (GabbleConnectionManager *self,
-                                          gchar ***ret,
-                                          GError **error)
-{
-  const char *protocols[] = { "jabber", NULL };
-  g_message("BINGO...gabble_connection_manager_list_protocols entered \n");
-
-  *ret = g_strdupv ((gchar **)protocols);
-
-  g_message("BINGO...leaving gabble_connection_manager_list_protocols \n");
-
-  return TRUE;
-}
-
-
-#define SET_PROPERTY_IF_PARAM_SET(prop, param, member) \
-  if ((params.set_mask & (1 << param)) != 0) \
-    { \
-      g_object_set (conn, prop, member, NULL); \
-    }
-
-
-/**
- * gabble_connection_manager_request_connection
- *
- * Implements D-Bus method RequestConnection
- * on interface org.freedesktop.Telepathy.ConnectionManager
- *
- * @error: Used to return a pointer to a GError detailing any error
- *         that occurred, D-Bus will throw the error only if this
- *         function returns FALSE.
- *
- * Returns: TRUE if successful, FALSE if an error was thrown.
- */
-gboolean
-gabble_connection_manager_request_connection (GabbleConnectionManager *self,
-                                              const gchar *proto,
-                                              GHashTable *parameters,
-                                              gchar **bus_name,
-                                              gchar **object_path,
-                                              GError **error)
-{
-  GabbleConnectionManagerPrivate *priv;
-  GabbleConnection *conn;
-  const GabbleParamSpec *paramspec;
-  GabbleParams params = { 0, };
-
-  g_assert (GABBLE_IS_CONNECTION_MANAGER (self));
-
-  priv = GABBLE_CONNECTION_MANAGER_GET_PRIVATE (self);
-
-  if (!get_parameters (proto, &paramspec, error))
-		return FALSE;
-  
-
-  if (!parse_parameters (paramspec, parameters, &params, error))
-    {
-      free_params (&params);
-      return FALSE;
-    }
-
-  conn = g_object_new (GABBLE_TYPE_CONNECTION,
-                       "protocol",           proto,
-                       "password",           params.password,
-                       NULL);
-  
-  g_message("BINGO...after g_object_new \n");
-
-  SET_PROPERTY_IF_PARAM_SET ("connect-server", JABBER_PARAM_SERVER,
-                             params.server);
-  SET_PROPERTY_IF_PARAM_SET ("resource", JABBER_PARAM_RESOURCE,
-                             params.resource);
-  SET_PROPERTY_IF_PARAM_SET ("priority", JABBER_PARAM_PRIORITY,
-                             CLAMP (params.priority, G_MININT8, G_MAXINT8));
-  SET_PROPERTY_IF_PARAM_SET ("port", JABBER_PARAM_PORT, params.port);
-  SET_PROPERTY_IF_PARAM_SET ("old-ssl", JABBER_PARAM_OLD_SSL, params.old_ssl);
-  SET_PROPERTY_IF_PARAM_SET ("register", JABBER_PARAM_REGISTER,
-                             params.do_register);
-  SET_PROPERTY_IF_PARAM_SET ("low-bandwidth", JABBER_PARAM_LOW_BANDWIDTH,
-                             params.low_bandwidth);
-  SET_PROPERTY_IF_PARAM_SET ("https-proxy-server",
-                             JABBER_PARAM_HTTPS_PROXY_SERVER,
-                             params.https_proxy_server);
-  SET_PROPERTY_IF_PARAM_SET ("https-proxy-port", JABBER_PARAM_HTTPS_PROXY_PORT,
-                             params.https_proxy_port);
-  SET_PROPERTY_IF_PARAM_SET ("fallback-conference-server",
-                             JABBER_PARAM_FALLBACK_CONFERENCE_SERVER,
-                             params.fallback_conference_server);
-  SET_PROPERTY_IF_PARAM_SET ("stun-server", JABBER_PARAM_STUN_SERVER,
-                             params.stun_server);
-  SET_PROPERTY_IF_PARAM_SET ("stun-port", JABBER_PARAM_STUN_PORT,
-                             params.stun_port);
-  SET_PROPERTY_IF_PARAM_SET ("ignore-ssl-errors",
-                              JABBER_PARAM_IGNORE_SSL_ERRORS,
-                              params.ignore_ssl_errors);
-  SET_PROPERTY_IF_PARAM_SET ("alias", JABBER_PARAM_ALIAS, params.alias);
-
-  // split up account into username, stream-server and resource
-  if (!_gabble_connection_set_properties_from_account (conn, params.account, error))
-    {
-      goto ERROR;
-    }
-
-  // free memory allocated by param parser
-  free_params(&params);
-
-// with hash table usage - end
-
-
-  // register on bus and save bus name and object path
-  if (!_gabble_connection_register (conn, bus_name, object_path, error))
-    {
-      g_debug ("%s failed: %s", G_STRFUNC, (*error)->message);
-
-      goto ERROR;
-    }
-  
-  /* bind to status change signals from the connection object */
-  g_signal_connect (conn, "disconnected",
-                             G_CALLBACK (connection_disconnected_cb),
-                             self);
-  
-  /* store the connection, using a hash table as a set */
-  g_hash_table_insert (priv->connections, conn, GINT_TO_POINTER(TRUE));
-
-  /* emit the new connection signal */
-  g_signal_emit (self, signals [NEW_CONNECTION], 0, *bus_name, *object_path, proto);
-
-  return TRUE;
-
-ERROR:
-  if (conn)
-    g_object_unref (G_OBJECT (conn));
-
-  g_message("ERROR...returning FALSE\n");
-  return FALSE;
-}