--- a/src/lib-storage/index/dbox/dbox-storage.c	Fri Jul 31 12:11:12 2009 -0400
+++ b/src/lib-storage/index/dbox/dbox-storage.c	Fri Jul 31 14:56:39 2009 -0400
@@ -227,10 +227,10 @@
 
 	new_hdr = hdr;
 
-	if (update != NULL && !mailbox_guid_is_empty(update->mailbox_guid)) {
+	if (update != NULL && !mail_guid_128_is_empty(update->mailbox_guid)) {
 		memcpy(new_hdr.mailbox_guid, update->mailbox_guid,
 		       sizeof(new_hdr.mailbox_guid));
-	} else if (mailbox_guid_is_empty(new_hdr.mailbox_guid)) {
+	} else if (mail_guid_128_is_empty(new_hdr.mailbox_guid)) {
 		mail_generate_guid_128(new_hdr.mailbox_guid);
 	}
 
@@ -387,7 +387,7 @@
 	if (dbox_read_header(mbox, &hdr) < 0)
 		memset(&hdr, 0, sizeof(hdr));
 
-	if (mailbox_guid_is_empty(hdr.mailbox_guid)) {
+	if (mail_guid_128_is_empty(hdr.mailbox_guid)) {
 		/* regenerate it */
 		if (dbox_write_index_header(box, NULL) < 0 ||
 		    dbox_read_header(mbox, &hdr) < 0)

--- a/src/lib-storage/index/dbox/dbox-sync-rebuild.c	Fri Jul 31 12:11:12 2009 -0400
+++ b/src/lib-storage/index/dbox/dbox-sync-rebuild.c	Fri Jul 31 14:56:39 2009 -0400
@@ -352,7 +352,7 @@
 
 	if (dbox_read_header(ctx->mbox, &hdr) < 0)
 		memset(&hdr, 0, sizeof(hdr));
-	if (!mailbox_guid_is_empty(hdr.mailbox_guid))
+	if (!mail_guid_128_is_empty(hdr.mailbox_guid))
 		mail_generate_guid_128(hdr.mailbox_guid);
 	if (hdr.highest_maildir_uid < ctx->mbox->highest_maildir_uid)
 		hdr.highest_maildir_uid = ctx->mbox->highest_maildir_uid;

--- a/src/lib-storage/index/maildir/maildir-storage.c	Fri Jul 31 12:11:12 2009 -0400
+++ b/src/lib-storage/index/maildir/maildir-storage.c	Fri Jul 31 14:56:39 2009 -0400
@@ -507,7 +507,7 @@
 	if (maildir_uidlist_lock(uidlist) <= 0)
 		return -1;
 
-	if (!mailbox_guid_is_empty(update->mailbox_guid))
+	if (!mail_guid_128_is_empty(update->mailbox_guid))
 		maildir_uidlist_set_mailbox_guid(uidlist, update->mailbox_guid);
 	if (update->uid_validity != 0)
 		maildir_uidlist_set_uid_validity(uidlist, update->uid_validity);

--- a/src/lib-storage/index/mbox/mbox-sync.c	Fri Jul 31 12:11:12 2009 -0400
+++ b/src/lib-storage/index/mbox/mbox-sync.c	Fri Jul 31 14:56:39 2009 -0400
@@ -1363,10 +1363,10 @@
 	const void *data;
 	size_t data_size;
 
-	if (update != NULL && !mailbox_guid_is_empty(update->mailbox_guid)) {
+	if (update != NULL && !mail_guid_128_is_empty(update->mailbox_guid)) {
 		memcpy(mbox->mbox_hdr.mailbox_guid, update->mailbox_guid,
 		       sizeof(mbox->mbox_hdr.mailbox_guid));
-	} else if (mailbox_guid_is_empty(mbox->mbox_hdr.mailbox_guid)) {
+	} else if (mail_guid_128_is_empty(mbox->mbox_hdr.mailbox_guid)) {
 		mail_generate_guid_128(mbox->mbox_hdr.mailbox_guid);
 	}
 
@@ -1672,7 +1672,7 @@
 	if (mbox_sync_header_refresh(mbox) < 0)
 		return -1;
 
-	if (mailbox_guid_is_empty(mbox->mbox_hdr.mailbox_guid)) {
+	if (mail_guid_128_is_empty(mbox->mbox_hdr.mailbox_guid)) {
 		/* need to assign mailbox GUID */
 		return 1;
 	}

--- a/src/lib-storage/mail-storage-private.h	Fri Jul 31 12:11:12 2009 -0400
+++ b/src/lib-storage/mail-storage-private.h	Fri Jul 31 14:56:39 2009 -0400
@@ -433,6 +433,5 @@
 int mail_set_aborted(struct mail *mail);
 void mail_set_expunged(struct mail *mail);
 void mailbox_set_deleted(struct mailbox *box);
-bool mailbox_guid_is_empty(const uint8_t guid[MAIL_GUID_128_SIZE]);
 
 #endif

--- a/src/lib-storage/mail-storage.c	Fri Jul 31 12:11:12 2009 -0400
+++ b/src/lib-storage/mail-storage.c	Fri Jul 31 14:56:39 2009 -0400
@@ -1086,8 +1086,3 @@
 			       "Mailbox was deleted under us");
 	box->mailbox_deleted = TRUE;
 }
-
-bool mailbox_guid_is_empty(const uint8_t guid[MAIL_GUID_128_SIZE])
-{
-	return mail_guid_128_is_empty(guid);
-}