diff 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 <[e-mail]>

--- a/libgaim/account.c	Thu Sep 28 06:32:53 2006 +0000
+++ b/libgaim/account.c	Thu Sep 28 07:01:47 2006 +0000
@@ -1369,32 +1369,21 @@
 gaim_account_set_status(GaimAccount *account, const char *status_id,
 						gboolean active, ...)
 {
+	GList *attrs = NULL;
+	const gchar *id;
+	gpointer data;
 	va_list args;
 
 	va_start(args, active);
-	gaim_account_set_status_vargs(account, status_id, active, args);
-	va_end(args);
-}
-
-void
-gaim_account_set_status_vargs(GaimAccount *account, const char *status_id,
-							  gboolean active, va_list args)
-{
-	GList *attrs = NULL;
-	const gchar *id;
-	gpointer data;
-
-	if (args != NULL)
+	while ((id = va_arg(args, const char *)) != NULL)
 	{
-		while ((id = va_arg(args, const char *)) != NULL)
-		{
-			attrs = g_list_append(attrs, (char *)id);
-			data = va_arg(args, void *);
-			attrs = g_list_append(attrs, data);
-		}
+		attrs = g_list_append(attrs, (char *)id);
+		data = va_arg(args, void *);
+		attrs = g_list_append(attrs, data);
 	}
 	gaim_account_set_status_list(account, status_id, active, attrs);
 	g_list_free(attrs);
+	va_end(args);
 }
 
 void