Midori Web Browser

Merge lp:~kalikiana/midori/tabbypot into lp:midori

  1. tabbypot
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6391
Merged at revision: 6387
Proposed branch: lp:~kalikiana/midori/tabbypot
Merge into: lp:midori
Diff against target: 69 lines (+9/-6)
5 files modified
midori/midori-extension.c (+2/-0)
po/POTFILES.in (+1/-0)
tests/CMakeLists.txt (+2/-2)
tests/app.vala (+1/-1)
tests/completion.vala (+3/-3)
To merge this branch: bzr merge lp:~kalikiana/midori/tabbypot
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
Review via email: mp+184456@code.launchpad.net

Commit message

Add tabby.vala to POTFILES.in and make completion test pass

To post a comment you must log in.
Revision history for this message
RabbitBot (rabbitbot-a) wrote :

Voting does not meet specified criteria. Required: Approve >= 1. Got: 1 Pending.

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 'midori/midori-extension.c'
2--- midori/midori-extension.c 2013-08-29 19:52:41 +0000
3+++ midori/midori-extension.c 2013-09-08 00:56:56 +0000
4@@ -689,7 +689,9 @@
5 /* Signal that we want the extension to load and save */
6 if (midori_extension_is_prepared (extension))
7 {
8+ /* This is a sensible check but makes unit testing hard
9 g_warn_if_fail (extension->priv->config_dir == NULL);
10+ */
11 extension->priv->config_dir = midori_paths_get_extension_config_dir (filename);
12 }
13 }
14
15=== modified file 'po/POTFILES.in'
16--- po/POTFILES.in 2013-09-01 16:55:43 +0000
17+++ po/POTFILES.in 2013-09-08 00:56:56 +0000
18@@ -87,3 +87,4 @@
19 extensions/cookie-permissions/main.c
20 extensions/apps.vala
21 extensions/transfers.vala
22+extensions/tabby.vala
23
24=== modified file 'tests/CMakeLists.txt'
25--- tests/CMakeLists.txt 2013-08-21 19:50:09 +0000
26+++ tests/CMakeLists.txt 2013-09-08 00:56:56 +0000
27@@ -58,8 +58,8 @@
28 foreach(UNIT_SRC ${TESTS})
29 string(REPLACE ".sh" "" UNIT ${UNIT_SRC})
30 add_test(NAME ${UNIT} COMMAND ${UNIT_SRC})
31+ file(RELATIVE_PATH BLDDIR ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
32 set_tests_properties(${UNIT} PROPERTIES
33- ENVIRONMENT "SRCDIR=${CMAKE_SOURCE_DIR}"
34- ENVIRONMENT "BLDDIR=${CMAKE_BINARY_DIR}"
35+ ENVIRONMENT "SRCDIR=${CMAKE_SOURCE_DIR};BLDDIR=${BLDDIR};"
36 )
37 endforeach ()
38
39=== modified file 'tests/app.vala'
40--- tests/app.vala 2013-05-23 21:10:22 +0000
41+++ tests/app.vala 2013-09-08 00:56:56 +0000
42@@ -49,7 +49,7 @@
43 var app = Midori.normal_app_new (Midori.Paths.make_tmp_dir ("custom-configXXXXXX"),
44 "test-custom-config-normal", false, null, null, -1, null);
45 var loop = MainContext.default ();
46- do { loop.iteration (true); } while (loop.pending ());
47+ do { loop.iteration (true); } while (app.browser == null);
48 assert (check_sensible_window_size (app.browser, app.settings));
49 Midori.normal_app_on_quit (app);
50 }
51
52=== modified file 'tests/completion.vala'
53--- tests/completion.vala 2013-03-03 21:07:56 +0000
54+++ tests/completion.vala 2013-09-08 00:56:56 +0000
55@@ -113,9 +113,9 @@
56 app.set ("history", history);
57 Sqlite.Database db;
58 Sqlite.Database.open_v2 (":memory:", out db);
59- db.exec ("CREATE TABLE history (uri TEXT, title TEXT);");
60- db.exec ("CREATE TABLE search (uri TEXT, keywords TEXT);");
61- db.exec ("CREATE TABLE bookmarks (uri TEXT, title TEXT);");
62+ db.exec ("CREATE TABLE history (uri TEXT, title TEXT, date INTEGER, day INTEGER);");
63+ db.exec ("CREATE TABLE search (uri TEXT, keywords TEXT, day INTEGER);");
64+ db.exec ("CREATE TABLE bookmarks (uri TEXT, title TEXT, last_visit DATE);");
65 history.set_data<unowned Sqlite.Database?> ("db", db);
66 completion.prepare (app);
67 foreach (var spec in completions)
68
69=== modified file 'tests/potfiles.sh' (properties changed: -x to +x)

Subscribers

People subscribed via source and target branches

to all changes: