[gnome-commander] XML config: convert <Tab dir='...'> -> <Tab path='...'>

[Piotr Eljasiak <epiotr src gnome org>]

commit 630e32bd525cee499da5080a1184c0097754fbac
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Mon Oct 17 22:16:29 2011 +0200

    XML config: convert <Tab dir='...'> -> <Tab path='...'>

 src/gnome-cmd-file-list.cc  |    2 +-
 src/gnome-cmd-xml-config.cc |    9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc
index 3e56a94..bafc1e4 100644
--- a/src/gnome-cmd-file-list.cc
+++ b/src/gnome-cmd-file-list.cc
@@ -2921,5 +2921,5 @@ void GnomeCmdFileList::drop_files(GnomeVFSXferOptions xferOptions, GList *uri_li
 
 XML::xstream &operator << (XML::xstream &xml, GnomeCmdFileList &fl)
 {
-    return xml << XML::tag("Tab") << XML::attr("dir") << GNOME_CMD_FILE (fl.cwd)->get_real_path() << XML::attr("sort") << fl.get_sort_column() << XML::attr("asc") << fl.get_sort_order() << XML::attr("lock") << fl.locked << XML::endtag();
+    return xml << XML::tag("Tab") << XML::attr("path") << GNOME_CMD_FILE (fl.cwd)->get_real_path() << XML::attr("sort") << fl.get_sort_column() << XML::attr("asc") << fl.get_sort_order() << XML::attr("lock") << fl.locked << XML::endtag();
 }
diff --git a/src/gnome-cmd-xml-config.cc b/src/gnome-cmd-xml-config.cc
index 46f20fc..5280a38 100644
--- a/src/gnome-cmd-xml-config.cc
+++ b/src/gnome-cmd-xml-config.cc
@@ -427,14 +427,15 @@ static void xml_start(GMarkupParseContext *context,
 
         case XML_GNOMECOMMANDER_LAYOUT_PANEL_TAB:
             if (g_markup_collect_attributes (element_name, attribute_names, attribute_values, error,
-                                             G_MARKUP_COLLECT_STRING, "dir", &param1,
-                                             G_MARKUP_COLLECT_STRING, "sort", &param2,
+                                             GMarkupCollectType(G_MARKUP_COLLECT_STRING|G_MARKUP_COLLECT_OPTIONAL), "path", &param1,    //  FIXME: temporarily, G_MARKUP_COLLECT_OPTIONAL to be removed after 1.4
+                                             G_MARKUP_COLLECT_STRING|G_MARKUP_COLLECT_OPTIONAL, "dir", &param2,
+                                             G_MARKUP_COLLECT_STRING, "sort", &param3,
                                              G_MARKUP_COLLECT_BOOLEAN, "asc", &param4,
                                              G_MARKUP_COLLECT_BOOLEAN|G_MARKUP_COLLECT_OPTIONAL, "lock", &param5,
                                              G_MARKUP_COLLECT_INVALID))
             {
-                string dir(param1);
-                gint sort = atoi(param2);
+                string dir(param1?param1:(param2?param2:""));     //  FIXME: temporarily, dir(param1) after 1.4
+                gint sort = atoi(param3);
 
                 if (!dir.empty() && sort<GnomeCmdFileList::NUM_COLUMNS)
                     cfg->tabs[xml_fs].push_back(make_pair(dir,make_triple((GnomeCmdFileList::ColumnID) sort,(GtkSortType) param4,param5)));