* Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
*/
-#include <telepathy-glib/util.h>
-
-#include <libempathy/empathy-connection-managers.h>
-#include <libempathy/empathy-utils.h>
-
+#include "config.h"
#include "empathy-import-utils.h"
+
+#include "empathy-connection-managers.h"
#include "empathy-import-pidgin.h"
+#include "empathy-utils.h"
EmpathyImportAccountData *
empathy_import_account_data_new (const gchar *source)
if (data->connection_manager != NULL)
g_free (data->connection_manager);
if (data->settings != NULL)
- g_hash_table_destroy (data->settings);
+ g_hash_table_unref (data->settings);
if (data->source != NULL)
g_free (data->source);
(const gchar*) protocol))
{
if (!tp_strdiff (protocol, "irc")
- && !tp_strdiff (tp_cm->name, "haze"))
+ && !tp_strdiff (tp_connection_manager_get_name (tp_cm), "haze"))
continue;
if (!proto_is_supported)
/* we have more than one CM for this protocol,
* select the one which is not haze.
*/
- if (!tp_strdiff ((*cm)->name, "haze"))
+ if (!tp_strdiff (tp_connection_manager_get_name ((*cm)), "haze"))
{
*cm = tp_cm;
break;