From cd21d1b623b0dc7c2d0d6e9f890ad25fb8d83c5a Mon Sep 17 00:00:00 2001
From: Berke Viktor <bviktor@hexchat.org>
Date: Thu, 18 Oct 2012 23:55:47 +0200
Subject: [PATCH] Get rid of saveconf remnants, we save automatically

---
 src/common/outbound.c | 20 --------------------
 src/fe-gtk/menu.c     | 21 ---------------------
 2 files changed, 41 deletions(-)

diff --git a/src/common/outbound.c b/src/common/outbound.c
index d5dbdc49..aca8b3f3 100644
--- a/src/common/outbound.c
+++ b/src/common/outbound.c
@@ -2940,23 +2940,6 @@ cmd_recv (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 	return FALSE;
 }
 
-#if 0 /* manual command for flushing prefs to disk, but we use an autosave-upon-set approach instead */
-static int
-cmd_saveconf (struct session *sess, char *tbuf, char *word[], char *word_eol[])
-{
-	if (save_config ())
-	{
-		PrintText (sess, "Settings have been saved successfully.\n");
-	}
-	else
-	{
-		PrintText (sess, "Error saving settings.\n");
-	}
-
-	return TRUE;
-}
-#endif
-
 static int
 cmd_say (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 {
@@ -3714,9 +3697,6 @@ const struct commands xc_cmds[] = {
 #endif
 	{"RECV", cmd_recv, 1, 0, 1, N_("RECV <text>, send raw data to xchat, as if it was received from the irc server")},
 
-#if 0
-	{"SAVECONF", cmd_saveconf, 0, 0, 1, N_("SAVECONF, saves the current settings to disk")},
-#endif
 	{"SAY", cmd_say, 0, 0, 1,
 	 N_("SAY <text>, sends the text to the object in the current window")},
 	{"SEND", cmd_send, 0, 0, 1, N_("SEND <nick> [<file>]")},
diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c
index de78ea73..3ccc685f 100644
--- a/src/fe-gtk/menu.c
+++ b/src/fe-gtk/menu.c
@@ -1123,23 +1123,6 @@ usermenu_update (void)
 	}
 }
 
-#if 0
-static void
-menu_saveconf (void)
-{
-	session *sess = current_sess;
-
-	if (save_config ())
-	{
-		PrintText (sess, "Settings have been saved successfully.\n");
-	}
-	else
-	{
-		PrintText (sess, "Error saving settings.\n");
-	}
-}
-#endif
-
 static void
 menu_newserver_window (GtkWidget * wid, gpointer none)
 {
@@ -1692,10 +1675,6 @@ static struct mymenu mymenu[] = {
 		{N_("Userlist Popup..."), menu_ulpopup, 0, M_MENUITEM, 0, 0, 1},
 		{0, 0, 0, M_END, 0, 0, 0},		/* 53 */
 
-#if 0
-	{N_("Save Settings to Disk"), menu_saveconf, GTK_STOCK_SAVE, M_MENUSTOCK, 0, 0, 1}, /* don't use this, a /set auto-save approach will be added instead */
-#endif
-
 	{N_("_Window"), 0, 0, M_NEWMENU, 0, 0, 1},
 	{N_("Ban List..."), menu_banlist, 0, M_MENUITEM, 0, 0, 1},
 	{N_("Character Chart..."), ascii_open, 0, M_MENUITEM, 0, 0, 1},