--- a/libpurple/plugins/keyrings/gnomekeyring.c	Mon Mar 25 19:22:32 2013 +0100
+++ b/libpurple/plugins/keyrings/gnomekeyring.c	Tue Mar 26 14:19:08 2013 +0100
@@ -240,6 +240,9 @@
 {
 	GList *cancel_list = request_queue;
 
+	if (request_queue == NULL)
+		return;
+
 	purple_debug_info("gnome-keyring", "cancelling all pending requests\n");
 	request_queue = NULL;
 
@@ -343,7 +346,7 @@
 }
 
 static void
-gnomekeyring_cancel()
+gnomekeyring_cancel(void)
 {
 	gnomekeyring_cancel_queue();
 	if (current_request) {