* */
#include "config.h"
+#include "empathy-import-pidgin.h"
#include <glib/gstdio.h>
#include <dbus/dbus-protocol.h>
+#include <tp-account-widgets/tpaw-utils.h>
#include "empathy-import-utils.h"
-#include "empathy-import-pidgin.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-debug.h"
/* Pidgin to CM map */
typedef struct
* http://bugzilla.gnome.org/show_bug.cgi?id=579992 */
if (!tp_strdiff (data->protocol, "jabber"))
{
- if (EMP_STR_EMPTY (tp_asv_get_string (data->settings, "server")))
+ if (TPAW_STR_EMPTY (tp_asv_get_string (data->settings, "server")))
{
g_hash_table_remove (data->settings, "port");
g_hash_table_remove (data->settings, "server");