Merge lp:~kalikiana/midori/baad-zoomlevel into lp:midori

[Cris Dywan]

Handle double value in _midori_browser_activate_action

The zoom-level setting is double, which _midori_browser_activate_action doesn't handle so "-e zoom-level=1.80" wouldn't work to set the default zoom via command line.

[André Stösel (ivaldi)]

Needs a little fix: https://code.launchpad.net/~ivaldi/midori/baad-zoomlevel

review: Needs Fixing

[André Stösel (ivaldi)]

Looks good!

review: Approve

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-07-15 23:01:23 +0000
+++ midori/midori-browser.c	2013-07-30 16:47:22 +0000
@@ -569,6 +569,7 @@
              || type == G_TYPE_PARAM_STRING
              || type == G_TYPE_PARAM_INT
              || type == G_TYPE_PARAM_FLOAT
+             || type == G_TYPE_PARAM_DOUBLE
              || type == G_TYPE_PARAM_ENUM))
                 midori_error (_("Value '%s' is invalid for %s"), parts[1], parts[0]);
         }
@@ -617,7 +618,7 @@
                 g_object_set (browser->settings, parts[0], parts[1], NULL);
             else if (type == G_TYPE_PARAM_INT || type == G_TYPE_PARAM_UINT)
                 g_object_set (browser->settings, parts[0], atoi (parts[1]), NULL);
-            else if (type == G_TYPE_PARAM_FLOAT)
+            else if (type == G_TYPE_PARAM_FLOAT || type == G_TYPE_PARAM_DOUBLE)
                 g_object_set (browser->settings, parts[0], g_ascii_strtod (parts[1], NULL), NULL);
             else if (type == G_TYPE_PARAM_ENUM)
             {