Mercurial > pidgin.yaz
comparison libpurple/protocols/silc/chat.c @ 31449:1c660ba17ba1
propagate from branch 'im.pidgin.pidgin' (head 6f879669a6513a5c40335bbaefe842389a92b39e)
to branch 'im.pidgin.cpw.qulogic.cairo' (head 4ab0199887f74442673fd46dcbb662bc7f070bc4)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Sun, 21 Nov 2010 20:30:12 +0000 |
| parents | 1cdae196aac8 |
| children | 9449f70762e7 |
comparison
equal
deleted
inserted
replaced
| 31448:9a705087d64e | 31449:1c660ba17ba1 |
|---|---|
| 1393 return NULL; | 1393 return NULL; |
| 1394 | 1394 |
| 1395 if (sg->roomlist) | 1395 if (sg->roomlist) |
| 1396 purple_roomlist_unref(sg->roomlist); | 1396 purple_roomlist_unref(sg->roomlist); |
| 1397 | 1397 |
| 1398 sg->roomlist_canceled = FALSE; | 1398 sg->roomlist_cancelled = FALSE; |
| 1399 | 1399 |
| 1400 sg->roomlist = purple_roomlist_new(purple_connection_get_account(gc)); | 1400 sg->roomlist = purple_roomlist_new(purple_connection_get_account(gc)); |
| 1401 f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", "channel", TRUE); | 1401 f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", "channel", TRUE); |
| 1402 fields = g_list_append(fields, f); | 1402 fields = g_list_append(fields, f); |
| 1403 f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_INT, | 1403 f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_INT, |
| 1427 | 1427 |
| 1428 purple_roomlist_set_in_progress(list, FALSE); | 1428 purple_roomlist_set_in_progress(list, FALSE); |
| 1429 if (sg->roomlist == list) { | 1429 if (sg->roomlist == list) { |
| 1430 purple_roomlist_unref(sg->roomlist); | 1430 purple_roomlist_unref(sg->roomlist); |
| 1431 sg->roomlist = NULL; | 1431 sg->roomlist = NULL; |
| 1432 sg->roomlist_canceled = TRUE; | 1432 sg->roomlist_cancelled = TRUE; |
| 1433 } | 1433 } |
| 1434 } | 1434 } |