qulogic/pidgin

gtkblist: Don't parse MSN contacts from VCards
release-2.x.y
2016-10-04, Mike Ruprecht
07d913488281
Parents 482a3b3e5c89
Children a55374913dab
gtkblist: Don't parse MSN contacts from VCards
1 files changed, 2 insertions(+), 7 deletions(-)
  • +2 -7
    pidgin/gtkblist.c
    • --- a/pidgin/gtkblist.c Fri Sep 30 14:38:48 2016 -0500
    +++ b/pidgin/gtkblist.c Tue Oct 04 12:39:14 2016 -0500
    @@ -2131,7 +2131,6 @@
    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 @@
    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 @@
    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 @@
    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 @@
    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);