From f404a405b5fdb4a27e7e62e15287ddd4c8cb9b9c Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 17 Oct 2008 12:48:38 +0000 Subject: It is a map from pidgin to CM, not MC. svn path=/trunk/; revision=1645 --- src/empathy-import-pidgin.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c index 0ca8b8a4e..aedad4e62 100644 --- a/src/empathy-import-pidgin.c +++ b/src/empathy-import-pidgin.c @@ -40,15 +40,15 @@ #include -/* Pidgin to MC map */ +/* Pidgin to CM map */ typedef struct { gchar *protocol; gchar *pidgin_name; - gchar *mc_name; -} PidginMcMapItem; + gchar *cm_name; +} PidginCmMapItem; -static PidginMcMapItem pidgin_mc_map[] = +static PidginCmMapItem pidgin_cm_map[] = { { "msn", "server", "server" }, { "msn", "port", "port" }, @@ -99,7 +99,7 @@ static void import_dialog_pidgin_parse_setting (EmpathyImportAccountData *data, xmlNodePtr setting) { - PidginMcMapItem *item = NULL; + PidginCmMapItem *item = NULL; gchar *tag_name; gchar *type = NULL; gchar *content; @@ -112,13 +112,13 @@ import_dialog_pidgin_parse_setting (EmpathyImportAccountData *data, return; /* Search for the map corresponding to setting we are parsing */ - for (i = 0; i < G_N_ELEMENTS (pidgin_mc_map); i++) + for (i = 0; i < G_N_ELEMENTS (pidgin_cm_map); i++) { if (!tp_strdiff (mc_profile_get_protocol_name (data->profile), - pidgin_mc_map[i].protocol) && - !tp_strdiff (tag_name, pidgin_mc_map[i].pidgin_name)) + pidgin_cm_map[i].protocol) && + !tp_strdiff (tag_name, pidgin_cm_map[i].pidgin_name)) { - item = pidgin_mc_map + i; + item = pidgin_cm_map + i; break; } } @@ -150,7 +150,7 @@ import_dialog_pidgin_parse_setting (EmpathyImportAccountData *data, } if (value) - g_hash_table_insert (data->settings, item->mc_name, value); + g_hash_table_insert (data->settings, item->cm_name, value); g_free (type); g_free (content); -- cgit v1.2.3