Merge branch 'master' of ssh://yorba.org/git/geary

This commit is contained in:
Eric Gregory 2011-10-24 16:51:22 -07:00
commit 285ccb6dfa

View file

@ -112,8 +112,14 @@ public class Geary.EmailLocation : Object {
}
private void on_folder_opened(Geary.Folder.OpenState state, int count) {
if (local_adjustment < 0 || count < local_adjustment)
// If no local_adjustment, nothing needs to be done; if the local_adjustment is greater or
// equal to the remote folder's count, that indicates messages have been removed, in which
// case let the adjustments occur via on_message_removed().
if (local_adjustment < 0 || count <= local_adjustment) {
local_adjustment = -1;
return;
}
int old_position = position;
position = count - local_adjustment;