Mercurial > pidgin
comparison libpurple/signals.c @ 29298:fb99a0067812
propagate from branch 'im.pidgin.pidgin' (head 70d69397ed952b26b453423c381c70d6783eb66d)
to branch 'im.pidgin.cpw.attention_ui' (head 1cf0dea282a0d0e4aeac4770e0150d6d0c10830a)
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 13 Aug 2009 17:42:44 +0000 |
parents | deecc1d663c4 |
children | 7be0dbc00168 |
comparison
equal
deleted
inserted
replaced
29297:338d6a211055 | 29298:fb99a0067812 |
---|---|
361 | 361 |
362 if (handler_data->handle == handle && handler_data->cb == func) | 362 if (handler_data->handle == handle && handler_data->cb == func) |
363 { | 363 { |
364 g_free(handler_data); | 364 g_free(handler_data); |
365 | 365 |
366 signal_data->handlers = g_list_remove(signal_data->handlers, | 366 signal_data->handlers = g_list_delete_link(signal_data->handlers, |
367 handler_data); | 367 l); |
368 signal_data->handler_count--; | 368 signal_data->handler_count--; |
369 | 369 |
370 found = TRUE; | 370 found = TRUE; |
371 | 371 |
372 break; | 372 break; |
396 if (handler_data->handle == handle) | 396 if (handler_data->handle == handle) |
397 { | 397 { |
398 g_free(handler_data); | 398 g_free(handler_data); |
399 | 399 |
400 signal_data->handler_count--; | 400 signal_data->handler_count--; |
401 signal_data->handlers = g_list_remove(signal_data->handlers, | 401 signal_data->handlers = g_list_delete_link(signal_data->handlers, |
402 handler_data); | 402 l); |
403 } | 403 } |
404 } | 404 } |
405 } | 405 } |
406 | 406 |
407 static void | 407 static void |