[Xfce4-commits] <midori:master> Set settings on browser in midori_web_app_new for resizing

[Christian Dywan]

Updating branch refs/heads/master
         to 07bcd6bfddf12ba42b875c46e9532972c4098f9e (commit)
       from b40a8a3a48c940d8392aef1322be6e776de4f11a (commit)

commit 07bcd6bfddf12ba42b875c46e9532972c4098f9e
Author: Paweł Forysiuk <tuxator at o2.pl>
Date:   Mon Jan 7 18:22:36 2013 +0100

    Set settings on browser in midori_web_app_new for resizing

 midori/midori-frontend.c |    1 +
 tests/app.vala           |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/midori/midori-frontend.c b/midori/midori-frontend.c
index 4e3998b..6814a88 100644
--- a/midori/midori-frontend.c
+++ b/midori/midori-frontend.c
@@ -71,6 +71,7 @@ midori_web_app_new (const gchar* config,
     KatzeArray* search_engines = midori_search_engines_new_from_folder (NULL);
     g_object_set (browser,
                   "show-tabs", open_uris != NULL,
+                  "settings", settings,
                   NULL);
     midori_browser_set_action_visible (browser, "Panel", FALSE);
     g_object_unref (search_engines);
diff --git a/tests/app.vala b/tests/app.vala
index 74b14cb..553fbbe 100644
--- a/tests/app.vala
+++ b/tests/app.vala
@@ -70,7 +70,7 @@ void app_web () {
     var browser = Midori.web_app_new (null, null, null, null, -1, null);
     var loop = MainContext.default ();
     do { loop.iteration (true); } while (loop.pending ());
-    /* FIXME assert */ (check_sensible_window_size (browser, browser.settings));
+    assert (check_sensible_window_size (browser, browser.settings));
 }
 
 void app_web_custom_config () {
@@ -79,7 +79,7 @@ void app_web_custom_config () {
     var browser = Midori.web_app_new (Midori.Paths.make_tmp_dir ("custom-configXXXXXX"), null, null, null, -1, null);
     var loop = MainContext.default ();
     do { loop.iteration (true); } while (loop.pending ());
-    /* FIXME assert */ (check_sensible_window_size (browser, browser.settings));
+    assert (check_sensible_window_size (browser, browser.settings));
 }