diff options
| author | Mike Ruprecht <cmaiku@gmail.com> | 2016-10-04 12:39:14 -0500 |
|---|---|---|
| committer | Mike Ruprecht <cmaiku@gmail.com> | 2016-10-04 12:39:14 -0500 |
| commit | 42dc6a8e98a56a499de7b657552d508050f400a9 (patch) | |
| tree | 31f0dd6a829db7c6a63e791dead2ad2396fc6277 | |
| parent | 51ddf49af1cbde12ef4b8dad5107d08694dceff8 (diff) | |
| download | pidgin-42dc6a8e98a56a499de7b657552d508050f400a9.tar.gz | |
gtkblist: Don't parse MSN contacts from VCards
| -rw-r--r-- | pidgin/gtkblist.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c index fbc5b11380..dff3b427bd 100644 --- a/pidgin/gtkblist.c +++ b/pidgin/gtkblist.c @@ -2131,7 +2131,6 @@ parse_vcard(const char *vcard, PurpleGroup *group) GList *aims = NULL; GList *icqs = NULL; GList *yahoos = NULL; - GList *msns = NULL; GList *jabbers = NULL; s = temp_vcard = g_strdup(vcard); @@ -2171,7 +2170,7 @@ parse_vcard(const char *vcard, PurpleGroup *group) if (!strcmp(field, "FN")) alias = g_strdup(value); else if (!strcmp(field, "X-AIM") || !strcmp(field, "X-ICQ") || - !strcmp(field, "X-YAHOO") || !strcmp(field, "X-MSN") || + !strcmp(field, "X-YAHOO") || !strcmp(field, "X-JABBER")) { char **values = g_strsplit(value, ":", 0); @@ -2185,8 +2184,6 @@ parse_vcard(const char *vcard, PurpleGroup *group) icqs = g_list_append(icqs, g_strdup(*im)); else if (!strcmp(field, "X-YAHOO")) yahoos = g_list_append(yahoos, g_strdup(*im)); - else if (!strcmp(field, "X-MSN")) - msns = g_list_append(msns, g_strdup(*im)); else if (!strcmp(field, "X-JABBER")) jabbers = g_list_append(jabbers, g_strdup(*im)); } @@ -2197,8 +2194,7 @@ parse_vcard(const char *vcard, PurpleGroup *group) g_free(temp_vcard); - if (aims == NULL && icqs == NULL && yahoos == NULL && - msns == NULL && jabbers == NULL) + if (aims == NULL && icqs == NULL && yahoos == NULL && jabbers == NULL) { g_free(alias); @@ -2208,7 +2204,6 @@ parse_vcard(const char *vcard, PurpleGroup *group) add_buddies_from_vcard("prpl-aim", group, aims, alias); add_buddies_from_vcard("prpl-icq", group, icqs, alias); add_buddies_from_vcard("prpl-yahoo", group, yahoos, alias); - add_buddies_from_vcard("prpl-msn", group, msns, alias); add_buddies_from_vcard("prpl-jabber", group, jabbers, alias); g_free(alias); |