[Galago-commits] r2868 - in branches/libgalago/push-presence: . libgalago

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-06-18 01:27:39 -0700 (Sun, 18 Jun 2006)
New Revision: 2868

Modified:
   branches/libgalago/push-presence/ChangeLog
   branches/libgalago/push-presence/libgalago/galago-presence.c
Log:
Re-enable galago_presence_compare().


Modified: branches/libgalago/push-presence/ChangeLog
===================================================================
--- branches/libgalago/push-presence/ChangeLog	2006-06-18 08:23:08 UTC (rev 2867)
+++ branches/libgalago/push-presence/ChangeLog	2006-06-18 08:27:39 UTC (rev 2868)
@@ -1,3 +1,8 @@
+Sun Jun 18 01:27:24 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-presence.c:
+	  - Re-enable galago_presence_compare().
+
 Sun Jun 18 01:22:36 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* docs/reference/libgalago.types:

Modified: branches/libgalago/push-presence/libgalago/galago-presence.c
===================================================================
--- branches/libgalago/push-presence/libgalago/galago-presence.c	2006-06-18 08:23:08 UTC (rev 2867)
+++ branches/libgalago/push-presence/libgalago/galago-presence.c	2006-06-18 08:27:39 UTC (rev 2868)
@@ -603,24 +603,24 @@
 	else if (presence2 == NULL)
 		return -1;
 
-#if 0
 	/* Compute the score of the first set of statuses. */
-	for (l = galago_presence_get_statuses(presence1); l != NULL; l = l->next)
+	for (l = galago_presence_get_enabled_statuses(presence1);
+		 l != NULL; l = l->next)
 	{
-		GalagoStatus *status = (GalagoStatus *)l->data;
-		score1 += status_type_scores[galago_status_get_primitive(status)];
+		GalagoStatusPrimitive primitive =
+			galago_status_type_get_primitive(GALAGO_STATUS_TYPE(l->data));
+		score1 += status_type_scores[primitive];
 	}
 
 	/* Compute the score of the second set of statuses. */
-	for (l = galago_presence_get_statuses(presence2); l != NULL; l = l->next)
+	for (l = galago_presence_get_enabled_statuses(presence2);
+		 l != NULL; l = l->next)
 	{
-		GalagoStatus *status = (GalagoStatus *)l->data;
-		score2 += status_type_scores[galago_status_get_primitive(status)];
+		GalagoStatusPrimitive primitive =
+			galago_status_type_get_primitive(GALAGO_STATUS_TYPE(l->data));
+		score2 += status_type_scores[primitive];
 	}
-#endif
 
-	g_assert_not_reached();
-
 	if (score1 > score2)
 		return 1;
 	else if (score1 < score2)