[gnome-commander/gcmd-1-3] XML config: removed unused gnome_cmd_xml_config_save()
- From: Piotr Eljasiak <epiotr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-commander/gcmd-1-3] XML config: removed unused gnome_cmd_xml_config_save()
- Date: Wed, 2 Sep 2009 17:23:17 +0000 (UTC)
commit db9d9d9e32dc81b98509a4d51aa9b96e30cf383a
Author: Piotr Eljasiak <epiotr src gnome org>
Date: Wed Sep 2 19:12:23 2009 +0200
XML config: removed unused gnome_cmd_xml_config_save()
src/gnome-cmd-data.cc | 5 --
src/gnome-cmd-xml-config.cc | 111 -------------------------------------------
src/gnome-cmd-xml-config.h | 1 -
3 files changed, 0 insertions(+), 117 deletions(-)
---
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index add625f..c1d507d 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -1613,8 +1613,6 @@ void GnomeCmdData::load_more()
void GnomeCmdData::save()
{
- gchar *xml_cfg_path = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir (), "." PACKAGE, PACKAGE ".xml", NULL);
-
for (gint i=0; i<BOOKMARK_DIALOG_NUM_COLUMNS; i++)
{
gchar *tmp = g_strdup_printf ("/gnome-commander-size/column-widths/bookmark_dialog_col_width%d", i);
@@ -1749,7 +1747,6 @@ void GnomeCmdData::save()
save_devices ("devices");
save_fav_apps ("fav-apps");
save_intviewer_defaults();
- gnome_cmd_xml_config_save (xml_cfg_path, *this);
{
gchar *xml_cfg_path = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir (), "." PACKAGE, PACKAGE ".xml", NULL);
@@ -1778,8 +1775,6 @@ void GnomeCmdData::save()
save_auto_load_plugins();
gnome_config_sync ();
-
- g_free (xml_cfg_path);
}
diff --git a/src/gnome-cmd-xml-config.cc b/src/gnome-cmd-xml-config.cc
index b77c770..c07d066 100644
--- a/src/gnome-cmd-xml-config.cc
+++ b/src/gnome-cmd-xml-config.cc
@@ -701,114 +701,3 @@ gboolean gnome_cmd_xml_config_load (const gchar *path, GnomeCmdData &cfg)
return retval;
}
-
-
-inline void fprintf_escaped(FILE *f, const char *format, ...)
-{
- va_list args;
-
- va_start (args, format);
- gchar *s = g_markup_vprintf_escaped (format, args);
- va_end (args);
-
- fputs(s, f);
- g_free (s);
-}
-
-
-void gnome_cmd_xml_config_save (const gchar *path, GnomeCmdData &cfg)
-{
- FILE *f = fopen(path,"w");
-
- if (!f)
- return;
-
- fputs("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", f);
- fputs("<!-- Created with GNOME Commander (http://www.nongnu.org/gcmd/) -->\n", f);
- fputs("<GnomeCommander version=\"" VERSION "\">\n", f);
- fputs("\t<AdvancedRenameTool>\n", f);
- fprintf (f, "\t\t<WindowSize width=\"%i\" height=\"%i\" />\n", cfg.advrename_defaults.width, cfg.advrename_defaults.height);
-
- fprintf_escaped(f, "\t\t<Profile name=\"%s\">\n", "Default");
- fprintf_escaped(f, "\t\t\t<Template>%s</Template>\n", cfg.advrename_defaults.templates.empty() ? "$N" : cfg.advrename_defaults.templates.front());
- fprintf(f, "\t\t\t<Counter start=\"%u\" step=\"%i\" width=\"%u\" />\n", cfg.advrename_defaults.default_profile.counter_start,
- cfg.advrename_defaults.default_profile.counter_step,
- cfg.advrename_defaults.default_profile.counter_width);
- fputs("\t\t\t<Regexes>\n", f);
-
- for (std::vector<GnomeCmd::ReplacePattern>::const_iterator r=cfg.advrename_defaults.default_profile.regexes.begin(); r!=cfg.advrename_defaults.default_profile.regexes.end(); ++r)
- fprintf_escaped(f, "\t\t\t\t<Regex pattern=\"%s\" replace=\"%s\" match-case=\"%u\" />\n", r->pattern.c_str(), r->replacement.c_str(), r->match_case);
-
- fputs("\t\t\t</Regexes>\n", f);
- fprintf(f, "\t\t\t<CaseConversion use=\"%u\" />\n", cfg.advrename_defaults.default_profile.case_conversion);
- fprintf(f, "\t\t\t<TrimBlanks use=\"%u\" />\n", cfg.advrename_defaults.default_profile.trim_blanks);
- fputs("\t\t</Profile>\n", f);
-
- for (std::vector<GnomeCmdData::AdvrenameConfig::Profile>::const_iterator p=cfg.advrename_defaults.profiles.begin(); p!=cfg.advrename_defaults.profiles.end(); ++p)
- {
- fprintf_escaped(f, "\t\t<Profile name=\"%s\">\n", p->name.c_str());
- fprintf_escaped(f, "\t\t\t<Template>%s</Template>\n", p->template_string.empty() ? "$N" : p->template_string.c_str());
- fprintf(f, "\t\t\t<Counter start=\"%u\" step=\"%i\" width=\"%u\" />\n", p->counter_start, p->counter_step, p->counter_width);
- fputs("\t\t\t<Regexes>\n", f);
- for (std::vector<GnomeCmd::ReplacePattern>::const_iterator r=p->regexes.begin(); r!=p->regexes.end(); ++r)
- fprintf_escaped(f, "\t\t\t\t<Regex pattern=\"%s\" replace=\"%s\" match-case=\"%u\" />\n", r->pattern.c_str(), r->replacement.c_str(), r->match_case);
- fputs("\t\t\t</Regexes>\n", f);
- fprintf(f, "\t\t\t<CaseConversion use=\"%u\" />\n", p->case_conversion);
- fprintf(f, "\t\t\t<TrimBlanks use=\"%u\" />\n", p->trim_blanks);
- fputs("\t\t</Profile>\n", f);
- }
-
- fputs("\t\t<History>\n", f);
-
- for (GList *i=cfg.advrename_defaults.templates.ents; i; i=i->next)
- fprintf_escaped(f, "\t\t\t<Template>%s</Template>\n", (const gchar *) i->data);
-
- fputs("\t\t</History>\n", f);
- fputs("\t</AdvancedRenameTool>\n", f);
-
- const gchar *val;
-
- fputs("\t<SearchTool>\n", f);
- fprintf (f, "\t\t<WindowSize width=\"%i\" height=\"%i\" />\n", cfg.search_defaults.width, cfg.search_defaults.height);
- fputs("\t\t<Profile name=\"Default\">\n", f);
- val = cfg.search_defaults.name_patterns.front();
- fprintf_escaped (f, "\t\t\t<Pattern syntax=\"%s\" match-case=\"0\">%s</Pattern>\n", cfg.search_defaults.default_profile.syntax == Filter::TYPE_REGEX ? "regex" : "shell", val ? val : "");
- fprintf (f, "\t\t\t<Path recursive=\"%i\" />\n", cfg.search_defaults.default_profile.recursive);
- if (TRUE) // FIXME: if checked 'Find text'
- {
- val = cfg.search_defaults.content_patterns.front();
- fprintf_escaped (f, "\t\t\t<Text match-case=\"%i\">%s</Text>\n", cfg.search_defaults.default_profile.match_case, val ? val : "");
- }
- fputs("\t\t</Profile>\n", f);
- fputs("\t\t<History>\n", f);
-
- for (GList *i=cfg.search_defaults.name_patterns.ents; i; i=i->next)
- fprintf_escaped (f, "\t\t\t<Pattern>%s</Pattern>\n", (const gchar *) i->data);
-
- for (GList *i=cfg.search_defaults.directories.ents; i; i=i->next)
- fprintf_escaped (f, "\t\t\t<Path>%s</Path>\n", (const gchar *) i->data);
-
- for (GList *i=cfg.search_defaults.content_patterns.ents; i; i=i->next)
- fprintf_escaped (f, "\t\t\t<Text>%s</Text>\n", (const gchar *) i->data);
-
- fputs("\t\t</History>\n", f);
- fputs("\t</SearchTool>\n", f);
-
- // SELECTIONS
- fputs("\t<Selections>\n", f);
- for (std::vector<GnomeCmdData::Selection>::const_iterator sel=cfg.selections.begin(); sel!=cfg.selections.end(); ++sel)
- {
- fprintf_escaped(f, "\t\t<Profile name=\"%s\">\n", sel->name.c_str());
- fprintf_escaped (f, "\t\t\t<Pattern syntax=\"%s\" match-case=\"0\">%s</Pattern>\n", sel->syntax==Filter::TYPE_REGEX ? "regex" : "shell", sel->filename_pattern.c_str());
- fprintf (f, "\t\t\t<Path recursive=\"%i\" />\n", sel->recursive);
- if (!sel->text_pattern.empty())
- fprintf_escaped (f, "\t\t\t<Text match-case=\"%i\">%s</Text>\n", sel->match_case, sel->text_pattern.c_str());
- fputs("\t\t</Profile>\n", f);
- }
- fputs("\t</Selections>\n", f);
-
- fputs("</GnomeCommander>\n", f);
- fputs("", f);
-
- fclose(f);
-}
diff --git a/src/gnome-cmd-xml-config.h b/src/gnome-cmd-xml-config.h
index 1bca524..4124efc 100644
--- a/src/gnome-cmd-xml-config.h
+++ b/src/gnome-cmd-xml-config.h
@@ -284,6 +284,5 @@ struct GnomeCmdData;
gboolean gnome_cmd_xml_config_parse (const gchar *xml, gsize xml_len, GnomeCmdData &cfg);
gboolean gnome_cmd_xml_config_load (const gchar *path, GnomeCmdData &cfg);
-void gnome_cmd_xml_config_save (const gchar *path, GnomeCmdData &cfg);
#endif // __GNOME_CMD_XML_CONFIG_H__
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]