Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/jabber.c @ 29613:e3206d6da6c7
propagate from branch 'im.pidgin.pidgin' (head bc551a0f3f61b07c37e8677925b1aeae91e849be)
to branch 'im.pidgin.pidgin.next.minor' (head 6d87b28fb7d202e9e5cf6700c99d9f140fdcd245)
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Sat, 31 Oct 2009 17:52:54 +0000 |
parents | 7819d3819f4c c3be1de8abde |
children | e77894113a14 |
comparison
equal
deleted
inserted
replaced
29612:a78a44f0cdcd | 29613:e3206d6da6c7 |
---|---|
1823 { | 1823 { |
1824 while (jabber_features) { | 1824 while (jabber_features) { |
1825 JabberFeature *feature = jabber_features->data; | 1825 JabberFeature *feature = jabber_features->data; |
1826 g_free(feature->namespace); | 1826 g_free(feature->namespace); |
1827 g_free(feature); | 1827 g_free(feature); |
1828 jabber_features = g_list_remove_link(jabber_features, jabber_features); | 1828 jabber_features = g_list_delete_link(jabber_features, jabber_features); |
1829 } | 1829 } |
1830 } | 1830 } |
1831 | 1831 |
1832 void jabber_add_identity(const gchar *category, const gchar *type, const gchar *lang, const gchar *name) { | 1832 void jabber_add_identity(const gchar *category, const gchar *type, const gchar *lang, const gchar *name) { |
1833 GList *identity; | 1833 GList *identity; |
1860 g_free(id->category); | 1860 g_free(id->category); |
1861 g_free(id->type); | 1861 g_free(id->type); |
1862 g_free(id->lang); | 1862 g_free(id->lang); |
1863 g_free(id->name); | 1863 g_free(id->name); |
1864 g_free(id); | 1864 g_free(id); |
1865 jabber_identities = g_list_remove_link(jabber_identities, jabber_identities); | 1865 jabber_identities = g_list_delete_link(jabber_identities, jabber_identities); |
1866 } | 1866 } |
1867 } | 1867 } |
1868 | 1868 |
1869 gboolean jabber_stream_is_ssl(JabberStream *js) | 1869 gboolean jabber_stream_is_ssl(JabberStream *js) |
1870 { | 1870 { |
2604 JabberChat *chat = jabber_chat_find_by_conv(conv); | 2604 JabberChat *chat = jabber_chat_find_by_conv(conv); |
2605 | 2605 |
2606 if(!chat || !args || !args[0]) | 2606 if(!chat || !args || !args[0]) |
2607 return PURPLE_CMD_RET_FAILED; | 2607 return PURPLE_CMD_RET_FAILED; |
2608 | 2608 |
2609 jabber_chat_change_nick(chat, args[0]); | 2609 if (!jabber_resourceprep_validate(args[0])) { |
2610 return PURPLE_CMD_RET_OK; | 2610 *error = g_strdup(_("Invalid nickname")); |
2611 return PURPLE_CMD_RET_FAILED; | |
2612 } | |
2613 | |
2614 if (jabber_chat_change_nick(chat, args[0])) | |
2615 return PURPLE_CMD_RET_OK; | |
2616 else | |
2617 return PURPLE_CMD_RET_FAILED; | |
2611 } | 2618 } |
2612 | 2619 |
2613 static PurpleCmdRet jabber_cmd_chat_part(PurpleConversation *conv, | 2620 static PurpleCmdRet jabber_cmd_chat_part(PurpleConversation *conv, |
2614 const char *cmd, char **args, char **error, void *data) | 2621 const char *cmd, char **args, char **error, void *data) |
2615 { | 2622 { |