Mercurial > pidgin
comparison libpurple/media.c @ 30578:0accc8adb18a
merge of '2f6318bd834113559a405ec68cdb178f2180b680'
and '64e02b98551e11e093e4649f1516f3aceaa321e2'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sun, 26 Sep 2010 20:16:15 +0000 |
| parents | 1feb2baeac2d |
| children | 356a8d472395 a8cc50c2279f 539aa44be788 |
comparison
equal
deleted
inserted
replaced
| 30577:7b761c8601f7 | 30578:0accc8adb18a |
|---|---|
| 513 g_return_if_fail(PURPLE_IS_MEDIA(media)); | 513 g_return_if_fail(PURPLE_IS_MEDIA(media)); |
| 514 g_return_if_fail(session != NULL); | 514 g_return_if_fail(session != NULL); |
| 515 | 515 |
| 516 if (!media->priv->sessions) { | 516 if (!media->priv->sessions) { |
| 517 purple_debug_info("media", "Creating hash table for sessions\n"); | 517 purple_debug_info("media", "Creating hash table for sessions\n"); |
| 518 media->priv->sessions = g_hash_table_new(g_str_hash, g_str_equal); | 518 media->priv->sessions = g_hash_table_new_full(g_str_hash, g_str_equal, |
| 519 g_free, NULL); | |
| 519 } | 520 } |
| 520 g_hash_table_insert(media->priv->sessions, g_strdup(session->id), session); | 521 g_hash_table_insert(media->priv->sessions, g_strdup(session->id), session); |
| 521 } | 522 } |
| 522 | 523 |
| 523 #if 0 | 524 #if 0 |