add an header bar to the main window

[empathy.git] / src / empathy-import-pidgin.c

diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c
index 4de9bce9673e9e4415c57d8c8f284d4a13608bb3..bd05753c01261b8868a0a027791b983d733a33f9 100644 (file)
--- a/src/empathy-import-pidgin.c
+++ b/src/empathy-import-pidgin.c
@@ -19,28 +19,18 @@
  * Authors: Jonny Lamb <jonny.lamb@collabora.co.uk>
  * */
 
-#include <config.h>
-
-#include <string.h>
-#include <unistd.h>
+#include "config.h"
+#include "empathy-import-pidgin.h"
 
-#include <glib.h>
 #include <glib/gstdio.h>
 #include <dbus/dbus-protocol.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/dbus.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 <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-debug.h"
 
 /* Pidgin to CM map */
 typedef struct
@@ -144,7 +134,7 @@ import_dialog_pidgin_parse_setting (EmpathyImportAccountData *data,
   else if (!tp_strdiff (type, "int"))
     {
       TpConnectionManager *cm = NULL;
-      const TpConnectionManagerProtocol *proto;
+      TpProtocol *proto;
       const TpConnectionManagerParam *param;
       const gchar *signature;
       int signature_i;
@@ -152,8 +142,8 @@ import_dialog_pidgin_parse_setting (EmpathyImportAccountData *data,
       if (!empathy_import_protocol_is_supported (data->protocol, &cm))
         return;
 
-      proto = tp_connection_manager_get_protocol (cm, data->protocol);
-      param = tp_connection_manager_protocol_get_param (proto, item->cm_name);
+      proto = tp_connection_manager_get_protocol_object (cm, data->protocol);
+      param = tp_protocol_get_param (proto, item->cm_name);
       signature = tp_connection_manager_param_get_dbus_signature (param);
       signature_i = (int) (*signature);
 
@@ -367,7 +357,7 @@ empathy_import_pidgin_load (void)
            * 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");