[Galago-commits] r2839 - in trunk/libgalago: . libgalago

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-06-12 01:35:22 -0700 (Mon, 12 Jun 2006)
New Revision: 2839

Modified:
   trunk/libgalago/ChangeLog
   trunk/libgalago/libgalago/galago-dbus.c
Log:
Combine a couple loops.


Modified: trunk/libgalago/ChangeLog
===================================================================
--- trunk/libgalago/ChangeLog	2006-06-12 08:33:27 UTC (rev 2838)
+++ trunk/libgalago/ChangeLog	2006-06-12 08:35:22 UTC (rev 2839)
@@ -1,3 +1,8 @@
+Mon Jun 12 01:34:56 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-dbus.c:
+	  - Combine a couple loops.
+
 Mon Jun 12 01:33:05 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* tests/test-bug-36.c:

Modified: trunk/libgalago/libgalago/galago-dbus.c
===================================================================
--- trunk/libgalago/libgalago/galago-dbus.c	2006-06-12 08:33:27 UTC (rev 2838)
+++ trunk/libgalago/libgalago/galago-dbus.c	2006-06-12 08:35:22 UTC (rev 2839)
@@ -745,17 +745,15 @@
 
 	for (l = return_types; l != NULL; l = l->next)
 	{
+		GalagoValue *value = (GalagoValue *)l->data;
 		ret_list = g_list_append(ret_list,
-			get_ret_val_from_iter(&iter, (GalagoValue *)l->data));
+								 get_ret_val_from_iter(&iter, value));
+		galago_value_destroy(value);
 
 		dbus_message_iter_next(&iter);
 	}
 
-	if (return_types != NULL)
-	{
-		g_list_foreach(return_types, (GFunc)galago_value_destroy, NULL);
-		g_list_free(return_types);
-	}
+	g_list_free(return_types);
 
 	return ret_list;
 }
@@ -767,8 +765,7 @@
 	if (!dbus_error_has_name(error, GALAGO_DBUS_ERROR_OBJECT_NOT_FOUND))
 	{
 		g_warning("Error sending %s.%s: %s",
-				  g_type_name(G_OBJECT_TYPE(object)),
-				  name, error->message);
+				  g_type_name(G_OBJECT_TYPE(object)), name, error->message);
 	}
 }