summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2008-03-25 13:13:46 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2008-03-25 13:13:46 +0000
commit22fbafb6badd5d2e06f2e9732ec294082982a660 (patch)
treef894211a8a0c77b402dd3250b2bee2d17dcfe13f
parent0158336eadce5b5c5f9f526ac239c4e988eb02a2 (diff)
downloadrockbox-22fbafb6badd5d2e06f2e9732ec294082982a660.tar.gz
rockbox-22fbafb6badd5d2e06f2e9732ec294082982a660.zip
So, I've been sick these last few days, and I'm trying to not take drugs to get over the sickness... turns out that may not have been such a good descision. (AKA, I'm trying to get on the front page... (AKA, really revert this time... really) )
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16795 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/menus/main_menu.c1
-rw-r--r--apps/settings.c2
-rw-r--r--apps/settings.h2
3 files changed, 1 insertions, 4 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index d756d98591..7c2e87c410 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -68,7 +68,6 @@ static int reset_settings(void)
switch(gui_syncyesno_run(&message, &yes_message, &no_message))
{
case YESNO_YES:
- settings_write_config(CONFIGFILE ".bak", SETTINGS_SAVE_CHANGED);
settings_reset();
settings_apply(true);
settings_save();
diff --git a/apps/settings.c b/apps/settings.c
index 237ff1c567..449a38b96f 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -450,7 +450,7 @@ static bool is_changed(int setting_id)
return true;
}
-bool settings_write_config(char* filename, int options)
+static bool settings_write_config(char* filename, int options)
{
int i;
int fd;
diff --git a/apps/settings.h b/apps/settings.h
index 9f7546c60f..1a2c2ee444 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -200,7 +200,6 @@ bool settings_load_config(const char* file, bool apply);
void status_save( void );
int settings_save(void);
-
/* defines for the options paramater */
enum {
SETTINGS_SAVE_CHANGED = 0,
@@ -215,7 +214,6 @@ enum {
#endif
};
bool settings_save_config(int options);
-bool settings_write_config(char* filename, int options);
void settings_reset(void);
void sound_settings_apply(void);