debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix slot and dial name mixups when preparing/ saving

Browse source
This commit is contained in:
Paweł Forysiuk 2012-09-09 00:31:02 +02:00 committed by Christian Dywan
parent fe2a5c048c
commit ad99fb1ebb
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
midori/midori-speeddial.vala
View file

@ -120,14 +120,14 @@ namespace Midori {
while (slot <= slot_count) { while (slot <= slot_count) {
string tile = "Dial %u".printf (slot); string tile = "Dial %u".printf (slot);
if (!keyfile.has_group (tile)) if (!keyfile.has_group (tile))
return "s%u".printf (slot); return "Dial %u".printf (slot);
slot++; slot++;
} }
return "s%u".printf (slot_count + 1); return "Dial %u".printf (slot_count + 1);
} }
public void add (string uri, string title, Gdk.Pixbuf img) { public void add (string uri, string title, Gdk.Pixbuf img) {
string id = "Dial " + get_next_free_slot (); string id = get_next_free_slot ();
add_with_id (id, uri, title, img); add_with_id (id, uri, title, img);
} }
@ -260,7 +260,7 @@ namespace Midori {
if (action == "add" || action == "rename" if (action == "add" || action == "rename"
|| action == "delete" || action == "swap") { || action == "delete" || action == "swap") {
uint slot_id = parts[1].to_int () + 1; uint slot_id = parts[1].next_char().to_int () ;
string dial_id = "Dial %u".printf (slot_id); string dial_id = "Dial %u".printf (slot_id);
if (action == "delete") { if (action == "delete") {
@ -279,7 +279,7 @@ namespace Midori {
keyfile.set_string (dial_id, "title", title); keyfile.set_string (dial_id, "title", title);
} }
else if (action == "swap") { else if (action == "swap") {
uint slot2_id = parts[2].to_int () + 1; uint slot2_id = parts[2].next_char().to_int ();
string dial2_id = "Dial %u".printf (slot2_id); string dial2_id = "Dial %u".printf (slot2_id);
string uri = keyfile.get_string (dial_id, "uri"); string uri = keyfile.get_string (dial_id, "uri");

4
tests/speeddial.vala
View file

@ -40,8 +40,8 @@ static void speeddial_load () {
FileUtils.remove (json); FileUtils.remove (json);
Katze.assert_str_equal (json, dial_data.keyfile.to_data (), dial_json.keyfile.to_data ()); Katze.assert_str_equal (json, dial_data.keyfile.to_data (), dial_json.keyfile.to_data ());
Katze.assert_str_equal (json, Midori.SpeedDial.get_next_free_slot_fk (dial_data.keyfile), "s2"); Katze.assert_str_equal (json, dial_data.get_next_free_slot (), "Dial 2");
Katze.assert_str_equal (json, Midori.SpeedDial.get_next_free_Slot_fk (dial_json), "s2"); Katze.assert_str_equal (json, dial_json.get_next_free_slot (), "Dial 2");
} }
void main (string[] args) { void main (string[] args) {