Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/jingle/session.c @ 29723:c38f6e6bf4ce
propagate from branch 'im.pidgin.pidgin' (head f0addfa93983499a661e29f567e66a98a9544a89)
to branch 'im.pidgin.pidgin.next.minor' (head 9c3b44f9ecfcb6fde88c8bcc3a27a16587422f2e)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Wed, 09 Dec 2009 03:52:00 +0000 |
| parents | c4f836780e1c 3d471a4bafac |
| children | a8cc50c2279f |
comparison
equal
deleted
inserted
replaced
| 29722:1e19c439fa7a | 29723:c38f6e6bf4ce |
|---|---|
| 374 static gboolean find_by_jid_ghr(gpointer key, | 374 static gboolean find_by_jid_ghr(gpointer key, |
| 375 gpointer value, gpointer user_data) | 375 gpointer value, gpointer user_data) |
| 376 { | 376 { |
| 377 JingleSession *session = (JingleSession *)value; | 377 JingleSession *session = (JingleSession *)value; |
| 378 const gchar *jid = user_data; | 378 const gchar *jid = user_data; |
| 379 gboolean use_bare = g_utf8_strchr(jid, -1, '/') == NULL; | 379 gboolean use_bare = strchr(jid, '/') == NULL; |
| 380 gchar *remote_jid = jingle_session_get_remote_jid(session); | 380 gchar *remote_jid = jingle_session_get_remote_jid(session); |
| 381 gchar *cmp_jid = use_bare ? jabber_get_bare_jid(remote_jid) | 381 gchar *cmp_jid = use_bare ? jabber_get_bare_jid(remote_jid) |
| 382 : g_strdup(remote_jid); | 382 : g_strdup(remote_jid); |
| 383 g_free(remote_jid); | 383 g_free(remote_jid); |
| 384 if (g_str_equal(jid, cmp_jid)) { | 384 if (g_str_equal(jid, cmp_jid)) { |