← Back to branch summary

~ubuntu-branches/ubuntu/saucy/shotwell/saucy-proposed

« back to all changes in this revision

Viewing changes to src/Photo.vala

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Robert Ancell, Alberto Mardegan
  • Date: 2012-08-28 16:57:19 UTC
  • mfrom: (1.2.14)
  • Revision ID: package-import@ubuntu.com-20120828165719-p6ep5hdo24rssreo
Tags: 0.12.90-0ubuntu1
https://launchpad.net/bugs/1041011
[ Robert Ancell ]
* New upstream release (LP: #1041011)
* debian/watch:
  - Watch for unstable versions
  - Releases now in .xz format

[ Alberto Mardegan ]
* debian/patches/06_uoa.patch:
  - updated for the new version

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Photo.vala
1748
1748
    
1749
1749
    // Also makes sense to freeze the SourceCollection during this operation.
1750
1750
    public static void set_many_editable_file(Gee.Map<Photo, File> map) throws DatabaseError {
1751
 
        PhotoTable.get_instance().begin_transaction();
 
1751
        DatabaseTable.begin_transaction();
1752
1752
        
1753
1753
        Gee.MapIterator<Photo, File> map_iter = map.map_iterator();
1754
1754
        while (map_iter.next())
1755
1755
            map_iter.get_key().set_editable_file(map_iter.get_value());
1756
1756
        
1757
 
        PhotoTable.get_instance().commit_transaction();
 
1757
        DatabaseTable.commit_transaction();
1758
1758
    }
1759
1759
    
1760
1760
    // Returns the file generating pixbufs, that is, the baseline if present, the backing
4768
4768
        import_keywords = null;
4769
4769
    }
4770
4770
    
4771
 
    protected override void notify_altered(Alteration alteration) {
 
4771
    public override void notify_altered(Alteration alteration) {
4772
4772
        // generate new thumbnails in the background
4773
4773
        if (!block_thumbnail_generation && alteration.has_subject("image"))
4774
4774
            thumbnail_scheduler.at_priority_idle(Priority.LOW);
4867
4867
            }
4868
4868
        }
4869
4869
        
4870
 
#if ENABLE_FACES
4871
 
        // Attach faces.
4872
 
        Gee.Collection<Face>? faces = Face.global.fetch_for_source(this);
4873
 
        if (faces != null) {
4874
 
            foreach (Face face in faces) {
4875
 
                FaceLocation? location = FaceLocation.get_face_location(face.get_face_id(), 
4876
 
                    this.get_photo_id());
4877
 
                if (location != null) {
4878
 
                    face.attach(dupe);
4879
 
                    FaceLocation.create(face.get_face_id(), dupe.get_photo_id(), 
4880
 
                        location.get_serialized_geometry());
4881
 
                }
4882
 
             }
4883
 
        }
4884
 
#endif
4885
 
        
4886
4870
        return dupe;
4887
4871
    }
4888
4872