← Back to branch summary

~ubuntu-branches/ubuntu/saucy/geary/saucy-updates

« back to all changes in this revision

Viewing changes to src/engine/db/db-result.vala

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2013-03-14 13:48:23 UTC
  • mfrom: (1.1.3)
  • Revision ID: package-import@ubuntu.com-20130314134823-gyk5av1g508zyj8a
Tags: 0.3.0~pr1-0ubuntu1
https://launchpad.net/bugs/1154316
New upstream version (FFE lp: #1154316), supports multiple account as
well as full conversation views with inline replies

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/engine/db/db-result.vala
35
35
        check_cancelled("Result.next", cancellable);
36
36
        
37
37
        if (!finished) {
38
 
            finished = (throw_on_error("Result.next", statement.stmt.step())) != Sqlite.ROW;
 
38
            finished = exec_retry_locked(this, "Result.next", () => { return statement.stmt.step(); },
 
39
                statement.sql) != Sqlite.ROW;
 
40
            
39
41
            log(finished ? "NO ROW" : "ROW");
40
42
        }
41
43
        
114
116
    /**
115
117
     * column is zero-based.
116
118
     */
117
 
    public string string_at(int column) throws DatabaseError {
 
119
    public unowned string string_at(int column) throws DatabaseError {
118
120
        verify_at(column);
119
121
        
120
 
        string s = statement.stmt.column_text(column);
 
122
        unowned string s = statement.stmt.column_text(column);
121
123
        log("string_at(%d) -> %s", column, s);
122
124
        
123
125
        return s;
199
201
     * name is the name of the column in the result set.  See Statement.get_column_index() for name
200
202
     * matching rules.
201
203
     */
202
 
    public string string_for(string name) throws DatabaseError {
 
204
    public unowned string string_for(string name) throws DatabaseError {
203
205
        return string_at(convert_for(name));
204
206
    }
205
207