[Xfce4-commits] <midori:master> Fix renaming in speed dial with spaces in title

[Christian Dywan]

Updating branch refs/heads/master
         to 61163fd14f4181f07b5139ab2988ec7eaaf8953f (commit)
       from fea0ce5933f0b2cfa48804fbe54d257e8d2878dd (commit)

commit 61163fd14f4181f07b5139ab2988ec7eaaf8953f
Author: Paweł Forysiuk <tuxator at o2.pl>
Date:   Mon Dec 3 23:44:55 2012 +0100

    Fix renaming in speed dial with spaces in title

 data/speeddial-head.html     |    2 +-
 midori/midori-speeddial.vala |    2 +-
 tests/speeddial.vala         |    2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/data/speeddial-head.html b/data/speeddial-head.html
index 89cb96b..a24af93 100644
--- a/data/speeddial-head.html
+++ b/data/speeddial-head.html
@@ -133,7 +133,7 @@
             url = "http://" + url;
 
         var id = ev.target.parentNode.parentNode.id;
-        console.log ("speed_dial-save-add " + id + " " + url + " ");
+        console.log ("speed_dial-save-add " + id + " " + url);
     }
 
     function rename_tile (ev) {
diff --git a/midori/midori-speeddial.vala b/midori/midori-speeddial.vala
index 392257d..e675944 100644
--- a/midori/midori-speeddial.vala
+++ b/midori/midori-speeddial.vala
@@ -273,7 +273,7 @@ namespace Midori {
                 throw new SpeedDialError.INVALID_MESSAGE ("Invalid message '%s'", message);
 
             string msg = message.substring (16, -1);
-            string[] parts = msg.split (" ", 4);
+            string[] parts = msg.split (" ", 3);
             if (parts[0] == null)
                 throw new SpeedDialError.NO_ACTION ("No action.");
             string action = parts[0];
diff --git a/tests/speeddial.vala b/tests/speeddial.vala
index 97e34b9..849aba8 100644
--- a/tests/speeddial.vala
+++ b/tests/speeddial.vala
@@ -59,6 +59,8 @@ static void speeddial_load () {
 
     dial_data.save_message ("speed_dial-save-rename 1 Lorem");
     Katze.assert_str_equal (data, dial_data.keyfile.get_string ("Dial 1", "title"), "Lorem");
+    dial_data.save_message ("speed_dial-save-rename 1 Lorem Ipsum Dolomit");
+    Katze.assert_str_equal (data, dial_data.keyfile.get_string ("Dial 1", "title"), "Lorem Ipsum Dolomit");
     dial_data.save_message ("speed_dial-save-delete 1");
     Katze.assert_str_equal (data, dial_data.get_next_free_slot (), "Dial 1");