[Gaim-commits] CVS: gaim/src status.c,1.15,1.16

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24210/src

Modified Files:
	status.c 
Log Message:
Further deprecation of serv_got_update


Index: status.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/status.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -p -r1.15 -r1.16
--- status.c	10 Sep 2004 19:51:48 -0000	1.15
+++ status.c	10 Sep 2004 22:39:33 -0000	1.16
@@ -225,6 +225,7 @@ gaim_status_type_new_with_attrs(GaimStat
 	status_type = gaim_status_type_new_full(primitive, id, name, saveable,
 			user_settable, independent);
 
+	/* Add the first attribute */
 	gaim_status_type_add_attr(status_type, attr_id, attr_name, attr_value);
 
 	va_start(args, attr_value);
@@ -286,25 +287,6 @@ gaim_status_type_add_attr(GaimStatusType
 }
 
 void
-gaim_status_type_add_attrs(GaimStatusType *status_type, const char *id,
-		const char *name, GaimValue *value, ...)
-{
-	va_list args;
-
-	g_return_if_fail(status_type != NULL);
-	g_return_if_fail(id          != NULL);
-	g_return_if_fail(name        != NULL);
-	g_return_if_fail(value       != NULL);
-
-	/* Add the first. */
-	gaim_status_type_add_attr(status_type, id, name, value);
-
-	va_start(args, value);
-	gaim_status_type_add_attrs_vargs(status_type, args);
-	va_end(args);
-}
-
-void
 gaim_status_type_add_attrs_vargs(GaimStatusType *status_type, va_list args)
 {
 	const char *id, *name;
@@ -324,6 +306,25 @@ gaim_status_type_add_attrs_vargs(GaimSta
 	}
 }
 
+void
+gaim_status_type_add_attrs(GaimStatusType *status_type, const char *id,
+		const char *name, GaimValue *value, ...)
+{
+	va_list args;
+
+	g_return_if_fail(status_type != NULL);
+	g_return_if_fail(id          != NULL);
+	g_return_if_fail(name        != NULL);
+	g_return_if_fail(value       != NULL);
+
+	/* Add the first attribute */
+	gaim_status_type_add_attr(status_type, id, name, value);
+
+	va_start(args, value);
+	gaim_status_type_add_attrs_vargs(status_type, args);
+	va_end(args);
+}
+
 GaimStatusPrimitive
 gaim_status_type_get_primitive(const GaimStatusType *status_type)
 {