[gnome-commander] Code cleanup

[Uwe Scholz <uwescholz src gnome org>]

commit ea1e016d85f2ef3b74f2de749320d697616eb72a
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Sun Aug 14 22:02:05 2016 +0200

    Code cleanup

 src/gnome-cmd-xml-config.cc |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/src/gnome-cmd-xml-config.cc b/src/gnome-cmd-xml-config.cc
index b24dd81..0dda118 100644
--- a/src/gnome-cmd-xml-config.cc
+++ b/src/gnome-cmd-xml-config.cc
@@ -407,14 +407,13 @@ static void xml_start(GMarkupParseContext *context,
 
         case XML_GNOMECOMMANDER_LAYOUT_PANEL_TAB:
             if (g_markup_collect_attributes (element_name, attribute_names, attribute_values, error,
-                                             
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, "path", &param1,
                                              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?param1:(param2?param2:""));     //  FIXME: temporarily, dir(param1) after 
1.4
+                string dir(param1);
                 gint sort = atoi(param3);
 
                 if (!dir.empty() && sort<GnomeCmdFileList::NUM_COLUMNS)