[gnome-commander] XML config: rename <TemplateHistory> -> <History>
- From: Piotr Eljasiak <epiotr src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-commander] XML config: rename <TemplateHistory> -> <History>
- Date: Mon, 1 Jun 2009 15:59:39 -0400 (EDT)
commit a4f9008a03c8c2506a5259a2357c3cef5a57bfa1
Author: Piotr Eljasiak <epiotr src gnome org>
Date: Mon Jun 1 21:54:45 2009 +0200
XML config: rename <TemplateHistory> -> <History>
---
ChangeLog | 5 +++++
src/gnome-cmd-xml-config.cc | 18 ++++++++++--------
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ac25bac..3bc58dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-01 Piotr Eljasiak <epiotr use pl>
+
+ * src/gnome-cmd-xml-config.cc:
+ XML config: rename <TemplateHistory> -> <History>
+
2009-05-29 Piotr Eljasiak <epiotr use pl>
* src/eggcellrendererkeys.cc:
diff --git a/src/gnome-cmd-xml-config.cc b/src/gnome-cmd-xml-config.cc
index fe18131..56e3d1f 100644
--- a/src/gnome-cmd-xml-config.cc
+++ b/src/gnome-cmd-xml-config.cc
@@ -337,8 +337,8 @@ enum {XML_ELEM_NOT_FOUND,
XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_PROFILE_REGEXES_REGEX,
XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_PROFILE_CASECONVERSION,
XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_PROFILE_TRIMBLANKS,
- XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_TEMPLATEHISTORY,
- XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_TEMPLATEHISTORY_TEMPLATE};
+ XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_HISTORY,
+ XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_HISTORY_TEMPLATE};
static DICT<guint> xml_elem_names(XML_ELEM_NOT_FOUND);
@@ -475,7 +475,7 @@ static void xml_end (GMarkupParseContext *context,
}
break;
- case XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_TEMPLATEHISTORY:
+ case XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_HISTORY:
cfg->advrename_defaults.templates.reverse();
break;
@@ -502,7 +502,7 @@ static void xml_end (GMarkupParseContext *context,
xml_profile.template_string = text;
break;
- case XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_TEMPLATEHISTORY_TEMPLATE:
+ case XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_HISTORY_TEMPLATE:
// FIXME: unescape text
cfg->advrename_defaults.templates.add(text);
break;
@@ -533,8 +533,10 @@ gboolean gnome_cmd_xml_config_parse (const gchar *xml, gsize xml_len, GnomeCmdDa
{XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_PROFILE_REGEXES_REGEX, "/GnomeCommander/AdvancedRenameTool/Profile/Regexes/Regex"},
{XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_PROFILE_CASECONVERSION, "/GnomeCommander/AdvancedRenameTool/Profile/CaseConversion"},
{XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_PROFILE_TRIMBLANKS, "/GnomeCommander/AdvancedRenameTool/Profile/TrimBlanks"},
- {XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_TEMPLATEHISTORY, "/GnomeCommander/AdvancedRenameTool/TemplateHistory"},
- {XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_TEMPLATEHISTORY_TEMPLATE, "/GnomeCommander/AdvancedRenameTool/TemplateHistory/Template"}
+ {XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_HISTORY, "/GnomeCommander/AdvancedRenameTool/History"},
+ {XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_HISTORY_TEMPLATE, "/GnomeCommander/AdvancedRenameTool/History/Template"},
+ {XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_HISTORY, "/GnomeCommander/AdvancedRenameTool/TemplateHistory"}, // FIXME: for compatibility, to be removed after 1.2.8 release
+ {XML_GNOMECOMMANDER_ADVANCEDRENAMETOOL_HISTORY_TEMPLATE, "/GnomeCommander/AdvancedRenameTool/TemplateHistory/Template"} // FIXME: for compatibility, to be removed after 1.2.8 release
};
load_data (xml_elem_names, xml_elem_data, G_N_ELEMENTS(xml_elem_data));
@@ -626,12 +628,12 @@ void gnome_cmd_xml_config_save (const gchar *path, GnomeCmdData &cfg)
fputs("\t\t</Profile>\n", f);
}
- fputs("\t\t<TemplateHistory>\n", f);
+ fputs("\t\t<History>\n", f);
for (GList *i=cfg.advrename_defaults.templates.ents; i; i=i->next)
fprintf (f, "\t\t\t<Template>%s</Template>\n", (const gchar *) i->data);
- fputs("\t\t</TemplateHistory>\n", f);
+ fputs("\t\t</History>\n", f);
fputs("\t</AdvancedRenameTool>\n", f);
fputs("</GnomeCommander>\n", f);
fputs("", f);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]