Mercurial > pidgin
comparison libgaim/account.c @ 14643:4df2827fc2eb
[gaim-migrate @ 17389]
Fix sf bug #1469293
Checking if a va_list != NULL is not valid because va_list is not a pointer
on some platforms. Conveniently the check wasn't necessary.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Thu, 28 Sep 2006 07:01:47 +0000 |
parents | f23506e8f812 |
children | 61a4a2dc491e |
comparison
equal
deleted
inserted
replaced
14642:426383e5b45d | 14643:4df2827fc2eb |
---|---|
1367 | 1367 |
1368 void | 1368 void |
1369 gaim_account_set_status(GaimAccount *account, const char *status_id, | 1369 gaim_account_set_status(GaimAccount *account, const char *status_id, |
1370 gboolean active, ...) | 1370 gboolean active, ...) |
1371 { | 1371 { |
1372 va_list args; | |
1373 | |
1374 va_start(args, active); | |
1375 gaim_account_set_status_vargs(account, status_id, active, args); | |
1376 va_end(args); | |
1377 } | |
1378 | |
1379 void | |
1380 gaim_account_set_status_vargs(GaimAccount *account, const char *status_id, | |
1381 gboolean active, va_list args) | |
1382 { | |
1383 GList *attrs = NULL; | 1372 GList *attrs = NULL; |
1384 const gchar *id; | 1373 const gchar *id; |
1385 gpointer data; | 1374 gpointer data; |
1386 | 1375 va_list args; |
1387 if (args != NULL) | 1376 |
1388 { | 1377 va_start(args, active); |
1389 while ((id = va_arg(args, const char *)) != NULL) | 1378 while ((id = va_arg(args, const char *)) != NULL) |
1390 { | 1379 { |
1391 attrs = g_list_append(attrs, (char *)id); | 1380 attrs = g_list_append(attrs, (char *)id); |
1392 data = va_arg(args, void *); | 1381 data = va_arg(args, void *); |
1393 attrs = g_list_append(attrs, data); | 1382 attrs = g_list_append(attrs, data); |
1394 } | |
1395 } | 1383 } |
1396 gaim_account_set_status_list(account, status_id, active, attrs); | 1384 gaim_account_set_status_list(account, status_id, active, attrs); |
1397 g_list_free(attrs); | 1385 g_list_free(attrs); |
1386 va_end(args); | |
1398 } | 1387 } |
1399 | 1388 |
1400 void | 1389 void |
1401 gaim_account_set_status_list(GaimAccount *account, const char *status_id, | 1390 gaim_account_set_status_list(GaimAccount *account, const char *status_id, |
1402 gboolean active, GList *attrs) | 1391 gboolean active, GList *attrs) |