Clean the user config file from unuseful stuff (.sflphone/sflphonedrc)

src/managerimpl.cpp

@@ -1081,13 +1081,10 @@ ManagerImpl::initConfigFile (void)
   fill_config_int(VOLUME_MICRO, DFT_VOL_MICRO_STR);
 
   section = PREFERENCES;
-  fill_config_str(SKIN_CHOICE, DFT_SKIN);
-  fill_config_int(CONFIRM_QUIT, YES_STR);
   fill_config_str(ZONE_TONE, DFT_ZONE);
-  fill_config_int(CHECKED_TRAY, NO_STR);
   fill_config_str(VOICEMAIL_NUM, DFT_VOICEMAIL);
   fill_config_int(CONFIG_ZEROCONF, CONFIG_ZEROCONF_DEFAULT_STR);
-  fill_config_int(CONFIG_RINGTONE, CONFIG_RINGTONE_DEFAULT);
+  fill_config_int(CONFIG_RINGTONE, YES_STR);
 
   // Loads config from ~/.sflphone/sflphonedrc or so..
   if (createSettingsPath() == 1) {
@@ -1375,7 +1372,7 @@ ManagerImpl::isRingtoneEnabled( void )
   void
 ManagerImpl::ringtoneEnabled( void )
 {
-  ( getConfigInt( PREFERENCES , CONFIG_RINGTONE ) == RINGTONE_ENABLED )? setConfig(PREFERENCES , CONFIG_RINGTONE , 0) : setConfig( PREFERENCES , CONFIG_RINGTONE , 1);
+  ( getConfigInt( PREFERENCES , CONFIG_RINGTONE ) == RINGTONE_ENABLED )? setConfig(PREFERENCES , CONFIG_RINGTONE , NO_STR ) : setConfig( PREFERENCES , CONFIG_RINGTONE , YES_STR );
 }
 
   int

src/user_cfg.h

@@ -42,16 +42,8 @@
 
 
 // Fields to fill
-//#define VOIP_LINK_ID	"VoIPLink.index"
 #define SYMMETRIC     "VoIPLink.symmetric"
 
-//#define FULL_NAME		"SIP.fullName"
-//#define USER_PART		"SIP.userPart"
-//#define AUTH_USER_NAME	"SIP.username"
-//#define PASSWORD		"SIP.password"
-//#define HOST_PART		"SIP.hostPart"
-//#define PROXY			"SIP.proxy"
-//#define AUTO_REGISTER	"SIP.autoregister"
 #define PLAY_DTMF		"DTMF.playDtmf"
 #define PLAY_TONES		"DTMF.playTones" 
 #define PULSE_LENGTH		"DTMF.pulseLength"
@@ -71,10 +63,7 @@
 // speakers and volume 0 to 100
 #define VOLUME_SPKR	  "Volume.speakers"
 #define VOLUME_MICRO	  "Volume.micro"
-#define SKIN_CHOICE		"Themes.skinChoice"
-#define CONFIRM_QUIT	"Options.confirmQuit"
 #define ZONE_TONE	  "Options.zoneToneChoice"
-#define CHECKED_TRAY	"Options.checkedTray"
 #define VOICEMAIL_NUM	  "Options.voicemailNumber"
 // zeroconfig module
 #define CONFIG_ZEROCONF	  "Zeroconf.enable"
@@ -83,7 +72,6 @@
 // Default values
 #define EMPTY_FIELD		""
 #define DFT_STUN_SERVER 	"stun.fwdnet.net:3478"
-#define CONFIG_RINGTONE_DEFAULT	"1"
 #define	YES_STR			"1"
 #define	NO_STR			"0"
 #define DFT_PULSE_LENGTH_STR	"250"
@@ -94,7 +82,6 @@
 #define DFT_VOL_MICRO_STR	"100"
 
 #define DFT_RINGTONE 		"konga.ul"
-#define DFT_SKIN 		"metal"
 #define DFT_ZONE		"North America"
 #define DFT_VOICEMAIL 		"888"
 #define DFT_FRAME_SIZE		"20"