Merge lp:~ivaldi/midori/smart-fallback into lp:midori

[André Stösel]

If an url is specified the fallback url should not be loaded

[lp:~ivaldi/midori/smart-fallback]

6253. By André Stösel on 2013-07-11

clarified comment

[gue5t gue5t (gue5t)]

This fixes the behavior; we now only show a homepage/blank page if there's no session and no command-line urls; r+.

However, in a common (default preferences) use case such as "midori www.example.com", oftentimes the session might provide a single blank tab or a single tab containing the homepage (because closing all tabs leaves the session in such a state). This may not be desirable for users that, but there's no way to avoid it for now without also discarding useful tabs from the session. That can be addressed in a separate patch, probably; this doesn't introduce a regression.

review: Approve

[Cris Dywan (kalikiana)]

I like the fix. It's the correct behavior to avoid opening the homepage/ blank.

I'm not sure the case of a session containing these pages is at all trivial. Preferrably let's deal with that in a follow up and clarify what's actually expected there.

review: Approve

=== modified file 'midori/midori-session.c'
--- midori/midori-session.c	2013-06-19 20:28:39 +0000
+++ midori/midori-session.c	2013-07-11 08:43:31 +0000
@@ -458,6 +458,8 @@
     gint64 current;
     gchar** open_uris = g_object_get_data (G_OBJECT (app), "open-uris");
     gchar** execute_commands = g_object_get_data (G_OBJECT (app), "execute-commands");
+    gchar* uri;
+    guint i = 0;
     #ifdef G_ENABLE_DEBUG
     gboolean startup_timer = midori_debug ("startup");
     GTimer* timer = startup_timer ? g_timer_new () : NULL;
@@ -486,7 +488,13 @@
     if (katze_array_is_empty (saved_session))
     {
         item = katze_item_new ();
-        if (load_on_startup == MIDORI_STARTUP_BLANK_PAGE)
+        if (open_uris)
+        {
+            uri = sokoke_magic_uri (open_uris[i], TRUE, TRUE);
+            katze_item_set_uri (item, uri);
+            g_free (uri);
+            i++;
+        } else if (load_on_startup == MIDORI_STARTUP_BLANK_PAGE)
             katze_item_set_uri (item, "about:new");
         else
             katze_item_set_uri (item, "about:home");
@@ -515,10 +523,10 @@
     if (midori_uri_is_blank (katze_item_get_uri (item)))
         midori_browser_activate_action (browser, "Location");
 
-    guint i = 0;
-    for (i = 0; open_uris && open_uris[i]; i++)
+    /* `i` also used above; in that case we won't re-add the same URLs here */
+    for (; open_uris && open_uris[i]; i++)
     {
-        gchar* uri = sokoke_magic_uri (open_uris[i], TRUE, TRUE);
+        uri = sokoke_magic_uri (open_uris[i], TRUE, TRUE);
         midori_browser_add_uri (browser, uri);
         g_free (uri);
     }