SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of auto_save, we always want to save

This commit is contained in:
Berke Viktor 2012-10-13 08:43:57 +02:00
parent dbef9c9eb4
commit cbd72ff455
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/cfgfiles.c
View File

@ -393,7 +393,6 @@ default_file (void)
/* Keep these sorted!! */ /* Keep these sorted!! */
const struct prefs vars[] = { const struct prefs vars[] = {
{"auto_save", P_OFFINT (autosave), TYPE_BOOL},
{"auto_save_url", P_OFFINT (autosave_url), TYPE_BOOL}, {"auto_save_url", P_OFFINT (autosave_url), TYPE_BOOL},
{"away_auto_unmark", P_OFFINT (auto_unmark_away), TYPE_BOOL}, {"away_auto_unmark", P_OFFINT (auto_unmark_away), TYPE_BOOL},
@ -683,7 +682,6 @@ load_config (void)
prefs.fastdccsend = 1; prefs.fastdccsend = 1;
#endif #endif
prefs.wordwrap = 1; prefs.wordwrap = 1;
prefs.autosave = 1;
prefs.autodialog = 1; prefs.autodialog = 1;
prefs.gui_input_spell = 1; prefs.gui_input_spell = 1;
prefs.autoreconnect = 1; prefs.autoreconnect = 1;
@ -1142,7 +1140,7 @@ cmd_set (struct session *sess, char *tbuf, char *word[], char *word_eol[])
{ {
PrintText (sess, "No such variable.\n"); PrintText (sess, "No such variable.\n");
} }
else if (prefs.autosave && !save_config ()) else if (!save_config ())
{ {
PrintText (sess, "Error saving changes to disk.\n"); PrintText (sess, "Error saving changes to disk.\n");
} }

12
src/common/xchat.c
View File

@ -847,14 +847,18 @@ xchat_exit (void)
in_xchat_exit = TRUE; in_xchat_exit = TRUE;
plugin_kill_all (); plugin_kill_all ();
fe_cleanup (); fe_cleanup ();
if (prefs.autosave)
save_config ();
if (prefs.save_pevents)
{ {
save_config (); pevent_save (NULL);
if (prefs.save_pevents)
pevent_save (NULL);
} }
if (prefs.autosave_url) if (prefs.autosave_url)
{
url_autosave (); url_autosave ();
}
sound_save (); sound_save ();
notify_save (); notify_save ();
ignore_save (); ignore_save ();

1
src/common/xchat.h
View File

@ -208,7 +208,6 @@ struct xchatprefs
unsigned int mainwindow_save; unsigned int mainwindow_save;
unsigned int perc_color; unsigned int perc_color;
unsigned int perc_ascii; unsigned int perc_ascii;
unsigned int autosave;
unsigned int autodialog; unsigned int autodialog;
unsigned int autosave_url; unsigned int autosave_url;
unsigned int autoreconnect; unsigned int autoreconnect;

1
src/fe-text/fe-text.c
View File

@ -532,7 +532,6 @@ void
fe_init (void) fe_init (void)
{ {
/* the following should be default generated, not enfoced in binary */ /* the following should be default generated, not enfoced in binary */
prefs.autosave = 0;
prefs.use_server_tab = 0; prefs.use_server_tab = 0;
prefs.autodialog = 0; prefs.autodialog = 0;
/* except for these, there is no lag meter, there is no server list */ /* except for these, there is no lag meter, there is no server list */