Merge lp://qastaging/~gue5t/midori/tabby-double into lp://qastaging/midori

Proposed by gue5t gue5t
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6975
Merged at revision: 6981
Proposed branch: lp://qastaging/~gue5t/midori/tabby-double
Merge into: lp://qastaging/midori
Diff against target: 64 lines (+10/-11)
2 files modified
extensions/tabby.vala (+4/-9)
midori/midori-database.vala (+6/-2)
To merge this branch: bzr merge lp://qastaging/~gue5t/midori/tabby-double
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
Review via email: mp+262936@code.qastaging.launchpad.net

Commit message

clean up handling of double-valued db column in Tabby

Description of the change

Right now, running in a new configuration directory causes Tabby to warn because Midori.Database.Statement.get_double expects the column to be of Sqlite.FLOAT type rather than either that or Sqlite.NULL (which differs from the behavior of other accessors in that namespace).

This changes get_double to return NAN if the column doesn't exist, which fixes the warning.
This commit also simplifies the logic in Tabby, which currently takes a roundabout path through stringification and parsing.

To post a comment you must log in.
Revision history for this message
Paweł Forysiuk (tuxator) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: