move username and nickname to be Network specific
Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
parent
685e6365bf
commit
47b87c07c8
|
@ -24,7 +24,7 @@
|
||||||
# define EX_CONFIG_HASH(edd, type, member, eddtype) \
|
# define EX_CONFIG_HASH(edd, type, member, eddtype) \
|
||||||
EET_DATA_DESCRIPTOR_ADD_HASH(edd, type, #member, member, eddtype)
|
EET_DATA_DESCRIPTOR_ADD_HASH(edd, type, #member, member, eddtype)
|
||||||
|
|
||||||
# define EX_CONFIG_FILE_EPOCH 0x0002
|
# define EX_CONFIG_FILE_EPOCH 0x0003
|
||||||
# define EX_CONFIG_FILE_GENERATION 0x009d
|
# define EX_CONFIG_FILE_GENERATION 0x009d
|
||||||
# define EX_CONFIG_FILE_VERSION \
|
# define EX_CONFIG_FILE_VERSION \
|
||||||
((EX_CONFIG_FILE_EPOCH << 16) | EX_CONFIG_FILE_GENERATION)
|
((EX_CONFIG_FILE_EPOCH << 16) | EX_CONFIG_FILE_GENERATION)
|
||||||
|
@ -77,6 +77,8 @@ _config_cb_free(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (net->name) eina_stringshare_del(net->name);
|
if (net->name) eina_stringshare_del(net->name);
|
||||||
|
if (net->nickname) eina_stringshare_del(net->nickname);
|
||||||
|
if (net->username) eina_stringshare_del(net->username);
|
||||||
if (net->nick_passwd) eina_stringshare_del(net->nick_passwd);
|
if (net->nick_passwd) eina_stringshare_del(net->nick_passwd);
|
||||||
if (net->server_passwd) eina_stringshare_del(net->server_passwd);
|
if (net->server_passwd) eina_stringshare_del(net->server_passwd);
|
||||||
|
|
||||||
|
@ -84,8 +86,6 @@ _config_cb_free(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_ex_cfg->font.name) eina_stringshare_del(_ex_cfg->font.name);
|
if (_ex_cfg->font.name) eina_stringshare_del(_ex_cfg->font.name);
|
||||||
if (_ex_cfg->nick) eina_stringshare_del(_ex_cfg->nick);
|
|
||||||
if (_ex_cfg->name) eina_stringshare_del(_ex_cfg->name);
|
|
||||||
|
|
||||||
free(_ex_cfg);
|
free(_ex_cfg);
|
||||||
_ex_cfg = NULL;
|
_ex_cfg = NULL;
|
||||||
|
@ -172,6 +172,8 @@ _config_init(void)
|
||||||
#define T Config_Network
|
#define T Config_Network
|
||||||
#define D _ex_cfg_net_edd
|
#define D _ex_cfg_net_edd
|
||||||
EX_CONFIG_VAL(D, T, name, EET_T_STRING);
|
EX_CONFIG_VAL(D, T, name, EET_T_STRING);
|
||||||
|
EX_CONFIG_VAL(D, T, nickname, EET_T_STRING);
|
||||||
|
EX_CONFIG_VAL(D, T, username, EET_T_STRING);
|
||||||
EX_CONFIG_VAL(D, T, nick_passwd, EET_T_STRING);
|
EX_CONFIG_VAL(D, T, nick_passwd, EET_T_STRING);
|
||||||
EX_CONFIG_VAL(D, T, server_passwd, EET_T_STRING);
|
EX_CONFIG_VAL(D, T, server_passwd, EET_T_STRING);
|
||||||
EX_CONFIG_VAL(D, T, autoconnect, EET_T_UCHAR);
|
EX_CONFIG_VAL(D, T, autoconnect, EET_T_UCHAR);
|
||||||
|
@ -186,8 +188,6 @@ _config_init(void)
|
||||||
#define T Config
|
#define T Config
|
||||||
#define D _ex_cfg_edd
|
#define D _ex_cfg_edd
|
||||||
EX_CONFIG_VAL(D, T, version, EET_T_INT);
|
EX_CONFIG_VAL(D, T, version, EET_T_INT);
|
||||||
EX_CONFIG_VAL(D, T, nick, EET_T_STRING);
|
|
||||||
EX_CONFIG_VAL(D, T, name, EET_T_STRING);
|
|
||||||
EX_CONFIG_VAL(D, T, font.name, EET_T_STRING);
|
EX_CONFIG_VAL(D, T, font.name, EET_T_STRING);
|
||||||
EX_CONFIG_VAL(D, T, font.size, EET_T_INT);
|
EX_CONFIG_VAL(D, T, font.size, EET_T_INT);
|
||||||
EX_CONFIG_VAL(D, T, font.bitmap, EET_T_UCHAR);
|
EX_CONFIG_VAL(D, T, font.bitmap, EET_T_UCHAR);
|
||||||
|
@ -256,16 +256,6 @@ _config_load(void)
|
||||||
|
|
||||||
/* setup defaults */
|
/* setup defaults */
|
||||||
IFCFG(0x008d);
|
IFCFG(0x008d);
|
||||||
char *usr;
|
|
||||||
|
|
||||||
if ((usr = _util_user_name_get()))
|
|
||||||
_ex_cfg->nick = eina_stringshare_add(usr);
|
|
||||||
else
|
|
||||||
_ex_cfg->nick = NULL;
|
|
||||||
if ((usr = _util_user_fullname_get()))
|
|
||||||
_ex_cfg->name = eina_stringshare_add(usr);
|
|
||||||
else
|
|
||||||
_ex_cfg->name = NULL;
|
|
||||||
_ex_cfg->font.size = 10;
|
_ex_cfg->font.size = 10;
|
||||||
_ex_cfg->font.bitmap = EINA_TRUE;
|
_ex_cfg->font.bitmap = EINA_TRUE;
|
||||||
_ex_cfg->font.name = eina_stringshare_add("nexus.pcf");
|
_ex_cfg->font.name = eina_stringshare_add("nexus.pcf");
|
||||||
|
|
|
@ -21,6 +21,8 @@ struct _Config_Server
|
||||||
struct _Config_Network
|
struct _Config_Network
|
||||||
{
|
{
|
||||||
const char *name;
|
const char *name;
|
||||||
|
const char *nickname;
|
||||||
|
const char *username;
|
||||||
const char *nick_passwd;
|
const char *nick_passwd;
|
||||||
const char *server_passwd;
|
const char *server_passwd;
|
||||||
Eina_Bool autoconnect;
|
Eina_Bool autoconnect;
|
||||||
|
@ -34,9 +36,6 @@ struct _Config
|
||||||
{
|
{
|
||||||
int version;
|
int version;
|
||||||
|
|
||||||
const char *nick;
|
|
||||||
const char *name;
|
|
||||||
|
|
||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
const char *name;
|
const char *name;
|
||||||
|
|
Loading…
Reference in New Issue