Re: Need more tarballs for 2.30.0

[Vincent Untz <vuntz gnome org>]

Le mardi 30 mars 2010, à 13:59 +0000, Stef a écrit :
> I've attached a patch to that bug. Could you roll that into the release?

Thanks, I've committed the patch (after requesting a freeze break). Now
I just need a tiny patch to make it build with Werror (which is required
for distcheck). See attachment.

It's a bit ugly, but since there's no enum value in GnomeKeyringResult
for INCOMPLETE, I guess it's the only solution.

Stef, does it look relatively sane? Or should I disable Werror for
--enable-tests (and therefore in distcheck)?

Vincent

-- 
Les gens heureux ne sont pas pressés.

diff --git a/library/gkr-operation.c b/library/gkr-operation.c
index 37c5cb5..214ecc7 100644
--- a/library/gkr-operation.c
+++ b/library/gkr-operation.c
@@ -166,7 +166,7 @@ gboolean
 gkr_operation_set_result (GkrOperation *op, GnomeKeyringResult res)
 {
 	g_assert (op);
-	g_assert (res != INCOMPLETE);
+	g_assert ((int) res != INCOMPLETE);
 	g_atomic_int_compare_and_exchange (&op->result, INCOMPLETE, res);
 	return g_atomic_int_get (&op->result) == res; /* Success when already set to res */
 }
@@ -367,12 +367,12 @@ gkr_operation_block (GkrOperation *op)
 
 	gkr_operation_ref (op);
 
-	while (gkr_operation_get_result (op) == INCOMPLETE) {
+	while ((int) gkr_operation_get_result (op) == INCOMPLETE) {
 		if (op->pending) {
 			dbus_pending_call_block (op->pending);
 		} else if (op->prompting) {
 			dbus_connection_flush (op->conn);
-			while (op->prompting && gkr_operation_get_result (op) == INCOMPLETE) {
+			while (op->prompting && (int) gkr_operation_get_result (op) == INCOMPLETE) {
 				if (!dbus_connection_read_write_dispatch (op->conn, 200))
 					break;
 			}