Mercurial > pidgin
diff libpurple/protocols/jabber/data.c @ 25978:7e020fbe2cdb
propagate from branch 'im.pidgin.pidgin' (head 303af74a38e7b313d4fb0be4d4054a16cb13d819)
to branch 'im.pidgin.cpw.darkrain42.xmpp.avatars' (head 11e989f3ac36a0f958f031d55245db093923ea76)
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 07 Mar 2009 01:32:29 +0000 |
parents | 5f9a24d1c25e |
children | 439f07ce4c8a c4fd9222dda1 b98519a42e53 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/data.c Sat Feb 14 18:23:13 2009 +0000 +++ b/libpurple/protocols/jabber/data.c Sat Mar 07 01:32:29 2009 +0000 @@ -3,17 +3,17 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Library General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA */ - + #include <stdlib.h> #include <glib.h> #include <string.h> @@ -71,7 +71,7 @@ data->cid = g_strdup(xmlnode_get_attrib(tag, "cid")); data->type = g_strdup(xmlnode_get_attrib(tag, "type")); - + raw_data = xmlnode_get_data(tag); data->data = purple_base64_decode(raw_data, &size); data->size = size; @@ -176,7 +176,7 @@ jabber_data_find_remote_by_cid(const gchar *cid) { purple_debug_info("jabber", "lookup remote smiley with cid = %s\n", cid); - + return g_hash_table_lookup(remote_data_by_cid, cid); } @@ -186,7 +186,7 @@ purple_debug_info("jabber", "associating local smiley\n alt = %s, cid = %s\n", alt, jabber_data_get_cid(data)); g_hash_table_insert(local_data_by_alt, g_strdup(alt), data); - g_hash_table_insert(local_data_by_cid, g_strdup(jabber_data_get_cid(data)), + g_hash_table_insert(local_data_by_cid, g_strdup(jabber_data_get_cid(data)), data); } @@ -195,7 +195,7 @@ { purple_debug_info("jabber", "associating remote smiley, cid = %s\n", jabber_data_get_cid(data)); - g_hash_table_insert(remote_data_by_cid, g_strdup(jabber_data_get_cid(data)), + g_hash_table_insert(remote_data_by_cid, g_strdup(jabber_data_get_cid(data)), data); }