aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2008-10-17 20:48:38 +0800
committerxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2008-10-17 20:48:38 +0800
commit42168c729f2b9e3e5525fd97974daa2a8cd0916f (patch)
treec69eacb4ce40acc614b5c13332dba99afc12186e /src
parent5f207f7621dff7b6af65ba445396b806b0ff533d (diff)
downloadgsoc2013-empathy-42168c729f2b9e3e5525fd97974daa2a8cd0916f.tar
gsoc2013-empathy-42168c729f2b9e3e5525fd97974daa2a8cd0916f.tar.gz
gsoc2013-empathy-42168c729f2b9e3e5525fd97974daa2a8cd0916f.tar.bz2
gsoc2013-empathy-42168c729f2b9e3e5525fd97974daa2a8cd0916f.tar.lz
gsoc2013-empathy-42168c729f2b9e3e5525fd97974daa2a8cd0916f.tar.xz
gsoc2013-empathy-42168c729f2b9e3e5525fd97974daa2a8cd0916f.tar.zst
gsoc2013-empathy-42168c729f2b9e3e5525fd97974daa2a8cd0916f.zip
It is a map from pidgin to CM, not MC.
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@1645 4ee84921-47dd-4033-b63a-18d7a039a3e4
Diffstat (limited to 'src')
-rw-r--r--src/empathy-import-pidgin.c20
1 files 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 <libempathy-gtk/empathy-ui-utils.h>
-/* 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);