Midori Web Browser

Merge lp:~ivaldi/midori/tabby-import-name into lp:midori

  1. tabby-import-name
  2. Merge into trunk
Proposed by André Stösel
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6392
Merged at revision: 6392
Proposed branch: lp:~ivaldi/midori/tabby-import-name
Merge into: lp:midori
Diff against target: 19 lines (+2/-1)
1 file modified
extensions/tabby.vala (+2/-1)
To merge this branch: bzr merge lp:~ivaldi/midori/tabby-import-name
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
Review via email: mp+184550@code.launchpad.net

Commit message

Import tab title from old sessions

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
1=== modified file 'extensions/tabby.vala'
2--- extensions/tabby.vala 2013-09-07 14:10:12 +0000
3+++ extensions/tabby.vala 2013-09-09 12:14:35 +0000
4@@ -141,13 +141,14 @@
5
6 public override void add_item (Katze.Item item) {
7 GLib.DateTime time = new DateTime.now_local ();
8- string sqlcmd = "INSERT INTO `tabs` (`crdate`, `tstamp`, `session_id`, `uri`) VALUES (:tstamp, :tstamp, :session_id, :uri);";
9+ string sqlcmd = "INSERT INTO `tabs` (`crdate`, `tstamp`, `session_id`, `uri`, `title`) VALUES (:tstamp, :tstamp, :session_id, :uri, :title);";
10 Sqlite.Statement stmt;
11 if (this.db.prepare_v2 (sqlcmd, -1, out stmt, null) != Sqlite.OK)
12 critical (_("Failed to update database: %s"), db.errmsg);
13 stmt.bind_int64 (stmt.bind_parameter_index (":tstamp"), time.to_unix ());
14 stmt.bind_int64 (stmt.bind_parameter_index (":session_id"), this.id);
15 stmt.bind_text (stmt.bind_parameter_index (":uri"), item.uri);
16+ stmt.bind_text (stmt.bind_parameter_index (":title"), item.name);
17 if (stmt.step () != Sqlite.DONE)
18 critical (_("Failed to update database: %s"), db.errmsg);
19 else {

Subscribers

People subscribed via source and target branches

to all changes: