Merge branch 'sasl'

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

diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c
index ccf0dac7aadeb38ae412a0188670f659d9ca7bb4..4de9bce9673e9e4415c57d8c8f284d4a13608bb3 100644 (file)
--- a/src/empathy-import-pidgin.c
+++ b/src/empathy-import-pidgin.c
@@ -45,9 +45,9 @@
 /* Pidgin to CM map */
 typedef struct
 {
-  gchar *protocol;
-  gchar *pidgin_name;
-  gchar *cm_name;
+  const gchar *protocol;
+  const gchar *pidgin_name;
+  const gchar *cm_name;
 } PidginCmMapItem;
 
 static PidginCmMapItem pidgin_cm_map[] =
@@ -93,6 +93,8 @@ static PidginCmMapItem pidgin_cm_map[] =
 #define PIDGIN_ACCOUNT_TAG_PROTOCOL "protocol"
 #define PIDGIN_ACCOUNT_TAG_PASSWORD "password"
 #define PIDGIN_ACCOUNT_TAG_SETTINGS "settings"
+#define PIDGIN_SETTING_PROP_UI "ui"
+#define PIDGIN_SETTING_PROP_NAME "name"
 #define PIDGIN_SETTING_PROP_TYPE "type"
 #define PIDGIN_PROTOCOL_BONJOUR "bonjour"
 #define PIDGIN_PROTOCOL_NOVELL "novell"
@@ -105,11 +107,12 @@ import_dialog_pidgin_parse_setting (EmpathyImportAccountData *data,
   gchar *tag_name;
   gchar *type = NULL;
   gchar *content;
-  gint i;
+  guint i;
   GValue *value = NULL;
 
   /* We can't do anything if the setting don't have a name */
-  tag_name = (gchar *) xmlGetProp (setting, PIDGIN_ACCOUNT_TAG_NAME);
+  tag_name = (gchar *) xmlGetProp (setting,
+      (xmlChar *) PIDGIN_SETTING_PROP_NAME);
   if (!tag_name)
     return;
 
@@ -129,7 +132,7 @@ import_dialog_pidgin_parse_setting (EmpathyImportAccountData *data,
   if (!item)
     return;
 
-  type = (gchar *) xmlGetProp (setting, PIDGIN_SETTING_PROP_TYPE);
+  type = (gchar *) xmlGetProp (setting, (xmlChar *) PIDGIN_SETTING_PROP_TYPE);
   content = (gchar *) xmlNodeGetContent (setting);
 
   if (!tp_strdiff (type, "bool"))
@@ -176,16 +179,60 @@ import_dialog_pidgin_parse_setting (EmpathyImportAccountData *data,
     }
 
   if (value)
-    g_hash_table_insert (data->settings, item->cm_name, value);
+    g_hash_table_insert (data->settings, (gpointer) item->cm_name, value);
 
   g_free (type);
   g_free (content);
 }
 
+static void
+import_dialog_pidgin_handle_settings (EmpathyImportAccountData *data,
+                                      xmlNodePtr settings)
+{
+  xmlNodePtr setting;
+  gchar *tag_ui, *name, *type, *content;
+
+  tag_ui = (gchar *) xmlGetProp (settings, (xmlChar *) PIDGIN_SETTING_PROP_UI);
+
+  /* UI settings - fetch the Enabled parameter.
+   * The expected value of the ui property is 'gtk-gaim', which looks obsolete,
+   * but still valid for 2.7.3.
+   */
+  if (tag_ui && !tp_strdiff (tag_ui, "gtk-gaim"))
+    {
+      for (setting = settings->children; setting; setting = setting->next)
+        {
+          name = (gchar *) xmlGetProp (setting,
+              (xmlChar *) PIDGIN_SETTING_PROP_NAME);
+          type = (gchar *) xmlGetProp (setting,
+              (xmlChar *) PIDGIN_SETTING_PROP_TYPE);
+          /* The Enabled parameter is supposed to be boolean.
+           * Pidgin name of the setting is 'auto-login'.
+           */
+          if (!tp_strdiff (name, "auto-login") && !tp_strdiff (type, "bool"))
+            {
+              content = (gchar *) xmlNodeGetContent (setting);
+              data->enabled = (0 != (gint) g_ascii_strtod (content, NULL));
+              g_free (content);
+            }
+          g_free (type);
+          g_free (name);
+        }
+    }
+  /* General settings. */
+  else
+    {
+      for (setting = settings->children; setting; setting = setting->next)
+        import_dialog_pidgin_parse_setting (data, setting);
+    }
+
+  g_free (tag_ui);
+}
+
 GList *
 empathy_import_pidgin_load (void)
 {
-  xmlNodePtr rootnode, node, child, setting;
+  xmlNodePtr rootnode, node, child;
   xmlParserCtxtPtr ctxt;
   xmlDocPtr doc;
   gchar *filename;
@@ -277,13 +324,13 @@ empathy_import_pidgin_load (void)
                 /* Add the server setting */
                 value = tp_g_value_slice_new (G_TYPE_STRING);
                 g_value_set_string (value, nick_server[1]);
-                g_hash_table_insert (data->settings, "server", value);
+                g_hash_table_insert (data->settings, (gpointer) "server", value);
               }
 
               /* Add the account setting */
               value = tp_g_value_slice_new (G_TYPE_STRING);
               g_value_set_string (value, username);
-              g_hash_table_insert (data->settings, "account", value);
+              g_hash_table_insert (data->settings, (gpointer) "account", value);
 
               g_strfreev (name_resource);
               g_strfreev (nick_server);
@@ -301,7 +348,7 @@ empathy_import_pidgin_load (void)
               /* Add the password setting */
               value = tp_g_value_slice_new (G_TYPE_STRING);
               g_value_set_string (value, password);
-              g_hash_table_insert (data->settings, "password", value);
+              g_hash_table_insert (data->settings, (gpointer) "password", value);
 
               g_free (password);
             }
@@ -309,8 +356,7 @@ empathy_import_pidgin_load (void)
           /* Other settings */
           else if (!tp_strdiff ((gchar *) child->name,
               PIDGIN_ACCOUNT_TAG_SETTINGS))
-              for (setting = child->children; setting; setting = setting->next)
-                import_dialog_pidgin_parse_setting (data, setting);
+            import_dialog_pidgin_handle_settings (data, child);
         }
 
       /* If we have the needed settings, add the account data to the list,
@@ -335,7 +381,7 @@ empathy_import_pidgin_load (void)
               GValue *value;
               value = tp_g_value_slice_new (G_TYPE_STRING);
               g_value_set_string (value, "");
-              g_hash_table_insert (data->settings, "password", value);
+              g_hash_table_insert (data->settings, (gpointer) "password", value);
             }
 
           accounts = g_list_prepend (accounts, data);
@@ -361,7 +407,8 @@ empathy_import_pidgin_accounts_to_import (void)
   gboolean out;
   GFile *file;
 
-  filename = g_build_filename (g_get_home_dir (), ".purple", "accounts.xml", NULL);
+  filename = g_build_filename (g_get_home_dir (), ".purple", "accounts.xml",
+      NULL);
   file = g_file_new_for_path (filename);
   out = g_file_query_exists (file, NULL);