# uniqueid argument to do_mailbox_work is redundant. Historical cruft?
Index: imap/sync_client.c
===================================================================
RCS file: /cvs/src/cyrus/imap/sync_client.c,v
retrieving revision 1.15
diff -u -d -r1.15 sync_client.c
--- imap/sync_client.c	30 Aug 2007 17:51:44 -0000	1.15
+++ imap/sync_client.c	11 Sep 2007 20:07:00 -0000
@@ -1631,8 +1631,7 @@
  */
 
 static int do_mailbox_work(struct mailbox *mailbox, 
-			   struct sync_msg_list *list, int just_created,
-			   char *uniqueid)
+			   struct sync_msg_list *list, int just_created)
 {
     unsigned int last_recent_uid;
     time_t lastread, lastchange;
@@ -1834,9 +1833,9 @@
                 if (!r && do_contents) {
                     struct sync_msg_list *folder_msglist;
 
-                    /* 0L, 0L Forces last_uid and seendb push as well */
-                    folder_msglist = sync_msg_list_create(m.flagname, 0);
-                    r = do_mailbox_work(&m, folder_msglist, 1, m.uniqueid);
+                    /* 0L forces lastuid push */
+                    folder_msglist = sync_msg_list_create(m.flagname, 0L);
+                    r = do_mailbox_work(&m, folder_msglist, 1);
                     sync_msg_list_free(&folder_msglist);
                 }
             } else {
@@ -1858,7 +1857,7 @@
 		if (!r) r = do_annotation(m.name);
 
                 if (!r && do_contents)
-                    r = do_mailbox_work(&m, folder2->msglist, 0, m.uniqueid);
+                    r = do_mailbox_work(&m, folder2->msglist, 0);
             }
         } else {
 	    char *userid, *part;
@@ -1877,9 +1876,9 @@
             if (!r && do_contents) {
                 struct sync_msg_list *folder_msglist;
 
-                /* 0L, 0L Forces last_uid and seendb push as well */
-                folder_msglist = sync_msg_list_create(m.flagname, 0);
-                r = do_mailbox_work(&m, folder_msglist, 1, m.uniqueid);
+                /* 0L forces uidlast push */
+                folder_msglist = sync_msg_list_create(m.flagname, 0L);
+                r = do_mailbox_work(&m, folder_msglist, 1);
                 sync_msg_list_free(&folder_msglist);
             }