Merge lp:~aauzi/midori/fix-1179200-1 into lp:midori

[André Auzi]

Fix name and text fields inversion in XBEL folder import

Here is the first of a few helpers steps for merge of fix-1179200.

It fixes an inversion detected when testing bookmarks import speed up resulting from the use of database transactions.

[gue5t gue5t (gue5t)]

As far as I can tell this is good; in testing it on http://xbel.sourceforge.net/bookmarks/xbel.xbel it seemed to result in correct import behavior while unpatched midori did not.

review: Approve

=== modified file 'midori/midori-array.c'
--- midori/midori-array.c	2013-05-30 21:57:04 +0000
+++ midori/midori-array.c	2013-08-05 05:48:23 +0000
@@ -97,15 +97,15 @@
         if (katze_str_equal ((gchar*)cur->name, "title"))
         {
             gchar* value = g_strstrip ((gchar*)xmlNodeGetContent (cur));
+            katze_item_set_name (KATZE_ITEM (array), value);
+            xmlFree (value);
+        }
+        else if (katze_str_equal ((gchar*)cur->name, "desc"))
+        {
+            gchar* value = g_strstrip ((gchar*)xmlNodeGetContent (cur));
             katze_item_set_text (KATZE_ITEM (array), value);
             xmlFree (value);
         }
-        else if (katze_str_equal ((gchar*)cur->name, "desc"))
-        {
-            gchar* value = g_strstrip ((gchar*)xmlNodeGetContent (cur));
-            katze_item_set_name (KATZE_ITEM (array), value);
-            xmlFree (value);
-        }
         else if (katze_str_equal ((gchar*)cur->name, "info"))
             katze_xbel_parse_info ((KatzeItem*)array, cur);
         else if (katze_str_equal ((gchar*)cur->name, "folder"))